From 7f662bac09abd8acb20d24e4b14c6c499aa5ea59 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Fri, 29 Jan 2016 00:11:24 +0100 Subject: [PATCH] simplify code --- arangod/Indexes/EdgeIndex.cpp | 13 ++++--------- arangod/Indexes/PrimaryIndex.cpp | 5 ----- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arangod/Indexes/EdgeIndex.cpp b/arangod/Indexes/EdgeIndex.cpp index 8ccf8e59dc..91f397cf01 100644 --- a/arangod/Indexes/EdgeIndex.cpp +++ b/arangod/Indexes/EdgeIndex.cpp @@ -747,18 +747,13 @@ IndexIterator* EdgeIndex::createIterator( } } - // _from or _to? - bool const isFrom = - (strcmp(attrNode->getStringValue(), TRI_VOC_ATTRIBUTE_FROM) == 0); - - if (keys.empty()) { - // nothing to do. still need to return an empty iterator - return new EdgeIndexIterator(trx, isFrom ? _edgesFrom : _edgesTo, keys); - } - TRI_IF_FAILURE("EdgeIndex::noIterator") { THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG); } + // _from or _to? + bool const isFrom = + (strcmp(attrNode->getStringValue(), TRI_VOC_ATTRIBUTE_FROM) == 0); + return new EdgeIndexIterator(trx, isFrom ? _edgesFrom : _edgesTo, keys); } diff --git a/arangod/Indexes/PrimaryIndex.cpp b/arangod/Indexes/PrimaryIndex.cpp index 73e1856cd9..4d3da4df99 100644 --- a/arangod/Indexes/PrimaryIndex.cpp +++ b/arangod/Indexes/PrimaryIndex.cpp @@ -422,11 +422,6 @@ IndexIterator* PrimaryIndex::createIterator( } } - if (keys.empty()) { - // nothing to do: still new to return an empty iterator - return new PrimaryIndexIterator(trx, this, keys); - } - TRI_IF_FAILURE("PrimaryIndex::noIterator") { THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG); }