From 3f5259d50cee24dd41d12a32b6d33da778941887 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 18 Sep 2014 22:26:04 +0200 Subject: [PATCH] removed unnecessary trampoline functions --- arangod/SkipLists/skiplistIndex.cpp | 32 ++++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/arangod/SkipLists/skiplistIndex.cpp b/arangod/SkipLists/skiplistIndex.cpp index bf058207c8..9a962e3d39 100644 --- a/arangod/SkipLists/skiplistIndex.cpp +++ b/arangod/SkipLists/skiplistIndex.cpp @@ -341,9 +341,10 @@ static bool SkiplistHasNextIterationCallback (TRI_skiplist_iterator_t const* ite /// @brief Jumps backwards by jumpSize and returns the document //////////////////////////////////////////////////////////////////////////////// -static TRI_skiplist_index_element_t* SkiplistIterationPrev ( - TRI_skiplist_iterator_t* iterator, - int64_t jumpSize) { +static TRI_skiplist_index_element_t* SkiplistPrevIterationCallback ( + TRI_skiplist_iterator_t* iterator) { + static const int64_t jumpSize = 1; + TRI_ASSERT(jumpSize > 0); if (iterator == nullptr) { @@ -386,9 +387,10 @@ static TRI_skiplist_index_element_t* SkiplistIterationPrev ( /// @brief Jumps forwards by jumpSize and returns the document //////////////////////////////////////////////////////////////////////////////// -static TRI_skiplist_index_element_t* SkiplistIterationNext ( - TRI_skiplist_iterator_t* iterator, - int64_t jumpSize) { +static TRI_skiplist_index_element_t* SkiplistNextIterationCallback ( + TRI_skiplist_iterator_t* iterator) { + static const int64_t jumpSize = 1; + TRI_ASSERT(jumpSize > 0); if (iterator == nullptr || @@ -423,24 +425,6 @@ static TRI_skiplist_index_element_t* SkiplistIterationNext ( return static_cast(iterator->_cursor->document()); } -//////////////////////////////////////////////////////////////////////////////// -/// @brief default callback for jumping forward by 1 -//////////////////////////////////////////////////////////////////////////////// - -static TRI_skiplist_index_element_t* SkiplistPrevIterationCallback ( - TRI_skiplist_iterator_t* iterator) { - return SkiplistIterationPrev(iterator, 1); -} - -//////////////////////////////////////////////////////////////////////////////// -/// @brief default callback for jumping forward by 1 -//////////////////////////////////////////////////////////////////////////////// - -static TRI_skiplist_index_element_t* SkiplistNextIterationCallback ( - TRI_skiplist_iterator_t* iterator) { - return SkiplistIterationNext(iterator, 1); -} - // ----------------------------------------------------------------------------- // --SECTION-- skiplistIndex common public methods // -----------------------------------------------------------------------------