diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index 7df6778721..fc0e776e60 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -141,6 +141,7 @@ add_executable( Indexes/PathBasedIndex.cpp Indexes/PrimaryIndex.cpp Indexes/SkiplistIndex2.cpp + Indexes/skiplist-helper.cpp IndexOperators/index-operator.cpp Replication/ContinuousSyncer.cpp Replication/InitialSyncer.cpp @@ -182,7 +183,6 @@ add_executable( Scheduler/Task.cpp Scheduler/TaskManager.cpp Scheduler/TimerTask.cpp - SkipLists/skiplistIndex.cpp Statistics/statistics.cpp Utils/CollectionExport.cpp Utils/Cursor.cpp diff --git a/arangod/Indexes/SkiplistIndex2.h b/arangod/Indexes/SkiplistIndex2.h index 5154204031..eaacc66df5 100644 --- a/arangod/Indexes/SkiplistIndex2.h +++ b/arangod/Indexes/SkiplistIndex2.h @@ -32,8 +32,8 @@ #include "Basics/Common.h" #include "Indexes/PathBasedIndex.h" +#include "Indexes/skiplist-helper.h" #include "IndexOperators/index-operator.h" -#include "SkipLists/skiplistIndex.h" #include "VocBase/shaped-json.h" #include "VocBase/vocbase.h" #include "VocBase/voc-types.h" diff --git a/arangod/SkipLists/skiplistIndex.cpp b/arangod/Indexes/skiplist-helper.cpp similarity index 99% rename from arangod/SkipLists/skiplistIndex.cpp rename to arangod/Indexes/skiplist-helper.cpp index 3c3b461e1d..43215d7106 100644 --- a/arangod/SkipLists/skiplistIndex.cpp +++ b/arangod/Indexes/skiplist-helper.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -/// @brief skiplist index +/// @brief skiplist index helper /// /// @file /// @@ -27,7 +27,7 @@ /// @author Copyright 2011-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#include "skiplistIndex.h" +#include "skiplist-helper.h" #include "Basics/Utf8Helper.h" #include "VocBase/document-collection.h" #include "VocBase/shaped-json.h" diff --git a/arangod/SkipLists/skiplistIndex.h b/arangod/Indexes/skiplist-helper.h similarity index 98% rename from arangod/SkipLists/skiplistIndex.h rename to arangod/Indexes/skiplist-helper.h index fc92875fc9..83fa48a221 100644 --- a/arangod/SkipLists/skiplistIndex.h +++ b/arangod/Indexes/skiplist-helper.h @@ -27,8 +27,8 @@ /// @author Copyright 2011-2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -#ifndef ARANGODB_SKIP_LISTS_SKIPLIST_INDEX_H -#define ARANGODB_SKIP_LISTS_SKIPLIST_INDEX_H 1 +#ifndef ARANGODB_INDEXES_SKIPLIST_HELPER_H +#define ARANGODB_INDEXES_SKIPLIST_HELPER_H 1 #include "Basics/Common.h" #include "Basics/SkipList.h" diff --git a/arangod/Makefile.files b/arangod/Makefile.files index 8d3c87bbd4..b4e8fa5207 100644 --- a/arangod/Makefile.files +++ b/arangod/Makefile.files @@ -99,6 +99,7 @@ arangod_libarangod_a_SOURCES = \ arangod/Indexes/PathBasedIndex.cpp \ arangod/Indexes/PrimaryIndex.cpp \ arangod/Indexes/SkiplistIndex2.cpp \ + arangod/Indexes/skiplist-helper.cpp \ arangod/IndexOperators/index-operator.cpp \ arangod/Replication/ContinuousSyncer.cpp \ arangod/Replication/InitialSyncer.cpp \ @@ -140,7 +141,6 @@ arangod_libarangod_a_SOURCES = \ arangod/Scheduler/Task.cpp \ arangod/Scheduler/TaskManager.cpp \ arangod/Scheduler/TimerTask.cpp \ - arangod/SkipLists/skiplistIndex.cpp \ arangod/Statistics/statistics.cpp \ arangod/Utils/CollectionExport.cpp \ arangod/Utils/Cursor.cpp \