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

fixed test

This commit is contained in:
Jan Steemann 2014-04-25 13:31:58 +02:00
parent ba0cef0658
commit dba48cff2d
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UnitTests/HttpInterface/api-async-spec.rb
View File

@ -226,7 +226,7 @@ describe ArangoDB do
cmd = "/_api/job/" + id
doc = ArangoDB.log_put("#{prefix}-create-cursor-check-status-408", cmd)
#doc.code.should eq(408)
doc.code.should eq(408)
end
it "checks whether we can cancel a transaction" do

17
arangod/Ahuacatl/ahuacatl-optimiser.c
View File

@ -717,7 +717,7 @@ static TRI_aql_node_t* OptimiseFcall (TRI_aql_context_t* const context,
res = TRI_GetErrorExecutionContext(execContext);
TRI_FreeExecutionContext(execContext);
if (res != TRI_ERROR_NO_ERROR) {
if (res == TRI_ERROR_REQUEST_CANCELED) {
TRI_SetErrorContextAql(__FILE__, __LINE__, context, res, NULL);
return node;
}
@ -1232,12 +1232,10 @@ static TRI_aql_node_t* OptimiseBinaryRelationalOperation (TRI_aql_context_t* con
if (res != TRI_ERROR_NO_ERROR) {
TRI_FreeExecutionContext(execContext);
if (res != TRI_ERROR_REQUEST_CANCELED) {
// we need to return this specific error code
res = TRI_ERROR_QUERY_SCRIPT;
if (res == TRI_ERROR_REQUEST_CANCELED) {
TRI_SetErrorContextAql(__FILE__, __LINE__, context, res, NULL);
}
TRI_SetErrorContextAql(__FILE__, __LINE__, context, res, NULL);
return node;
}
@ -1246,14 +1244,9 @@ static TRI_aql_node_t* OptimiseBinaryRelationalOperation (TRI_aql_context_t* con
TRI_FreeExecutionContext(execContext);
if (res != TRI_ERROR_NO_ERROR) {
if (res != TRI_ERROR_REQUEST_CANCELED) {
// we need to return this specific error code
res = TRI_ERROR_QUERY_SCRIPT;
}
if (res == TRI_ERROR_REQUEST_CANCELED) {
TRI_SetErrorContextAql(__FILE__, __LINE__, context, res, NULL);
return NULL;
return node;
}
if (json == NULL) {