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

Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions

This commit is contained in:
Michael Hackstein 2015-10-07 17:24:42 +02:00
parent 5a026db641 424dc81197
commit cb57f39e06
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/AstNode.cpp
View File

@ -1213,8 +1213,12 @@ bool AstNode::isAttributeAccessForVariable (std::pair<Variable const*, std::vect
return nullptr; return nullptr;
} }
// initialize
bool expandNext = false; bool expandNext = false;
result.first = nullptr; result.first = nullptr;
if (! result.second.empty()) {
result.second.clear();
}
auto node = this; auto node = this;
while (node->type == NODE_TYPE_ATTRIBUTE_ACCESS || while (node->type == NODE_TYPE_ATTRIBUTE_ACCESS ||

48
arangod/Indexes/HashIndex.cpp
View File

@ -144,9 +144,6 @@ TRI_doc_mptr_t* HashIndexIterator::next () {
// found something // found something
return _buffer.at(_posInBuffer++); return _buffer.at(_posInBuffer++);
} }
// found no result. now go to next lookup value in _keys
// ++_position;
} }
} }
@ -800,14 +797,15 @@ IndexIterator* HashIndex::iteratorForCondition (IndexIteratorContext* context,
TRI_ASSERT(node->type == aql::NODE_TYPE_OPERATOR_NARY_AND); TRI_ASSERT(node->type == aql::NODE_TYPE_OPERATOR_NARY_AND);
SimpleAttributeEqualityMatcher matcher(fields()); SimpleAttributeEqualityMatcher matcher(fields());
size_t const n = fields().size(); size_t const n = _fields.size();
triagens::aql::AstNode* allVals = matcher.getAll(ast, this, node, reference); triagens::aql::AstNode* allVals = matcher.getAll(ast, this, node, reference);
TRI_ASSERT(allVals->numMembers() == n); TRI_ASSERT(allVals->numMembers() == n);
struct PermutationState { struct PermutationState {
PermutationState (triagens::aql::AstNode const* op, triagens::aql::AstNode const* value, size_t current, size_t n) PermutationState (triagens::aql::AstNode const* op, triagens::aql::AstNode const* value, size_t attributePosition, size_t current, size_t n)
: op(op), : op(op),
value(value), value(value),
attributePosition(attributePosition),
current(current), current(current),
n(n) { n(n) {
} }
@ -828,6 +826,7 @@ IndexIterator* HashIndex::iteratorForCondition (IndexIteratorContext* context,
triagens::aql::AstNode const* op; triagens::aql::AstNode const* op;
triagens::aql::AstNode const* value; triagens::aql::AstNode const* value;
size_t const attributePosition;
size_t current; size_t current;
size_t const n; size_t const n;
}; };
@ -838,22 +837,47 @@ IndexIterator* HashIndex::iteratorForCondition (IndexIteratorContext* context,
size_t maxPermutations = 1; size_t maxPermutations = 1;
for (size_t i = 0; i < n; ++i) { for (size_t i = 0; i < n; ++i) {
auto comp = allVals->getMemberUnchecked(i); auto comp = allVals->getMemberUnchecked(i);
auto attrNode = comp->getMember(0); // auto attrNode = comp->getMember(0);
auto valNode = comp->getMember(1); // auto valNode = comp->getMember(1);
/*
if (attrNode->type != aql::NODE_TYPE_ATTRIBUTE_ACCESS) { if (attrNode->type != aql::NODE_TYPE_ATTRIBUTE_ACCESS) {
// value == a.b -> flip the two sides // value == a.b -> flip the two sides
attrNode = comp->getMember(1); attrNode = comp->getMember(1);
valNode = comp->getMember(0); valNode = comp->getMember(0);
} }
TRI_ASSERT(attrNode->type == aql::NODE_TYPE_ATTRIBUTE_ACCESS); TRI_ASSERT(attrNode->type == aql::NODE_TYPE_ATTRIBUTE_ACCESS);
*/
std::pair<triagens::aql::Variable const*, std::vector<triagens::basics::AttributeName>> paramPair;
auto attrNode = comp->getMember(0);
auto valNode = comp->getMember(1);
if (! attrNode->isAttributeAccessForVariable(paramPair) || paramPair.first != reference) {
attrNode = comp->getMember(1);
valNode = comp->getMember(0);
if (! attrNode->isAttributeAccessForVariable(paramPair) || paramPair.first != reference) {
return nullptr;
}
}
size_t attributePosition = SIZE_MAX;
for (size_t j = 0; j < _fields.size(); ++j) {
if (_fields[j] == paramPair.second) {
attributePosition = j;
break;
}
}
if (attributePosition == SIZE_MAX) {
// index attribute not found in condition. this is a severe error
THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL);
}
if (comp->type == aql::NODE_TYPE_OPERATOR_BINARY_EQ) { if (comp->type == aql::NODE_TYPE_OPERATOR_BINARY_EQ) {
permutationStates.emplace_back(PermutationState(comp, valNode, 0, 1)); permutationStates.emplace_back(PermutationState(comp, valNode, attributePosition, 0, 1));
} }
else if (comp->type == aql::NODE_TYPE_OPERATOR_BINARY_IN) { else if (comp->type == aql::NODE_TYPE_OPERATOR_BINARY_IN) {
permutationStates.emplace_back(PermutationState(comp, valNode, 0, valNode->numMembers())); permutationStates.emplace_back(PermutationState(comp, valNode, attributePosition, 0, valNode->numMembers()));
} }
else { else {
return nullptr; return nullptr;
@ -891,7 +915,7 @@ IndexIterator* HashIndex::iteratorForCondition (IndexIteratorContext* context,
break; break;
} }
searchValue->_values[i] = *shaped; searchValue->_values[state.attributePosition] = *shaped;
TRI_Free(shaper->memoryZone(), shaped); TRI_Free(shaper->memoryZone(), shaped);
} }