removed unused cases

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_AND_INDEX_OPERATOR: {
-    case TRI_NOT_INDEX_OPERATOR:
-    case TRI_OR_INDEX_OPERATOR: {
       return new TRI_logical_index_operator_t(operatorType, shaper, leftOperand, rightOperand);
     }
 

arangod/IndexOperators/index-operator.h

@@ -87,9 +87,7 @@ typedef enum {
   TRI_GE_INDEX_OPERATOR,
   TRI_GT_INDEX_OPERATOR,
 
-  TRI_AND_INDEX_OPERATOR,
+  TRI_AND_INDEX_OPERATOR
-  TRI_NOT_INDEX_OPERATOR,
-  TRI_OR_INDEX_OPERATOR
 }
 TRI_index_operator_type_e;
 

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_AND_INDEX_OPERATOR: {
-    case TRI_NOT_INDEX_OPERATOR:
-    case TRI_OR_INDEX_OPERATOR: {
       TRI_logical_index_operator_t* logicalOperator = (TRI_logical_index_operator_t*) slOperator;
       int res = FillLookupOperator(logicalOperator->_left, document);
 

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<TRI_skiplist_index_key_t, TRI_index_element_t> 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<SkiplistIteratorInterval> _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<SkiplistIteratorInterval>& 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_index_key_t, TRI_index_element_t> 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;
 
 ////////////////////////////////////////////////////////////////////////////////