moved files into engine directory

LES-TODOS

@@ -4,20 +4,23 @@ done
 - factor out transactions from LogfileManager
 - concept "collection locks"
     - 3 states: READ / WRITE / EXCLUSIVE for locks
+- move index files into directory
+- rename index classes
+- move engine files into MMFiles directory
 
 in progress
 -----------
-
-- move files into directory: now in progress for indexes
-- rename classes: now in progress for indexes
+- split IndexElement
 
 to do
 -----
+- OperationCursor: delete getMore, rename getMoreMptr to getMoreTokens
+- create AqlValue type for document ids
 - move engine-specific parts of transaction.cpp into engine
+- transaction API
 - check for illegal includes
 - fix includes during API conversion
 - DML API
-- transaction API
 - DDL API
 - index API
 - add new serialization RW lock to LogicalCollection. all DML ops must acquire it in read mode, the explicit lock command must acquire it in write mode.

UnitTests/Basics/structure-size-test.cpp

@@ -30,8 +30,8 @@
 #define BOOST_TEST_INCLUDED
 #include <boost/test/unit_test.hpp>
 
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesWalMarker.h"
 
 template<typename T, typename U> size_t offsetOf (U T::*member) {
   return (char*) &((T*)nullptr->*member) - (char*) nullptr;

arangod/Aql/Functions.cpp

@@ -44,8 +44,8 @@
 #include "Indexes/Index.h"
 #include "Random/UniformCharacter.h"
 #include "Ssl/SslInterface.h"
-#include "StorageEngine/MMFilesFulltextIndex.h"
-#include "StorageEngine/MMFilesGeoIndex.h"
+#include "MMFiles/MMFilesFulltextIndex.h"
+#include "MMFiles/MMFilesGeoIndex.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/Transaction.h"
 #include "Utils/TransactionContext.h"

arangod/CMakeLists.txt

@@ -55,11 +55,6 @@ if (MSVC)
   )
 endif ()
   
-set(ROCKSDB_FILES
-  StorageEngine/MMFilesPersistentIndexFeature.cpp
-  StorageEngine/MMFilesPersistentIndex.cpp
-  StorageEngine/MMFilesPersistentIndexKeyComparator.cpp
-)
 
 if (USE_ENTERPRISE)
   set(ENTERPRISE_FILES "")
