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

working again

This commit is contained in:
James 2014-12-09 16:54:34 +00:00
parent 35be017bb3
commit 8601dd4424
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/ExecutionBlock.cpp
View File

@ -865,7 +865,9 @@ IndexRangeBlock::IndexRangeBlock (ExecutionEngine* engine,
_condition->at(i).emplace_back(ri.clone());
}
}
removeOverlapsIndexOr(*_condition);
if (_condition->size() > 1) {
removeOverlapsIndexOr(*_condition);
}
std::vector<std::vector<RangeInfo>> const& orRanges = en->_ranges;
TRI_ASSERT(en->_index != nullptr);

2
arangod/Aql/RangeInfo.cpp
View File

@ -858,7 +858,7 @@ void triagens::aql::removeOverlapsIndexOr (IndexOrCondition& ioc) {
differenceIndexAnd(ioc.at(j), ioc.at(i));
}
}
// remove empty ones
// remove empty ones??
for (auto it = ioc.begin(); it < ioc.end(); ) {
if (it->empty()) {
it = ioc.erase(it);