From 8601dd44242af79ff859e3e789c0abc5728b845c Mon Sep 17 00:00:00 2001 From: James Date: Tue, 9 Dec 2014 16:54:34 +0000 Subject: [PATCH] working again --- arangod/Aql/ExecutionBlock.cpp | 4 +++- arangod/Aql/RangeInfo.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arangod/Aql/ExecutionBlock.cpp b/arangod/Aql/ExecutionBlock.cpp index bdf6263e4d..70643a3ed0 100644 --- a/arangod/Aql/ExecutionBlock.cpp +++ b/arangod/Aql/ExecutionBlock.cpp @@ -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> const& orRanges = en->_ranges; TRI_ASSERT(en->_index != nullptr); diff --git a/arangod/Aql/RangeInfo.cpp b/arangod/Aql/RangeInfo.cpp index 4f8d7be8ed..f7cd4809ac 100644 --- a/arangod/Aql/RangeInfo.cpp +++ b/arangod/Aql/RangeInfo.cpp @@ -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);