From d73d25a310fa2036906a37676c745a38d88eb31b Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Tue, 21 Feb 2017 14:43:21 +0100 Subject: [PATCH] remove some includes --- arangod/Replication/InitialSyncer.cpp | 2 +- arangod/StorageEngine/RocksDBEngine.cpp | 4 ---- arangod/StorageEngine/StorageEngine.h | 2 +- arangod/Transaction/Methods.cpp | 7 +++---- arangod/Utils/CollectionKeys.cpp | 5 ++--- arangod/Utils/TransactionContext.cpp | 7 +++---- arangod/VocBase/LogicalCollection.cpp | 8 -------- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/arangod/Replication/InitialSyncer.cpp b/arangod/Replication/InitialSyncer.cpp index 2b2e037761..c1e9cd1747 100644 --- a/arangod/Replication/InitialSyncer.cpp +++ b/arangod/Replication/InitialSyncer.cpp @@ -36,7 +36,7 @@ #include "StorageEngine/EngineSelectorFeature.h" #include "StorageEngine/StorageEngine.h" #include "Utils/CollectionGuard.h" -#include "MMFiles/MMFilesCollection.h" +#include "MMFiles/MMFilesCollection.h" //TODO -- Remove -- ditches #include "MMFiles/MMFilesDatafileHelper.h" #include "MMFiles/MMFilesIndexElement.h" #include "MMFiles/MMFilesPrimaryIndex.h" diff --git a/arangod/StorageEngine/RocksDBEngine.cpp b/arangod/StorageEngine/RocksDBEngine.cpp index c217159753..9d020201aa 100644 --- a/arangod/StorageEngine/RocksDBEngine.cpp +++ b/arangod/StorageEngine/RocksDBEngine.cpp @@ -37,10 +37,6 @@ #include "VocBase/LogicalCollection.h" #include "VocBase/ticks.h" #include "VocBase/vocbase.h" -#include "MMFiles/MMFilesLogfileManager.h" - -#include "MMFiles/MMFilesPersistentIndexFeature.h" -#include "MMFiles/MMFilesPersistentIndex.h" #include #include diff --git a/arangod/StorageEngine/StorageEngine.h b/arangod/StorageEngine/StorageEngine.h index 842d33b808..db86905bc5 100644 --- a/arangod/StorageEngine/StorageEngine.h +++ b/arangod/StorageEngine/StorageEngine.h @@ -28,7 +28,7 @@ #include "Basics/Common.h" #include "ApplicationFeatures/ApplicationFeature.h" #include "Indexes/IndexFactory.h" -#include "MMFiles/MMFilesCollectorCache.h" +#include "MMFiles/MMFilesCollectorCache.h" //TODO -- REMOVE #include "VocBase/AccessMode.h" #include "VocBase/voc-types.h" #include "VocBase/vocbase.h" diff --git a/arangod/Transaction/Methods.cpp b/arangod/Transaction/Methods.cpp index cf8f68f1ff..c8a572d2c5 100644 --- a/arangod/Transaction/Methods.cpp +++ b/arangod/Transaction/Methods.cpp @@ -39,10 +39,9 @@ #include "Cluster/ServerState.h" #include "Indexes/Index.h" #include "Logger/Logger.h" -#include "MMFiles/MMFilesCollection.h" -#include "MMFiles/MMFilesLogfileManager.h" -#include "MMFiles/MMFilesPrimaryIndex.h" -#include "MMFiles/MMFilesIndexElement.h" +#include "MMFiles/MMFilesCollection.h" //TODO -- remove -- ditches +#include "MMFiles/MMFilesLogfileManager.h" //TODO -- remove -- waitForTick +#include "MMFiles/MMFilesPrimaryIndex.h" //TODO -- remove -- physical->primaryIndex() can not return MMFilesIndex #include "StorageEngine/EngineSelectorFeature.h" #include "StorageEngine/StorageEngine.h" #include "StorageEngine/TransactionCollection.h" diff --git a/arangod/Utils/CollectionKeys.cpp b/arangod/Utils/CollectionKeys.cpp index 1de8e9a602..8c9bdf27c2 100644 --- a/arangod/Utils/CollectionKeys.cpp +++ b/arangod/Utils/CollectionKeys.cpp @@ -24,9 +24,8 @@ #include "CollectionKeys.h" #include "Basics/StaticStrings.h" #include "Basics/StringRef.h" -#include "MMFiles/MMFilesDatafileHelper.h" -#include "MMFiles/MMFilesLogfileManager.h" -#include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE +#include "MMFiles/MMFilesLogfileManager.h" //TODO -- REMOVE +#include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE #include "StorageEngine/EngineSelectorFeature.h" #include "StorageEngine/StorageEngine.h" #include "Transaction/Helpers.h" diff --git a/arangod/Utils/TransactionContext.cpp b/arangod/Utils/TransactionContext.cpp index 424ed5bf41..d67447b12d 100644 --- a/arangod/Utils/TransactionContext.cpp +++ b/arangod/Utils/TransactionContext.cpp @@ -21,15 +21,14 @@ /// @author Jan Steemann //////////////////////////////////////////////////////////////////////////////// -#include "TransactionContext.h" #include "Basics/MutexLocker.h" #include "Basics/StringBuffer.h" +#include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE +#include "MMFiles/MMFilesLogfileManager.h" //TODO -- REMOVE #include "RestServer/TransactionManagerFeature.h" -#include "MMFiles/MMFilesDatafileHelper.h" -#include "MMFiles/MMFilesLogfileManager.h" -#include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE #include "Transaction/Helpers.h" #include "Transaction/Methods.h" +#include "TransactionContext.h" #include "Utils/CollectionNameResolver.h" #include "VocBase/Ditch.h" #include "VocBase/LogicalCollection.h" diff --git a/arangod/VocBase/LogicalCollection.cpp b/arangod/VocBase/LogicalCollection.cpp index e36638f67e..8075df4dec 100644 --- a/arangod/VocBase/LogicalCollection.cpp +++ b/arangod/VocBase/LogicalCollection.cpp @@ -39,14 +39,6 @@ #include "Cluster/FollowerInfo.h" #include "Cluster/ServerState.h" #include "Indexes/Index.h" -#include "MMFiles/MMFilesDocumentOperation.h" -#include "MMFiles/MMFilesCollection.h" //remove -#include "MMFiles/MMFilesPrimaryIndex.h" -#include "MMFiles/MMFilesIndexElement.h" -#include "MMFiles/MMFilesToken.h" -#include "MMFiles/MMFilesTransactionState.h" -#include "MMFiles/MMFilesWalMarker.h" //crud marker -- TODO remove -#include "MMFiles/MMFilesWalSlots.h" //TODO -- remove #include "RestServer/DatabaseFeature.h" #include "Scheduler/Scheduler.h" #include "Scheduler/SchedulerFeature.h"