diff --git a/arangod/IndexOperators/index-operator.h b/arangod/IndexOperators/index-operator.h index a28d074e24..28ed1e4d48 100644 --- a/arangod/IndexOperators/index-operator.h +++ b/arangod/IndexOperators/index-operator.h @@ -102,11 +102,10 @@ class TRI_index_operator_t { TRI_index_operator_type_e const _type; VocShaper const* _shaper; - TRI_index_operator_t ( - TRI_index_operator_type_e const type, - VocShaper const* shaper - ) : _type(type), - _shaper(shaper) { + TRI_index_operator_t (TRI_index_operator_type_e const type, + VocShaper const* shaper) + : _type(type), + _shaper(shaper) { } virtual ~TRI_index_operator_t () { diff --git a/arangod/Indexes/HashIndex.cpp b/arangod/Indexes/HashIndex.cpp index 1634e0dedd..fa6b336bc5 100644 --- a/arangod/Indexes/HashIndex.cpp +++ b/arangod/Indexes/HashIndex.cpp @@ -823,7 +823,8 @@ IndexIterator* HashIndex::iteratorForCondition (IndexIteratorContext* context, auto f = flds[j]; if (f == paramPair.second) { filled = true; - auto shaped = TRI_ShapedJsonJson(shaper, value->toJsonValue(TRI_UNKNOWN_MEM_ZONE), false); + auto shaped = TRI_ShapedJsonJson(shaper, value->toJsonValue(TRI_UNKNOWN_MEM_ZONE), false); + if (shaped == nullptr) { TRI_ASSERT(false); return nullptr; @@ -842,7 +843,6 @@ IndexIterator* HashIndex::iteratorForCondition (IndexIteratorContext* context, } // We have successfully build a searchValue by now. // Create the iterator - auto result = new HashIndexIterator(this, searchValue.get()); searchValue.release(); return result; diff --git a/arangod/Indexes/SkiplistIndex.cpp b/arangod/Indexes/SkiplistIndex.cpp index 9ad3ba010b..c0b59dd38c 100644 --- a/arangod/Indexes/SkiplistIndex.cpp +++ b/arangod/Indexes/SkiplistIndex.cpp @@ -359,10 +359,8 @@ bool SkiplistIterator::findHelperIntervalIntersectionValid ( return findHelperIntervalValid(interval); } -void SkiplistIterator::findHelper ( - TRI_index_operator_t const* indexOperator, - std::vector& intervals - ) { +void SkiplistIterator::findHelper (TRI_index_operator_t const* indexOperator, + std::vector& intervals) { TRI_skiplist_index_key_t values; std::vector leftResult; std::vector rightResult; @@ -761,7 +759,7 @@ int SkiplistIndex::remove (TRI_doc_mptr_t const* doc, //////////////////////////////////////////////////////////////////////////////// SkiplistIterator* SkiplistIndex::lookup (TRI_index_operator_t* slOperator, - bool reverse) { + bool reverse) { if (slOperator == nullptr) { return nullptr; }