Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

temporarily disable watermarks

This commit is contained in:
Jan Steemann 2015-09-07 11:08:22 +02:00
parent 9228fd0e89
commit 0404cb098f
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Indexes/IndexWatermarks.cpp
View File

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

2
arangod/Indexes/IndexWatermarks.h
View File

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

10
arangod/RestServer/ArangoServer.cpp
View File

@ -380,8 +380,7 @@ ArangoServer::ArangoServer (int argc, char** argv)
_pairForAqlHandler(nullptr), _pairForAqlHandler(nullptr),
_pairForJobHandler(nullptr), _pairForJobHandler(nullptr),
_indexPool(nullptr), _indexPool(nullptr),
_threadAffinity(0), _threadAffinity(0) {
_defaultIndexWatermarks() {
TRI_SetApplicationName("arangod"); 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-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.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") ("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-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-low-watermark", &_defaultIndexWatermarks.lowWatermark, "low watermark for hash and edge indexes")
("database.index-high-watermark", &_defaultIndexWatermarks.highWatermark, "high 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") ("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 // testing disables authentication
_disableAuthentication = true; _disableAuthentication = true;
} }
#if 0
// default defaults for index watermarks // default defaults for index watermarks
IndexWatermarks::SetDefaults(_defaultIndexWatermarks); IndexWatermarks::SetDefaults(_defaultIndexWatermarks);
#endif
TRI_SetThrowCollectionNotLoadedVocBase(nullptr, _throwCollectionNotLoadedError); TRI_SetThrowCollectionNotLoadedVocBase(nullptr, _throwCollectionNotLoadedError);

3
arangod/RestServer/ArangoServer.h
View File

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