temporarily disable watermarks

arangod/Indexes/IndexWatermarks.cpp

@@ -27,6 +27,7 @@
 /// @author Copyright 2011-2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
+#if 0
 #include "IndexWatermarks.h"
 
 using namespace triagens::arango;
@@ -87,6 +88,7 @@ void IndexWatermarks::SetDefaults (IndexWatermarks const& other) {
 
   DefaultHighWatermark = highWatermark;
 }
+#endif
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE

arangod/Indexes/IndexWatermarks.h

@@ -30,6 +30,7 @@
 #ifndef ARANGODB_INDEXES_INDEXWATERMARKS_H
 #define ARANGODB_INDEXES_INDEXWATERMARKS_H 1
 
+#if 0
 #include "Basics/Common.h"
 
 // -----------------------------------------------------------------------------
@@ -60,6 +61,7 @@ namespace triagens {
   }
 }
 
+#endif
 #endif
 
 // -----------------------------------------------------------------------------

arangod/RestServer/ArangoServer.cpp

@@ -380,8 +380,7 @@ ArangoServer::ArangoServer (int argc, char** argv)
     _pairForAqlHandler(nullptr),
     _pairForJobHandler(nullptr),
     _indexPool(nullptr),
-    _threadAffinity(0),
-    _defaultIndexWatermarks() {
+    _threadAffinity(0) {
 
   TRI_SetApplicationName("arangod");
 
@@ -596,9 +595,11 @@ void ArangoServer::buildApplicationServer () {
     ("database.query-cache-mode", &_queryCacheMode, "mode for the AQL query cache (on, off, demand)")
     ("database.query-cache-max-results", &_queryCacheMaxResults, "maximum number of results in query cache per database")
     ("database.index-threads", &_indexThreads, "threads to start for parallel background index creation")
+#if 0    
     ("database.index-initial-fill-factor", &_defaultIndexWatermarks.initialFillFactor, "the initial fill factor for hash and edge indexes")
     ("database.index-low-watermark", &_defaultIndexWatermarks.lowWatermark, "low watermark for hash and edge indexes")
     ("database.index-high-watermark", &_defaultIndexWatermarks.highWatermark, "high watermark for hash and edge indexes")
+#endif    
     ("database.throw-collection-not-loaded-error", &_throwCollectionNotLoadedError, "throw an error when accessing a collection that is still loading")
   ;
 
@@ -746,10 +747,11 @@ void ArangoServer::buildApplicationServer () {
     // testing disables authentication
     _disableAuthentication = true;
   }
-  
+ 
+#if 0 
   // default defaults for index watermarks
   IndexWatermarks::SetDefaults(_defaultIndexWatermarks);
-
+#endif
 
   TRI_SetThrowCollectionNotLoadedVocBase(nullptr, _throwCollectionNotLoadedError);
   

arangod/RestServer/ArangoServer.h

@@ -731,8 +731,9 @@ namespace triagens {
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief default watermarks for indexes
 ////////////////////////////////////////////////////////////////////////////////
-
+#if 0
         triagens::arango::IndexWatermarks _defaultIndexWatermarks;
+#endif      
     };
   }
 }