From 62b4a165b30a46d143183bedabf31d62bfc7275e Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 2 Sep 2015 17:16:40 +0200 Subject: [PATCH] removed unused cases --- arangod/IndexOperators/index-operator.cpp | 4 +--- arangod/IndexOperators/index-operator.h | 4 +--- arangod/Indexes/SkiplistIndex.cpp | 4 +--- arangod/Indexes/SkiplistIndex.h | 28 +++++++++++++++-------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/arangod/IndexOperators/index-operator.cpp b/arangod/IndexOperators/index-operator.cpp index c493d31920..d8008b48da 100644 --- a/arangod/IndexOperators/index-operator.cpp +++ b/arangod/IndexOperators/index-operator.cpp @@ -67,9 +67,7 @@ TRI_index_operator_t* TRI_CreateIndexOperator (TRI_index_operator_type_e operato VocShaper* shaper, size_t numFields) { switch (operatorType) { - case TRI_AND_INDEX_OPERATOR: - case TRI_NOT_INDEX_OPERATOR: - case TRI_OR_INDEX_OPERATOR: { + case TRI_AND_INDEX_OPERATOR: { return new TRI_logical_index_operator_t(operatorType, shaper, leftOperand, rightOperand); } diff --git a/arangod/IndexOperators/index-operator.h b/arangod/IndexOperators/index-operator.h index cd74f35243..a28d074e24 100644 --- a/arangod/IndexOperators/index-operator.h +++ b/arangod/IndexOperators/index-operator.h @@ -87,9 +87,7 @@ typedef enum { TRI_GE_INDEX_OPERATOR, TRI_GT_INDEX_OPERATOR, - TRI_AND_INDEX_OPERATOR, - TRI_NOT_INDEX_OPERATOR, - TRI_OR_INDEX_OPERATOR + TRI_AND_INDEX_OPERATOR } TRI_index_operator_type_e; diff --git a/arangod/Indexes/SkiplistIndex.cpp b/arangod/Indexes/SkiplistIndex.cpp index 6c1e3e0068..0b88d49a39 100644 --- a/arangod/Indexes/SkiplistIndex.cpp +++ b/arangod/Indexes/SkiplistIndex.cpp @@ -128,9 +128,7 @@ static int FillLookupOperator (TRI_index_operator_t* slOperator, } switch (slOperator->_type) { - case TRI_AND_INDEX_OPERATOR: - case TRI_NOT_INDEX_OPERATOR: - case TRI_OR_INDEX_OPERATOR: { + case TRI_AND_INDEX_OPERATOR: { TRI_logical_index_operator_t* logicalOperator = (TRI_logical_index_operator_t*) slOperator; int res = FillLookupOperator(logicalOperator->_left, document); diff --git a/arangod/Indexes/SkiplistIndex.h b/arangod/Indexes/SkiplistIndex.h index d950c7e0d6..78e9d577f9 100644 --- a/arangod/Indexes/SkiplistIndex.h +++ b/arangod/Indexes/SkiplistIndex.h @@ -38,10 +38,6 @@ #include "VocBase/vocbase.h" #include "VocBase/voc-types.h" -// ----------------------------------------------------------------------------- -// --SECTION-- class SkiplistIndex -// ----------------------------------------------------------------------------- - typedef struct { TRI_shaped_json_t* _fields; // list of shaped json objects which the // collection should know about @@ -65,12 +61,17 @@ namespace triagens { //////////////////////////////////////////////////////////////////////////////// class SkiplistIterator { + private: + friend class SkiplistIndex; // ----------------------------------------------------------------------------- // --SECTION-- private structs // ----------------------------------------------------------------------------- + + private: + // Shorthand for the skiplist node typedef triagens::basics::SkipListNode Node; @@ -86,17 +87,20 @@ namespace triagens { // ----------------------------------------------------------------------------- // --SECTION-- private variables // ----------------------------------------------------------------------------- + + private: + SkiplistIndex* const _index; size_t _currentInterval; // starts with 0, current interval used bool _reverse; Node* _cursor; std::vector _intervals; - public: - // ----------------------------------------------------------------------------- // --SECTION-- constructors / destructors // ----------------------------------------------------------------------------- + + public: SkiplistIterator ( SkiplistIndex* const idx, @@ -124,6 +128,8 @@ namespace triagens { // ----------------------------------------------------------------------------- // --SECTION-- public methods // ----------------------------------------------------------------------------- + + public: size_t size (); @@ -137,6 +143,7 @@ namespace triagens { TRI_index_operator_t const* indexOperator, std::vector& interval ); + // ----------------------------------------------------------------------------- // --SECTION-- private methods // ----------------------------------------------------------------------------- @@ -160,6 +167,10 @@ namespace triagens { ); }; +// ----------------------------------------------------------------------------- +// --SECTION-- class SkiplistIndex +// ----------------------------------------------------------------------------- + class SkiplistIndex : public PathBasedIndex { struct KeyElementComparator { @@ -193,8 +204,8 @@ namespace triagens { friend struct KeyElementComparator; friend struct ElementElementComparator; - typedef triagens::basics::SkipList TRI_Skiplist; + // ----------------------------------------------------------------------------- // --SECTION-- constructors / destructors // ----------------------------------------------------------------------------- @@ -246,7 +257,6 @@ namespace triagens { SkiplistIterator* lookup (TRI_index_operator_t*, bool); - // ----------------------------------------------------------------------------- // --SECTION-- private methods // ----------------------------------------------------------------------------- @@ -263,7 +273,6 @@ namespace triagens { int _CmpKeyElm (TRI_skiplist_index_key_t const* leftKey, TRI_index_element_t const* rightElement); - // ----------------------------------------------------------------------------- // --SECTION-- private variables // ----------------------------------------------------------------------------- @@ -271,6 +280,7 @@ namespace triagens { private: ElementElementComparator CmpElmElm; + KeyElementComparator CmpKeyElm; ////////////////////////////////////////////////////////////////////////////////