Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api

arangod/Aql/Functions.cpp

@@ -41,11 +41,11 @@
 #include "FulltextIndex/fulltext-index.h"
 #include "FulltextIndex/fulltext-query.h"
 #include "FulltextIndex/fulltext-result.h"
-#include "Indexes/FulltextIndex.h"
-#include "Indexes/GeoIndex.h"
 #include "Indexes/Index.h"
 #include "Random/UniformCharacter.h"
 #include "Ssl/SslInterface.h"
+#include "StorageEngine/MMFilesFulltextIndex.h"
+#include "StorageEngine/MMFilesGeoIndex.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/Transaction.h"
 #include "Utils/TransactionContext.h"

arangod/CMakeLists.txt

@@ -56,9 +56,9 @@ if (MSVC)
 endif ()
   
 set(ROCKSDB_FILES
-  Indexes/RocksDBFeature.cpp
-  Indexes/RocksDBIndex.cpp
-  Indexes/RocksDBKeyComparator.cpp
+  StorageEngine/MMFilesPersistentIndexFeature.cpp
+  StorageEngine/MMFilesPersistentIndex.cpp
+  StorageEngine/MMFilesPersistentIndexKeyComparator.cpp
 )
 
 if (USE_ENTERPRISE)
@@ -208,17 +208,10 @@ SET(ARANGOD_SOURCES
   GeneralServer/RestStatus.cpp
   GeneralServer/VppCommTask.cpp
   GeoIndex/GeoIndex.cpp
-  Indexes/EdgeIndex.cpp
-  Indexes/FulltextIndex.cpp
-  Indexes/GeoIndex.cpp
-  Indexes/HashIndex.cpp
   Indexes/Index.cpp
   Indexes/IndexElement.cpp
   Indexes/IndexIterator.cpp
-  Indexes/PathBasedIndex.cpp
-  Indexes/PrimaryIndex.cpp
   Indexes/SimpleAttributeEqualityMatcher.cpp
-  Indexes/SkiplistIndex.cpp
   InternalRestHandler/InternalRestTraverserHandler.cpp
   Replication/ContinuousSyncer.cpp
   Replication/InitialSyncer.cpp
@@ -296,10 +289,17 @@ SET(ARANGOD_SOURCES
   StorageEngine/MMFilesDatafile.cpp
   StorageEngine/MMFilesDatafileStatistics.cpp
   StorageEngine/MMFilesDocumentOperation.cpp
+  StorageEngine/MMFilesEdgeIndex.cpp
   StorageEngine/MMFilesEngine.cpp
   StorageEngine/MMFilesLogfileManager.cpp
+  StorageEngine/MMFilesFulltextIndex.cpp
+  StorageEngine/MMFilesGeoIndex.cpp
+  StorageEngine/MMFilesHashIndex.cpp
+  StorageEngine/MMFilesPathBasedIndex.cpp
+  StorageEngine/MMFilesPrimaryIndex.cpp
   StorageEngine/MMFilesRemoverThread.cpp
   StorageEngine/MMFilesRevisionsCache.cpp
+  StorageEngine/MMFilesSkiplistIndex.cpp
   StorageEngine/MMFilesSynchronizerThread.cpp
   StorageEngine/MMFilesWalLogfile.cpp
   StorageEngine/MMFilesWalRecoverState.cpp

arangod/Replication/InitialSyncer.cpp

@@ -29,13 +29,13 @@
 #include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Indexes/Index.h"
-#include "Indexes/PrimaryIndex.h"
 #include "Logger/Logger.h"
 #include "RestServer/DatabaseFeature.h"
 #include "SimpleHttpClient/SimpleHttpClient.h"
 #include "SimpleHttpClient/SimpleHttpResult.h"
 #include "Utils/CollectionGuard.h"
 #include "StorageEngine/MMFilesDatafileHelper.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ManagedDocumentResult.h"

arangod/RestHandler/RestEdgesHandler.cpp

@@ -24,7 +24,7 @@
 #include "RestEdgesHandler.h"
 #include "Basics/ScopeGuard.h"
 #include "Cluster/ClusterMethods.h"
-#include "Indexes/EdgeIndex.h"
+#include "StorageEngine/MMFilesEdgeIndex.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/OperationCursor.h"
 #include "Utils/SingleCollectionTransaction.h"

arangod/RestHandler/RestReplicationHandler.cpp

@@ -32,9 +32,7 @@
 #include "Cluster/FollowerInfo.h"
 #include "Cluster/ClusterMethods.h"
 #include "GeneralServer/GeneralServer.h"
-#include "Indexes/EdgeIndex.h"
 #include "Indexes/Index.h"
-#include "Indexes/PrimaryIndex.h"
 #include "Logger/Logger.h"
 #include "Replication/InitialSyncer.h"
 #include "Rest/HttpRequest.h"
@@ -42,6 +40,8 @@
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/ServerIdFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
+#include "StorageEngine/MMFilesEdgeIndex.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionGuard.h"
 #include "Utils/CollectionKeys.h"

arangod/RestServer/DatabaseFeature.cpp

@@ -43,6 +43,7 @@
 #include "RestServer/QueryRegistryFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
 #include "StorageEngine/MMFilesWalMarker.h"
 #include "StorageEngine/MMFilesWalSlots.h"
 #include "StorageEngine/StorageEngine.h"
@@ -56,8 +57,6 @@
 #include "VocBase/replication-applier.h"
 #include "VocBase/vocbase.h"
 
-#include "Indexes/RocksDBIndex.h"
-
 #include <velocypack/velocypack-aliases.h>
 
 using namespace arangodb;

arangod/RestServer/arangod.cpp

@@ -76,13 +76,13 @@
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/MMFilesEngine.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
 #include "StorageEngine/MMFilesWalRecoveryFeature.h"
 #include "StorageEngine/RocksDBEngine.h"
 #include "V8Server/FoxxQueuesFeature.h"
 #include "V8Server/V8DealerFeature.h"
 #include "VocBase/IndexThreadFeature.h"
 
-#include "Indexes/RocksDBFeature.h"
 
 #ifdef _WIN32
 #include "ApplicationFeatures/WindowsServiceFeature.h"

arangod/StorageEngine/MMFilesCollection.cpp

@@ -29,12 +29,12 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/WriteLocker.h"
 #include "Basics/process-utils.h"
-#include "Indexes/PrimaryIndex.h"
 #include "Logger/Logger.h"
 #include "RestServer/DatabaseFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/MMFilesDatafile.h"
 #include "StorageEngine/MMFilesDocumentPosition.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"

arangod/StorageEngine/MMFilesCollectorThread.cpp

@@ -30,9 +30,10 @@
 #include "Basics/MutexLocker.h"
 #include "Basics/ReadLocker.h"
 #include "Basics/VelocyPackHelper.h"
-#include "Indexes/PrimaryIndex.h"
 #include "RestServer/TransactionManagerFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionGuard.h"
 #include "Utils/DatabaseGuard.h"
@@ -44,7 +45,6 @@
 #include "StorageEngine/MMFilesWalLogfile.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
 
-#include "Indexes/RocksDBIndex.h"
 
 using namespace arangodb;
 

arangod/StorageEngine/MMFilesCompactorThread.cpp

@@ -30,10 +30,10 @@
 #include "Basics/FileUtils.h"
 #include "Basics/memory-map.h"
 #include "Logger/Logger.h"
-#include "Indexes/PrimaryIndex.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/MMFilesCollection.h"
 #include "StorageEngine/MMFilesDocumentPosition.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"

arangod/StorageEngine/MMFilesDocumentOperation.cpp

@@ -23,9 +23,9 @@
 
 #include "MMFilesDocumentOperation.h"
 #include "Indexes/IndexElement.h"
-#include "Indexes/PrimaryIndex.h"
 #include "Utils/Transaction.h"
 #include "StorageEngine/MMFilesDatafileHelper.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
 #include "VocBase/LogicalCollection.h"
 
 using namespace arangodb;

arangod/StorageEngine/MMFilesEdgeIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Dr. Frank Celler
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "EdgeIndex.h"
+#include "MMFilesEdgeIndex.h"
 #include "Aql/AstNode.h"
 #include "Aql/SortCondition.h"
 #include "Basics/Exceptions.h"

arangod/StorageEngine/MMFilesEngine.cpp

@@ -38,14 +38,13 @@
 #include "StorageEngine/MMFilesCollection.h"
 #include "StorageEngine/MMFilesDatafile.h"
 #include "StorageEngine/MMFilesDatafileHelper.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ticks.h"
 #include "VocBase/vocbase.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
 
-#include "Indexes/RocksDBFeature.h"
-#include "Indexes/RocksDBIndex.h"
-
 #include <velocypack/Collection.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/velocypack-aliases.h>

arangod/StorageEngine/MMFilesFulltextIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Dr. Frank Celler
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "FulltextIndex.h"
+#include "MMFilesFulltextIndex.h"
 #include "Basics/StringRef.h"
 #include "Basics/Utf8Helper.h"
 #include "Basics/VelocyPackHelper.h"

arangod/StorageEngine/MMFilesGeoIndex.cpp

@@ -21,14 +21,13 @@
 /// @author Dr. Frank Celler
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "GeoIndex.h"
+#include "MMFilesGeoIndex.h"
 
 #include "Aql/Ast.h"
 #include "Aql/AstNode.h"
 #include "Aql/SortCondition.h"
 #include "Basics/StringRef.h"
 #include "Basics/VelocyPackHelper.h"
-#include "Indexes/GeoIndex.h"
 #include "Logger/Logger.h"
 #include "VocBase/transaction.h"
 

arangod/StorageEngine/MMFilesHashIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Dr. Frank Celler
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "HashIndex.h"
+#include "MMFilesHashIndex.h"
 #include "Aql/Ast.h"
 #include "Aql/AstNode.h"
 #include "Aql/SortCondition.h"

arangod/StorageEngine/MMFilesHashIndex.h

@@ -29,8 +29,8 @@
 #include "Basics/AssocUnique.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/fasthash.h"
-#include "Indexes/PathBasedIndex.h"
 #include "Indexes/IndexIterator.h"
+#include "StorageEngine/MMFilesPathBasedIndex.h"
 #include "Utils/Transaction.h"
 #include "VocBase/vocbase.h"
 #include "VocBase/voc-types.h"

arangod/StorageEngine/MMFilesPathBasedIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Jan Steemann
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PathBasedIndex.h"
+#include "MMFilesPathBasedIndex.h"
 #include "Aql/AstNode.h"
 #include "Basics/FixedSizeAllocator.h"
 #include "Basics/VelocyPackHelper.h"

arangod/StorageEngine/MMFilesPersistentIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Jan Steemann
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "RocksDBIndex.h"
+#include "MMFilesPersistentIndex.h"
 #include "Aql/AstNode.h"
 #include "Aql/SortCondition.h"
 #include "Basics/AttributeNameParser.h"
@@ -29,9 +29,9 @@
 #include "Basics/StaticStrings.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Indexes/IndexLookupContext.h"
-#include "Indexes/PrimaryIndex.h"
-#include "Indexes/RocksDBFeature.h"
-#include "Indexes/RocksDBKeyComparator.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
+#include "StorageEngine/MMFilesPersistentIndexKeyComparator.h"
 #include "Utils/Transaction.h"
 #include "VocBase/LogicalCollection.h"
 

arangod/StorageEngine/MMFilesPersistentIndex.h

@@ -27,8 +27,8 @@
 #include "Basics/Common.h"
 #include "Aql/AstNode.h"
 #include "Indexes/IndexIterator.h"
-#include "Indexes/PathBasedIndex.h"
-#include "Indexes/RocksDBFeature.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
+#include "StorageEngine/MMFilesPathBasedIndex.h"
 #include "VocBase/vocbase.h"
 #include "VocBase/voc-types.h"
 

arangod/StorageEngine/MMFilesPersistentIndexFeature.cpp

@@ -21,15 +21,15 @@
 /// @author Jan Steemann
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "RocksDBFeature.h"
+#include "MMFilesPersistentIndexFeature.h"
 #include "Basics/Exceptions.h"
 #include "Basics/FileUtils.h"
 #include "Basics/tri-strings.h"
-#include "Indexes/RocksDBKeyComparator.h"
 #include "Logger/Logger.h"
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
 #include "RestServer/DatabasePathFeature.h"
+#include "StorageEngine/MMFilesPersistentIndexKeyComparator.h"
   
 #include <rocksdb/db.h>
 #include <rocksdb/convenience.h>

arangod/StorageEngine/MMFilesPersistentIndexKeyComparator.cpp

@@ -21,11 +21,11 @@
 /// @author Jan Steemann
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "RocksDBKeyComparator.h"
+#include "MMFilesPersistentIndexKeyComparator.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Indexes/Index.h"
-#include "Indexes/RocksDBIndex.h"
 #include "Logger/Logger.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
 
 #include <rocksdb/db.h>
 #include <rocksdb/comparator.h>

arangod/StorageEngine/MMFilesPersistentIndexKeyComparator.h

@@ -25,7 +25,7 @@
 #define ARANGOD_INDEXES_ROCKS_DB_KEY_COMPARATOR_H 1
 
 #include "Basics/Common.h"
-#include "Indexes/RocksDBIndex.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
 
 #include <rocksdb/comparator.h>
 #include <rocksdb/slice.h>

arangod/StorageEngine/MMFilesPrimaryIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Dr. Frank Celler
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PrimaryIndex.h"
+#include "MMFilesPrimaryIndex.h"
 #include "Aql/AstNode.h"
 #include "Basics/Exceptions.h"
 #include "Basics/StaticStrings.h"

arangod/StorageEngine/MMFilesSkiplistIndex.cpp

@@ -21,7 +21,7 @@
 /// @author Dr. Frank Celler
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "SkiplistIndex.h"
+#include "MMFilesSkiplistIndex.h"
 #include "Aql/AstNode.h"
 #include "Aql/SortCondition.h"
 #include "Basics/AttributeNameParser.h"

arangod/StorageEngine/MMFilesSkiplistIndex.h

@@ -28,7 +28,7 @@
 #include "Aql/AstNode.h"
 #include "Basics/SkipList.h"
 #include "Indexes/IndexIterator.h"
-#include "Indexes/PathBasedIndex.h"
+#include "StorageEngine/MMFilesPathBasedIndex.h"
 #include "Utils/Transaction.h"
 #include "VocBase/vocbase.h"
 #include "VocBase/voc-types.h"

arangod/StorageEngine/MMFilesWalRecoverState.cpp

@@ -32,14 +32,13 @@
 #include "Basics/VelocyPackHelper.h"
 #include "RestServer/DatabaseFeature.h"
 #include "StorageEngine/MMFilesDatafileHelper.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
 #include "StorageEngine/MMFilesWalSlots.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"
 #include "VocBase/LogicalCollection.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
 
-#include "Indexes/RocksDBFeature.h"
-
 #include <velocypack/Collection.h>
 #include <velocypack/Parser.h>
 #include <velocypack/velocypack-aliases.h>

arangod/StorageEngine/RocksDBEngine.cpp

@@ -37,8 +37,8 @@
 #include "VocBase/vocbase.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
 
-#include "Indexes/RocksDBFeature.h"
-#include "Indexes/RocksDBIndex.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
 
 #include <velocypack/Collection.h>
 #include <velocypack/Iterator.h>

arangod/Utils/CollectionExport.cpp

@@ -23,7 +23,7 @@
 
 #include "CollectionExport.h"
 #include "Basics/WriteLocker.h"
-#include "Indexes/PrimaryIndex.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionGuard.h"

arangod/Utils/Transaction.cpp

@@ -36,10 +36,6 @@
 #include "Cluster/ClusterMethods.h"
 #include "Cluster/FollowerInfo.h"
 #include "Cluster/ServerState.h"
-#include "Indexes/EdgeIndex.h"
-#include "Indexes/HashIndex.h"
-#include "Indexes/PrimaryIndex.h"
-#include "Indexes/SkiplistIndex.h"
 #include "Logger/Logger.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/Events.h"
@@ -47,6 +43,11 @@
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/TransactionContext.h"
 #include "StorageEngine/MMFilesDatafileHelper.h"
+#include "StorageEngine/MMFilesEdgeIndex.h"
+#include "StorageEngine/MMFilesHashIndex.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "StorageEngine/MMFilesSkiplistIndex.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/KeyGenerator.h"
 #include "VocBase/LogicalCollection.h"
@@ -54,7 +55,6 @@
 #include "VocBase/ticks.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
 
-#include "Indexes/RocksDBIndex.h"
 
 #include <rocksdb/utilities/optimistic_transaction_db.h>
 #include <rocksdb/utilities/transaction.h>

arangod/V8Server/v8-collection.cpp

@@ -36,7 +36,6 @@
 #include "Cluster/ClusterInfo.h"
 #include "Cluster/FollowerInfo.h"
 #include "Cluster/ClusterMethods.h"
-#include "Indexes/PrimaryIndex.h"
 #include "RestServer/DatabaseFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/MMFilesEngine.h"

arangod/V8Server/v8-query.cpp

@@ -27,7 +27,7 @@
 #include "Basics/StaticStrings.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/fasthash.h"
-#include "Indexes/GeoIndex.h"
+#include "StorageEngine/MMFilesGeoIndex.h"
 #include "Utils/OperationCursor.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/V8TransactionContext.h"

arangod/V8Server/v8-vocindex.cpp

@@ -30,9 +30,8 @@
 #include "Cluster/ClusterInfo.h"
 #include "Cluster/ClusterMethods.h"
 #include "FulltextIndex/fulltext-index.h"
-#include "Indexes/EdgeIndex.h"
 #include "Indexes/Index.h"
-#include "Indexes/PrimaryIndex.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
 #include "Utils/Events.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/V8TransactionContext.h"
@@ -46,8 +45,6 @@
 #include "VocBase/modes.h"
 #include "VocBase/LogicalCollection.h"
 
-#include "Indexes/RocksDBIndex.h"
-
 #include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/velocypack-aliases.h>

arangod/VocBase/EdgeCollectionInfo.cpp

@@ -22,7 +22,7 @@
 
 #include "EdgeCollectionInfo.h"
 #include "Cluster/ClusterMethods.h"
-#include "Indexes/EdgeIndex.h"
+#include "StorageEngine/MMFilesEdgeIndex.h"
 #include "Utils/OperationCursor.h"
 
 using namespace arangodb::traverser;

arangod/VocBase/LogicalCollection.cpp

@@ -37,18 +37,18 @@
 #include "Cluster/ClusterMethods.h"
 #include "Cluster/FollowerInfo.h"
 #include "Cluster/ServerState.h"
-#include "Indexes/EdgeIndex.h"
-#include "Indexes/FulltextIndex.h"
-#include "Indexes/GeoIndex.h"
-#include "Indexes/HashIndex.h"
-#include "Indexes/PrimaryIndex.h"
-#include "Indexes/RocksDBIndex.h"
-#include "Indexes/SkiplistIndex.h"
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/RevisionCacheFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/MMFilesDocumentOperation.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
+#include "StorageEngine/MMFilesEdgeIndex.h"
+#include "StorageEngine/MMFilesFulltextIndex.h"
+#include "StorageEngine/MMFilesGeoIndex.h"
+#include "StorageEngine/MMFilesHashIndex.h"
+#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "StorageEngine/MMFilesSkiplistIndex.h"
 #include "StorageEngine/MMFilesWalMarker.h"
 #include "StorageEngine/MMFilesWalSlots.h"
 #include "StorageEngine/StorageEngine.h"

arangod/VocBase/Traverser.cpp

@@ -23,7 +23,6 @@
 
 #include "Traverser.h"
 #include "Basics/VelocyPackHelper.h"
-#include "Indexes/EdgeIndex.h"
 #include "Utils/Transaction.h"
 #include "Utils/TransactionContext.h"
 #include "VocBase/KeyGenerator.h"

arangod/VocBase/transaction.cpp

@@ -28,13 +28,13 @@
 #include "Basics/StaticStrings.h"
 #include "StorageEngine/MMFilesDatafileHelper.h"
 #include "StorageEngine/MMFilesDocumentOperation.h"
+#include "StorageEngine/MMFilesPersistentIndexFeature.h"
 #include "Utils/Transaction.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/modes.h"
 #include "VocBase/ticks.h"
 #include "StorageEngine/MMFilesLogfileManager.h"
 
-#include "Indexes/RocksDBFeature.h"
 
 #include <rocksdb/db.h>
 #include <rocksdb/options.h>