@@ -71,7 +66,6 @@ endif ()
 
 SET(ARANGOD_SOURCES
   ${ProductVersionFiles}
-  ${ROCKSDB_FILES}
   ${ENTERPRISE_FILES}
   Actions/ActionFeature.cpp
   Actions/RestActionHandler.cpp
@@ -213,6 +207,34 @@ SET(ARANGOD_SOURCES
   Indexes/IndexIterator.cpp
   Indexes/SimpleAttributeEqualityMatcher.cpp
   InternalRestHandler/InternalRestTraverserHandler.cpp
+  MMFiles/MMFilesAllocatorThread.cpp
+  MMFiles/MMFilesCleanupThread.cpp
+  MMFiles/MMFilesCollection.cpp
+  MMFiles/MMFilesCollectorThread.cpp
+  MMFiles/MMFilesCompactorThread.cpp
+  MMFiles/MMFilesDatafile.cpp
+  MMFiles/MMFilesDatafileStatistics.cpp
+  MMFiles/MMFilesDocumentOperation.cpp
+  MMFiles/MMFilesEdgeIndex.cpp
+  MMFiles/MMFilesEngine.cpp
+  MMFiles/MMFilesLogfileManager.cpp
+  MMFiles/MMFilesFulltextIndex.cpp
+  MMFiles/MMFilesGeoIndex.cpp
+  MMFiles/MMFilesHashIndex.cpp
+  MMFiles/MMFilesPathBasedIndex.cpp
+  MMFiles/MMFilesPersistentIndexFeature.cpp
+  MMFiles/MMFilesPersistentIndex.cpp
+  MMFiles/MMFilesPersistentIndexKeyComparator.cpp
+  MMFiles/MMFilesPrimaryIndex.cpp
+  MMFiles/MMFilesRemoverThread.cpp
+  MMFiles/MMFilesRevisionsCache.cpp
+  MMFiles/MMFilesSkiplistIndex.cpp
+  MMFiles/MMFilesSynchronizerThread.cpp
+  MMFiles/MMFilesWalLogfile.cpp
+  MMFiles/MMFilesWalRecoverState.cpp
+  MMFiles/MMFilesWalRecoveryFeature.cpp
+  MMFiles/MMFilesWalSlot.cpp
+  MMFiles/MMFilesWalSlots.cpp
   Replication/ContinuousSyncer.cpp
   Replication/InitialSyncer.cpp
   Replication/Syncer.cpp
@@ -281,31 +303,6 @@ SET(ARANGOD_SOURCES
   Statistics/StatisticsFeature.cpp
   Statistics/statistics.cpp
   StorageEngine/EngineSelectorFeature.cpp
-  StorageEngine/MMFilesAllocatorThread.cpp
-  StorageEngine/MMFilesCleanupThread.cpp
-  StorageEngine/MMFilesCollection.cpp
-  StorageEngine/MMFilesCollectorThread.cpp
-  StorageEngine/MMFilesCompactorThread.cpp
-  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
-  StorageEngine/MMFilesWalRecoveryFeature.cpp
-  StorageEngine/MMFilesWalSlot.cpp
-  StorageEngine/MMFilesWalSlots.cpp
   StorageEngine/RocksDBEngine.cpp
   Utils/AqlTransaction.cpp
   Utils/CollectionExport.cpp

arangod/MMFiles/MMFilesAllocatorThread.cpp

@@ -25,7 +25,7 @@
 #include "Logger/Logger.h"
 #include "Basics/ConditionLocker.h"
 #include "Basics/Exceptions.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesCleanupThread.cpp

@@ -34,7 +34,7 @@
 #include "Utils/CursorRepository.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/LogicalCollection.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
   

arangod/MMFiles/MMFilesCollection.cpp

@@ -32,18 +32,18 @@
 #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 "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDocumentPosition.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"
 #include "Utils/Transaction.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/KeyGenerator.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ticks.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesCollection.h

@@ -27,8 +27,8 @@
 #include "Basics/Common.h"
 #include "Basics/ReadWriteLock.h"
 #include "Indexes/IndexLookupContext.h"
-#include "StorageEngine/MMFilesDatafileStatistics.h"
-#include "StorageEngine/MMFilesRevisionsCache.h"
+#include "MMFiles/MMFilesDatafileStatistics.h"
+#include "MMFiles/MMFilesRevisionsCache.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/KeyGenerator.h"
 #include "VocBase/ManagedDocumentResult.h"

arangod/MMFiles/MMFilesCollectorThread.cpp

@@ -32,18 +32,18 @@
 #include "Basics/VelocyPackHelper.h"
 #include "RestServer/TransactionManagerFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesPrimaryIndex.h"
-#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionGuard.h"
 #include "Utils/DatabaseGuard.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"
 #include "VocBase/CompactionLocker.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/LogicalCollection.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 
 using namespace arangodb;

arangod/MMFiles/MMFilesCollectorThread.h

@@ -28,8 +28,8 @@
 #include "Basics/ConditionVariable.h"
 #include "Basics/Mutex.h"
 #include "Basics/Thread.h"
-#include "StorageEngine/MMFilesCollectorCache.h"
-#include "StorageEngine/MMFilesDatafile.h"
+#include "MMFiles/MMFilesCollectorCache.h"
+#include "MMFiles/MMFilesDatafile.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/voc-types.h"
 

arangod/MMFiles/MMFilesCompactorThread.cpp

@@ -31,14 +31,14 @@
 #include "Basics/memory-map.h"
 #include "Logger/Logger.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesCollection.h"
-#include "StorageEngine/MMFilesDocumentPosition.h"
-#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesCollection.h"
+#include "MMFiles/MMFilesDocumentPosition.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"
 #include "VocBase/CompactionLocker.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/vocbase.h"
 

arangod/MMFiles/MMFilesDatafile.cpp

@@ -31,7 +31,7 @@
 #include "Basics/memory-map.h"
 #include "Basics/tri-strings.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/ticks.h"
 
 #include <sstream>

arangod/MMFiles/MMFilesDatafileHelper.h

@@ -25,7 +25,7 @@
 #define ARANGOD_STORAGE_ENGINE_MMFILES_DATAFILE_HELPER_H 1
 
 #include "Basics/Common.h"
-#include "StorageEngine/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafile.h"
 
 namespace arangodb {
 namespace MMFilesDatafileHelper {

arangod/MMFiles/MMFilesDatafileStatistics.cpp

@@ -26,7 +26,7 @@
 #include "Basics/ReadLocker.h"
 #include "Basics/WriteLocker.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafile.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesDocumentOperation.cpp

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

arangod/MMFiles/MMFilesDocumentPosition.h

@@ -25,7 +25,7 @@
 #define ARANGOD_STORAGE_ENGINE_MMFILES_DOCUMENT_POSITION_H 1
 
 #include "Basics/Common.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/voc-types.h"
 
 namespace arangodb {

arangod/MMFiles/MMFilesEngine.cpp

@@ -33,17 +33,17 @@
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/DatabasePathFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesCleanupThread.h"
-#include "StorageEngine/MMFilesCompactorThread.h"
-#include "StorageEngine/MMFilesCollection.h"
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesPersistentIndex.h"
-#include "StorageEngine/MMFilesPersistentIndexFeature.h"
+#include "MMFiles/MMFilesCleanupThread.h"
+#include "MMFiles/MMFilesCompactorThread.h"
+#include "MMFiles/MMFilesCollection.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesPersistentIndexFeature.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ticks.h"
 #include "VocBase/vocbase.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Collection.h>
 #include <velocypack/Iterator.h>

arangod/MMFiles/MMFilesEngine.h

@@ -26,7 +26,7 @@
 
 #include "Basics/Common.h"
 #include "Basics/Mutex.h"
-#include "StorageEngine/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafile.h"
 #include "StorageEngine/StorageEngine.h"
 
 #include <velocypack/Builder.h>

arangod/MMFiles/MMFilesHashIndex.h

@@ -30,7 +30,7 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/fasthash.h"
 #include "Indexes/IndexIterator.h"
-#include "StorageEngine/MMFilesPathBasedIndex.h"
+#include "MMFiles/MMFilesPathBasedIndex.h"
 #include "Utils/Transaction.h"
 #include "VocBase/vocbase.h"
 #include "VocBase/voc-types.h"

arangod/MMFiles/MMFilesLogfileManager.cpp

@@ -41,13 +41,13 @@
 #include "RestServer/DatabasePathFeature.h"
 #include "RestServer/TransactionManagerFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesAllocatorThread.h"
-#include "StorageEngine/MMFilesCollectorThread.h"
-#include "StorageEngine/MMFilesRemoverThread.h"
-#include "StorageEngine/MMFilesWalMarker.h"
-#include "StorageEngine/MMFilesWalRecoverState.h"
-#include "StorageEngine/MMFilesWalSlots.h"
-#include "StorageEngine/MMFilesSynchronizerThread.h"
+#include "MMFiles/MMFilesAllocatorThread.h"
+#include "MMFiles/MMFilesCollectorThread.h"
+#include "MMFiles/MMFilesRemoverThread.h"
+#include "MMFiles/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesWalRecoverState.h"
+#include "MMFiles/MMFilesWalSlots.h"
+#include "MMFiles/MMFilesSynchronizerThread.h"
 
 using namespace arangodb;
 using namespace arangodb::application_features;

arangod/MMFiles/MMFilesLogfileManager.h

@@ -28,8 +28,8 @@
 
 #include "Basics/Mutex.h"
 #include "Basics/ReadWriteLock.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
-#include "StorageEngine/MMFilesWalSlots.h"
+#include "MMFiles/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalSlots.h"
 #include "VocBase/TransactionManager.h"
 #include "VocBase/voc-types.h"
 

arangod/MMFiles/MMFilesPersistentIndex.cpp

@@ -29,9 +29,9 @@
 #include "Basics/StaticStrings.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Indexes/IndexLookupContext.h"
-#include "StorageEngine/MMFilesPrimaryIndex.h"
-#include "StorageEngine/MMFilesPersistentIndexFeature.h"
-#include "StorageEngine/MMFilesPersistentIndexKeyComparator.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesPersistentIndexFeature.h"
+#include "MMFiles/MMFilesPersistentIndexKeyComparator.h"
 #include "Utils/Transaction.h"
 #include "VocBase/LogicalCollection.h"
 

arangod/MMFiles/MMFilesPersistentIndex.h

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

arangod/MMFiles/MMFilesPersistentIndexFeature.cpp

@@ -29,7 +29,7 @@
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
 #include "RestServer/DatabasePathFeature.h"
-#include "StorageEngine/MMFilesPersistentIndexKeyComparator.h"
+#include "MMFiles/MMFilesPersistentIndexKeyComparator.h"
   
 #include <rocksdb/db.h>
 #include <rocksdb/convenience.h>

arangod/MMFiles/MMFilesPersistentIndexKeyComparator.cpp

@@ -25,7 +25,7 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Indexes/Index.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
 
 #include <rocksdb/db.h>
 #include <rocksdb/comparator.h>

arangod/MMFiles/MMFilesPersistentIndexKeyComparator.h

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

arangod/MMFiles/MMFilesRemoverThread.cpp

@@ -26,7 +26,7 @@
 #include "Logger/Logger.h"
 #include "Basics/ConditionLocker.h"
 #include "Basics/Exceptions.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesRevisionsCache.cpp

@@ -26,7 +26,7 @@
 #include "Basics/WriteLocker.h"
 #include "Basics/xxhash.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesRevisionsCache.h

@@ -27,7 +27,7 @@
 #include "Basics/Common.h"
 #include "Basics/AssocUnique.h"
 #include "Basics/ReadWriteLock.h"
-#include "StorageEngine/MMFilesDocumentPosition.h"
+#include "MMFiles/MMFilesDocumentPosition.h"
 #include "VocBase/voc-types.h"
 
 struct TRI_df_marker_t;

arangod/MMFiles/MMFilesSkiplistIndex.h

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

arangod/MMFiles/MMFilesSynchronizerThread.cpp

@@ -27,10 +27,10 @@
 #include "Basics/Exceptions.h"
 #include "Basics/memory-map.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesWalSlots.h"
-#include "StorageEngine/MMFilesWalSyncRegion.h"
+#include "MMFiles/MMFilesWalSlots.h"
+#include "MMFiles/MMFilesWalSyncRegion.h"
 #include "VocBase/ticks.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
   

arangod/MMFiles/MMFilesSynchronizerThread.h

@@ -27,7 +27,7 @@
 #include "Basics/Common.h"
 #include "Basics/ConditionVariable.h"
 #include "Basics/Thread.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 namespace arangodb {
 class MMFilesLogfileManager;

arangod/MMFiles/MMFilesWalLogfile.cpp

@@ -24,7 +24,7 @@
 #include "MMFilesWalLogfile.h"
 #include "Basics/FileUtils.h"
 #include "Basics/files.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesWalLogfile.h

@@ -26,9 +26,9 @@
 
 #include "Basics/Common.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesWalMarker.h"
 #include "VocBase/voc-types.h"
 
 namespace arangodb {

arangod/MMFiles/MMFilesWalMarker.h

@@ -25,8 +25,8 @@
 #define ARANGOD_STORAGE_ENGINE_MMFILES_WAL_MARKER_H 1
 
 #include "Basics/Common.h"
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/voc-types.h"
 
 #include <velocypack/Slice.h>

arangod/MMFiles/MMFilesWalRecoverState.cpp

@@ -31,13 +31,13 @@
 #include "Basics/tri-strings.h"
 #include "Basics/VelocyPackHelper.h"
 #include "RestServer/DatabaseFeature.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesPersistentIndexFeature.h"
-#include "StorageEngine/MMFilesWalSlots.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesPersistentIndexFeature.h"
+#include "MMFiles/MMFilesWalSlots.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"
 #include "VocBase/LogicalCollection.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Collection.h>
 #include <velocypack/Parser.h>

arangod/MMFiles/MMFilesWalRecoverState.h

@@ -25,12 +25,12 @@
 #define ARANGOD_MMFILES_WAL_RECOVER_STATE_H 1
 
 #include "Basics/Common.h"
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesWalMarker.h"
 #include "VocBase/ticks.h"
 #include "VocBase/voc-types.h"
 #include "VocBase/vocbase.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 namespace arangodb {
 class DatabaseFeature;

arangod/MMFiles/MMFilesWalRecoveryFeature.cpp

@@ -27,7 +27,7 @@
 #include "Logger/Logger.h"
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 using namespace arangodb::application_features;

arangod/MMFiles/MMFilesWalSlot.cpp

@@ -23,7 +23,7 @@
 
 #include "MMFilesWalSlot.h"
 #include "Basics/hashes.h"
-#include "StorageEngine/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesWalMarker.h"
 
 using namespace arangodb;
 

arangod/MMFiles/MMFilesWalSlot.h

@@ -25,7 +25,7 @@
 #define ARANGOD_MMFILES_WAL_SLOT_H 1
 
 #include "Basics/Common.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 namespace arangodb {
 class MMFilesWalSlots;

arangod/MMFiles/MMFilesWalSlots.cpp

@@ -25,10 +25,10 @@
 #include "Basics/ConditionLocker.h"
 #include "Basics/MutexLocker.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/ticks.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
   

arangod/MMFiles/MMFilesWalSlots.h

@@ -27,9 +27,9 @@
 #include "Basics/Common.h"
 #include "Basics/ConditionVariable.h"
 #include "Basics/Mutex.h"
-#include "StorageEngine/MMFilesWalSlot.h"
-#include "StorageEngine/MMFilesWalSyncRegion.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalSlot.h"
+#include "MMFiles/MMFilesWalSyncRegion.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 namespace arangodb {
 class MMFilesLogfileManager;

arangod/MMFiles/MMFilesWalSyncRegion.h

@@ -25,7 +25,7 @@
 #define ARANGOD_MMFILES_WAL_SYNC_REGION_H 1
 
 #include "Basics/Common.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 namespace arangodb {
 

arangod/Replication/InitialSyncer.cpp

@@ -34,8 +34,8 @@
 #include "SimpleHttpClient/SimpleHttpClient.h"
 #include "SimpleHttpClient/SimpleHttpResult.h"
 #include "Utils/CollectionGuard.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/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 "StorageEngine/MMFilesEdgeIndex.h"
+#include "MMFiles/MMFilesEdgeIndex.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/OperationCursor.h"
 #include "Utils/SingleCollectionTransaction.h"

arangod/RestHandler/RestExportHandler.cpp

@@ -30,7 +30,7 @@
 #include "Utils/CollectionExport.h"
 #include "Utils/Cursor.h"
 #include "Utils/CursorRepository.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Dumper.h>

arangod/RestHandler/RestReplicationHandler.cpp

@@ -40,8 +40,8 @@
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/ServerIdFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesEdgeIndex.h"
-#include "StorageEngine/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesEdgeIndex.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionGuard.h"
 #include "Utils/CollectionKeys.h"
@@ -53,7 +53,7 @@
 #include "VocBase/replication-applier.h"
 #include "VocBase/replication-dump.h"
 #include "VocBase/ticks.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Collection.h>

arangod/RestHandler/RestWalHandler.cpp

@@ -25,7 +25,7 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Cluster/ClusterMethods.h"
 #include "Cluster/ServerState.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 using namespace arangodb::rest;

arangod/RestServer/DatabaseFeature.cpp

@@ -42,10 +42,10 @@
 #include "RestServer/DatabasePathFeature.h"
 #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 "MMFiles/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesWalSlots.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CursorRepository.h"
 #include "Utils/Events.h"

arangod/RestServer/UpgradeFeature.cpp

@@ -27,7 +27,7 @@
 #include "ProgramOptions/Section.h"
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/InitDatabaseFeature.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 #include "V8/v8-globals.h"
 #include "V8Server/V8Context.h"
 #include "V8Server/V8DealerFeature.h"

arangod/RestServer/arangod.cpp

@@ -74,10 +74,10 @@
 #include "Ssl/SslServerFeature.h"
 #include "Statistics/StatisticsFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesEngine.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
-#include "StorageEngine/MMFilesPersistentIndexFeature.h"
-#include "StorageEngine/MMFilesWalRecoveryFeature.h"
+#include "MMFiles/MMFilesEngine.h"
+#include "MMFiles/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesPersistentIndexFeature.h"
+#include "MMFiles/MMFilesWalRecoveryFeature.h"
 #include "StorageEngine/RocksDBEngine.h"
 #include "V8Server/FoxxQueuesFeature.h"
 #include "V8Server/V8DealerFeature.h"

arangod/StorageEngine/EngineSelectorFeature.cpp

@@ -24,7 +24,7 @@
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
-#include "StorageEngine/MMFilesEngine.h"
+#include "MMFiles/MMFilesEngine.h"
 #include "StorageEngine/RocksDBEngine.h"
 #include "StorageEngine/StorageEngine.h"
 

arangod/StorageEngine/RocksDBEngine.cpp

@@ -35,10 +35,10 @@
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ticks.h"
 #include "VocBase/vocbase.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
-#include "StorageEngine/MMFilesPersistentIndexFeature.h"
-#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesPersistentIndexFeature.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
 
 #include <velocypack/Collection.h>
 #include <velocypack/Iterator.h>

arangod/StorageEngine/StorageEngine.h

@@ -26,7 +26,7 @@
 
 #include "Basics/Common.h"
 #include "ApplicationFeatures/ApplicationFeature.h"
-#include "StorageEngine/MMFilesCollectorCache.h"
+#include "MMFiles/MMFilesCollectorCache.h"
 #include "VocBase/voc-types.h"
 #include "VocBase/vocbase.h"
 

arangod/Utils/CollectionExport.cpp

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

arangod/Utils/CollectionKeys.cpp

@@ -29,13 +29,13 @@
 #include "Utils/CollectionGuard.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/StandaloneTransactionContext.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/RevisionCacheChunk.h"
 #include "VocBase/ticks.h"
 #include "VocBase/vocbase.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>

arangod/Utils/Transaction.cpp

@@ -42,18 +42,18 @@
 #include "Utils/OperationCursor.h"
 #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 "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesEdgeIndex.h"
+#include "MMFiles/MMFilesHashIndex.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesSkiplistIndex.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/KeyGenerator.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ManagedDocumentResult.h"
 #include "VocBase/ticks.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 
 #include <rocksdb/utilities/optimistic_transaction_db.h>

arangod/Utils/TransactionContext.cpp

@@ -25,8 +25,8 @@
 #include "Basics/MutexLocker.h"
 #include "Basics/StringBuffer.h"
 #include "RestServer/TransactionManagerFeature.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/Transaction.h"
 #include "VocBase/Ditch.h"

arangod/V8Server/v8-collection.cpp

@@ -38,7 +38,7 @@
 #include "Cluster/ClusterMethods.h"
 #include "RestServer/DatabaseFeature.h"
 #include "StorageEngine/EngineSelectorFeature.h"
-#include "StorageEngine/MMFilesEngine.h"
+#include "MMFiles/MMFilesEngine.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/OperationOptions.h"
 #include "Utils/OperationResult.h"
@@ -53,7 +53,7 @@
 #include "VocBase/KeyGenerator.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/modes.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/HexDump.h>

arangod/V8Server/v8-query.cpp

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

arangod/V8Server/v8-replication.cpp

@@ -34,7 +34,7 @@
 #include "V8/v8-vpack.h"
 #include "V8Server/v8-vocbaseprivate.h"
 #include "VocBase/replication-dump.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Parser.h>

arangod/V8Server/v8-vocbase.cpp

@@ -78,7 +78,7 @@
 #include "VocBase/KeyGenerator.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/modes.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 using namespace arangodb::basics;

arangod/V8Server/v8-vocindex.cpp

@@ -31,7 +31,7 @@
 #include "Cluster/ClusterMethods.h"
 #include "FulltextIndex/fulltext-index.h"
 #include "Indexes/Index.h"
-#include "StorageEngine/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
 #include "Utils/Events.h"
 #include "Utils/SingleCollectionTransaction.h"
 #include "Utils/V8TransactionContext.h"

arangod/VocBase/CollectionRevisionsCache.cpp

@@ -25,7 +25,7 @@
 #include "Basics/ReadLocker.h"
 #include "Basics/WriteLocker.h"
 #include "Basics/xxhash.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/PhysicalCollection.h"
 #include "VocBase/RevisionCacheChunk.h"

arangod/VocBase/Ditch.cpp

@@ -24,7 +24,7 @@
 #include "Ditch.h"
 #include "Basics/MutexLocker.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafile.h"
 
 using namespace arangodb;
 

arangod/VocBase/EdgeCollectionInfo.cpp

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

arangod/VocBase/LogicalCollection.cpp

@@ -40,17 +40,17 @@
 #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 "MMFiles/MMFilesDocumentOperation.h"
+#include "MMFiles/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesEdgeIndex.h"
+#include "MMFiles/MMFilesFulltextIndex.h"
+#include "MMFiles/MMFilesGeoIndex.h"
+#include "MMFiles/MMFilesHashIndex.h"
+#include "MMFiles/MMFilesPersistentIndex.h"
+#include "MMFiles/MMFilesPrimaryIndex.h"
+#include "MMFiles/MMFilesSkiplistIndex.h"
+#include "MMFiles/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesWalSlots.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/CollectionReadLocker.h"

arangod/VocBase/ReadCache.h

@@ -30,7 +30,7 @@
 #include "VocBase/RevisionCacheChunk.h"
 #include "VocBase/RevisionCacheChunkAllocator.h"
 #include "VocBase/voc-types.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 namespace arangodb {
 

arangod/VocBase/replication-dump.cpp

@@ -27,15 +27,15 @@
 #include "Basics/StringRef.h"
 #include "Basics/VPackStringBufferAdapter.h"
 #include "Logger/Logger.h"
-#include "StorageEngine/MMFilesDatafile.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
-#include "StorageEngine/MMFilesWalMarker.h"
+#include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesWalMarker.h"
 #include "VocBase/CompactionLocker.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/vocbase.h"
-#include "StorageEngine/MMFilesWalLogfile.h"
+#include "MMFiles/MMFilesWalLogfile.h"
 
 #include <velocypack/Dumper.h>
 #include <velocypack/Options.h>

arangod/VocBase/transaction.cpp

@@ -26,14 +26,14 @@
 #include "Logger/Logger.h"
 #include "Basics/Exceptions.h"
 #include "Basics/StaticStrings.h"
-#include "StorageEngine/MMFilesDatafileHelper.h"
-#include "StorageEngine/MMFilesDocumentOperation.h"
-#include "StorageEngine/MMFilesPersistentIndexFeature.h"
+#include "MMFiles/MMFilesDatafileHelper.h"
+#include "MMFiles/MMFilesDocumentOperation.h"
+#include "MMFiles/MMFilesPersistentIndexFeature.h"
 #include "Utils/Transaction.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/modes.h"
 #include "VocBase/ticks.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 
 #include <rocksdb/db.h>

arangod/VocBase/vocbase.cpp

@@ -59,7 +59,7 @@
 #include "VocBase/replication-applier.h"
 #include "VocBase/ticks.h"
 #include "VocBase/transaction.h"
-#include "StorageEngine/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 
 using namespace arangodb;
 using namespace arangodb::basics;