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

Indexes compile again and some expressions seem to be evaluated. Might still crash. Start with --no-server with server it is still broken

This commit is contained in:
Michael Hackstein 2015-10-02 17:14:18 +02:00
parent 5de1a9b9b5
commit 9bfd929cf5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/Aql/IndexBlock.cpp
View File

@ -106,10 +106,10 @@ void IndexBlock::buildExpressions () {
AqlValue a = exp->execute(_trx, cur, _pos, _inVars[posInExpressions], _inRegs[posInExpressions], &myCollection); AqlValue a = exp->execute(_trx, cur, _pos, _inVars[posInExpressions], _inRegs[posInExpressions], &myCollection);
auto jsonified = a.toJson(_trx, myCollection, true); auto jsonified = a.toJson(_trx, myCollection, true);
a.destroy(); a.destroy();
AstNode const* evaluatedNode = ast->nodeFromJson(jsonified.json(), true); AstNode* evaluatedNode = ast->nodeFromJson(jsonified.json(), true);
en->_plan->replaceNode(_condition->getMember(toReplace.orMember) _condition->getMember(toReplace.orMember)
->getMember(toReplace.andMember) ->getMember(toReplace.andMember)
->getMember(toReplace.operatorMember)); ->changeMember(toReplace.operatorMember, evaluatedNode);
} }
/* /*
@ -361,8 +361,7 @@ int IndexBlock::initialize () {
auto lhs = leaf->getMember(0); auto lhs = leaf->getMember(0);
auto rhs = leaf->getMember(1); auto rhs = leaf->getMember(1);
if (lhs->type == NODE_TYPE_ATTRIBUTE_ACCESS && if (lhs->isAttributeAccessForVariable(outVariable)) {
lhs->getAttributeVariable() == outVariable) {
// Index is responsible for the left side, check if right side has to be evaluated // Index is responsible for the left side, check if right side has to be evaluated
if (! rhs->isConstant()) { if (! rhs->isConstant()) {
instantiateExpression(i, j, 1, rhs); instantiateExpression(i, j, 1, rhs);