Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-10-21 09:44:17 +00:00
parent c695d60a2d 285ddb8817
commit 8a9d3ec20d
3 changed files with 126 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/Jenkins/build.sh
View File

@ -544,7 +544,7 @@ if test -n "${TARGET_DIR}"; then
if test "`uname -o||true`" == "Cygwin"; then if test "`uname -o||true`" == "Cygwin"; then
SSLDIR=`grep FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL CMakeCache.txt |sed -e "s/.*optimized;//" -e "s/;.*//" -e "s;/lib.*lib;;" -e "s;\([a-zA-Z]*\):;/cygdrive/\1;"` SSLDIR=`grep FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL CMakeCache.txt |sed -e "s/.*optimized;//" -e "s/;.*//" -e "s;/lib.*lib;;" -e "s;\([a-zA-Z]*\):;/cygdrive/\1;"`
DLLS=`find ${SSLDIR} -name \*.dll |grep -i release` DLLS=`find ${SSLDIR} -name \*.dll |grep -i release`
cp ${DLLS} bin cp ${DLLS} bin/${BUILD_CONFIG}
fi fi
tar -u -f ${TARFILE_TMP} \ tar -u -f ${TARFILE_TMP} \
bin etc tests bin etc tests

2
arangod/Aql/ExecutionEngine.cpp
View File

@ -920,6 +920,7 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
engineInfo.close(); // base engineInfo.close(); // base
if (!shardSet.empty()) {
arangodb::CoordTransactionID coordTransactionID = TRI_NewTickServer(); arangodb::CoordTransactionID coordTransactionID = TRI_NewTickServer();
std::unordered_map<std::string, std::string> headers; std::unordered_map<std::string, std::string> headers;
@ -952,6 +953,7 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
} }
} }
} }
}
/// @brief buildEngines, build engines on DBservers and coordinator /// @brief buildEngines, build engines on DBservers and coordinator
ExecutionEngine* buildEngines() { ExecutionEngine* buildEngines() {

16
arangod/Aql/Query.cpp
View File

@ -479,6 +479,9 @@ QueryResult Query::prepare(QueryRegistry* registry) {
bool planRegisters; bool planRegisters;
try {
// As soon as we start du instantiate the plan we have to clean it
// up before killing the unique_ptr
if (_queryString != nullptr) { if (_queryString != nullptr) {
// we have an AST // we have an AST
// optimize the ast // optimize the ast
@ -582,6 +585,19 @@ QueryResult Query::prepare(QueryRegistry* registry) {
return QueryResult(TRI_ERROR_INTERNAL, return QueryResult(TRI_ERROR_INTERNAL,
TRI_errno_string(TRI_ERROR_INTERNAL) + getStateString()); TRI_errno_string(TRI_ERROR_INTERNAL) + getStateString());
} }
} catch (arangodb::basics::Exception const& ex) {
return QueryResult(ex.code(), ex.message() + getStateString());
} catch (std::bad_alloc const&) {
return QueryResult(
TRI_ERROR_OUT_OF_MEMORY,
TRI_errno_string(TRI_ERROR_OUT_OF_MEMORY) + getStateString());
} catch (std::exception const& ex) {
return QueryResult(TRI_ERROR_INTERNAL, ex.what() + getStateString());
} catch (...) {
return QueryResult(TRI_ERROR_INTERNAL,
TRI_errno_string(TRI_ERROR_INTERNAL) + getStateString());
}
} }
/// @brief execute an AQL query /// @brief execute an AQL query