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

Fixed memleaks

This commit is contained in:
Michael Hackstein 2015-10-08 15:31:41 +02:00
parent 24b41e9860
commit 9488f20dec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/Indexes/SkiplistIndex.cpp
View File

@ -637,6 +637,8 @@ TRI_doc_mptr_t* SkiplistIndexIterator::next () {
// We are done // We are done
return nullptr; return nullptr;
} }
// Free the former iterator and get the next one
delete _iterator;
_iterator = _index->lookup(_operators[_currentOperator], _reverse); _iterator = _index->lookup(_operators[_currentOperator], _reverse);
res = _iterator->next(); res = _iterator->next();
} }
@ -1155,8 +1157,8 @@ IndexIterator* SkiplistIndex::iteratorForCondition (IndexIteratorContext* contex
// Now handle the next element, which might be a range // Now handle the next element, which might be a range
bool includeLower = false; bool includeLower = false;
bool includeUpper = false; bool includeUpper = false;
TRI_json_t* lower = nullptr; std::unique_ptr<TRI_json_t> lower;
TRI_json_t* upper = nullptr; std::unique_ptr<TRI_json_t> upper;
if (usedFields < _fields.size()) { if (usedFields < _fields.size()) {
auto it = found.find(usedFields); auto it = found.find(usedFields);
if (it != found.end()) { if (it != found.end()) {
@ -1173,13 +1175,13 @@ IndexIterator* SkiplistIndex::iteratorForCondition (IndexIteratorContext* contex
if ( isLower == isReverseOrder ) { if ( isLower == isReverseOrder ) {
// We set an upper bound // We set an upper bound
TRI_ASSERT(upper == nullptr); TRI_ASSERT(upper == nullptr);
upper = value->toJsonValue(TRI_UNKNOWN_MEM_ZONE); upper.reset(value->toJsonValue(TRI_UNKNOWN_MEM_ZONE));
includeUpper = includeBound; includeUpper = includeBound;
} }
else { else {
// We set an lower bound // We set an lower bound
TRI_ASSERT(lower == nullptr); TRI_ASSERT(lower == nullptr);
lower = value->toJsonValue(TRI_UNKNOWN_MEM_ZONE); lower.reset(value->toJsonValue(TRI_UNKNOWN_MEM_ZONE));
includeLower = includeBound; includeLower = includeBound;
} }
}; };
@ -1294,7 +1296,7 @@ IndexIterator* SkiplistIndex::iteratorForCondition (IndexIteratorContext* contex
if (usedFields == 0) { if (usedFields == 0) {
// We have a range query based on the first _field // We have a range query based on the first _field
searchValues.emplace_back(buildRangeOperator(lower, includeLower, upper, includeUpper, nullptr, _shaper)); searchValues.emplace_back(buildRangeOperator(lower.get(), includeLower, upper.get(), includeUpper, nullptr, _shaper));
} }
else { else {
bool done = false; bool done = false;