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

adjusted after API changes

This commit is contained in:
Jan Steemann 2014-07-30 18:06:28 +02:00
parent 1175e9e61c
commit e777cb71b1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/Aql/PlanGenerator.cpp
View File

@ -117,7 +117,7 @@ ExecutionPlan* PlanGenerator::fromNodeFor (Query* query,
if (expression->type == NODE_TYPE_COLLECTION) { if (expression->type == NODE_TYPE_COLLECTION) {
char const* collectionName = expression->getStringValue(); char const* collectionName = expression->getStringValue();
plan = new EnumerateCollectionPlan(query->vocbase(), std::string(collectionName), 0); plan = new EnumerateCollectionPlan(query->vocbase(), std::string(collectionName));
} }
else if (expression->type == NODE_TYPE_REFERENCE) { else if (expression->type == NODE_TYPE_REFERENCE) {
auto v = static_cast<Variable*>(variable->getData()); auto v = static_cast<Variable*>(variable->getData());
@ -183,9 +183,13 @@ ExecutionPlan* PlanGenerator::fromNodeReturn (Query* query,
ExecutionPlan* previous, ExecutionPlan* previous,
AstNode const* node) { AstNode const* node) {
TRI_ASSERT(node != nullptr && node->type == NODE_TYPE_RETURN); TRI_ASSERT(node != nullptr && node->type == NODE_TYPE_RETURN);
TRI_ASSERT(node->numMembers() == 1);
auto variable = node->getMember(0);
// TODO: the operand type of return is not necessarily a variable...
auto v = static_cast<Variable*>(variable->getData());
// TODO: use "node", otherwise we don't know what to return... auto plan = new RootPlan(v->id, v->name);
auto plan = new RootPlan();
return addDependency(previous, plan); return addDependency(previous, plan);
} }
@ -198,7 +202,7 @@ ExecutionPlan* PlanGenerator::fromNode (Query* query,
AstNode const* node) { AstNode const* node) {
TRI_ASSERT(node != nullptr); TRI_ASSERT(node != nullptr);
ExecutionPlan* plan = new SingletonPlan(0); ExecutionPlan* plan = new SingletonPlan();
size_t const n = node->numMembers(); size_t const n = node->numMembers();