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

fix timeout issue next try: no subquery nodes on dbservers (#6036)

This commit is contained in:
Jan Christoph Uhde 2018-08-03 09:43:35 +02:00 committed by Jan
parent 0660044448
commit 1ffcfd63ba
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -1,5 +1,6 @@
v3.3.14 (XXXX-XX-XX)
--------------------
* fixed issue #5884: Subquery nodes are no longer created on DBServers
* fixed issue #6031: Broken LIMIT in nested list iterations

3
arangod/Aql/OptimizerRules.cpp
View File

@ -3985,7 +3985,8 @@ void arangodb::aql::restrictToSingleShardRule(
break;
}
if (c->getType() == EN::REMOTE) {
if (c->getType() == EN::REMOTE ||
c->getType() == EN::SUBQUERY) {
toRemove.clear();
break;
}

26
js/server/tests/aql/aql-modify-cluster.js
View File

@ -532,6 +532,32 @@ function ahuacatlInsertSuite () {
assertEqual(1, c2.count());
},
testInsertTripleWithSub : function () {
c1.truncate();
c2.truncate();
c3.drop();
c3 = db._createEdgeCollection(cn3);
const query = `WITH @@usersCollection, @@emailsCollection, @@userToEmailEdges
LET user = FIRST(INSERT @user IN @@usersCollection RETURN NEW)
INSERT @email IN @@emailsCollection
INSERT @edge IN @@userToEmailEdges
RETURN user`;
const bind = { "@usersCollection" : cn1,
"@emailsCollection" : cn2,
"@userToEmailEdges" : cn3,
"user" : { "name" : "ulf" },
"email" : { "addr" : "ulf@ulf.de"},
"edge" : { "_from" : "usersCollection/abc" , "_to" : "emailsCollection/def"}
};
const options = {optimizer : { rules : ["+all"] } };
db._query(query, bind, options);
assertEqual(1, c1.count());
assertEqual(1, c2.count());
assertEqual(1, c3.count());
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test insert
////////////////////////////////////////////////////////////////////////////////