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

Take care of static analyis case AggregateNode.

This commit is contained in:
Max Neunhoeffer 2014-08-06 15:13:22 +02:00
parent 70618ec768
commit 7b65a958d8
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arangod/Aql/ExecutionBlock.h
View File

@ -257,6 +257,19 @@ namespace triagens {
totalNrRegs++;
break;
}
case ExecutionNode::AGGREGATE: {
// FIXME: are there more variables being defined in this
// node???
auto ep = static_cast<AggregateNode const*>(eb->getPlanNode());
if (ep->_outVariable != nullptr) {
nrRegsHere[depth]++;
nrRegs[depth]++;
varInfo.insert(make_pair(ep->_outVariable->id,
VarInfo(depth, totalNrRegs)));
totalNrRegs++;
}
break;
}
// TODO: potentially more cases
default:
break;
@ -272,6 +285,11 @@ namespace triagens {
v->setSharedPtr(&v);
walk(v.get());
v->reset();
std::cout << "Varinfo:\n";
for (auto x : v->varInfo) {
std::cout << x.first << " => " << x.second.depth << ","
<< x.second.registerId << std::endl;
}
}
////////////////////////////////////////////////////////////////////////////////
@ -1447,6 +1465,7 @@ namespace triagens {
for( auto p: en->_elements){
//We know that staticAnalysis has been run, so _varOverview is set up
std::cout << "Looking for " << p.first->id << std::endl;
auto it = _varOverview->varInfo.find(p.first->id);
TRI_ASSERT(it != _varOverview->varInfo.end());
_sortRegisters.push_back(make_pair(it->second.registerId, p.second));

5
arangod/Aql/ExecutionNode.h
View File

@ -68,8 +68,7 @@ namespace triagens {
CALCULATION, // done
SUBQUERY, // done
SORT, // done
AGGREGATE_ON_SORTED,
AGGREGATE_ON_UNSORTED, // todo
AGGREGATE, // todo
LOOKUP_JOIN,
MERGE_JOIN,
LOOKUP_INDEX_UNIQUE,
@ -1033,7 +1032,7 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
virtual NodeType getType () const {
return SORT;
return AGGREGATE;
}
////////////////////////////////////////////////////////////////////////////////