From 99d1b1edecadc5cf87656f4156093605cbff0d85 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Wed, 22 Feb 2017 10:39:31 +0100 Subject: [PATCH] Moved CompactionLocker into MMFiles. --- arangod/MMFiles/MMFilesCollectorThread.cpp | 2 +- .../CompactionLocker.h => MMFiles/MMFilesCompactionLocker.h} | 0 arangod/MMFiles/MMFilesCompactorThread.cpp | 2 +- arangod/VocBase/replication-dump.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename arangod/{VocBase/CompactionLocker.h => MMFiles/MMFilesCompactionLocker.h} (100%) diff --git a/arangod/MMFiles/MMFilesCollectorThread.cpp b/arangod/MMFiles/MMFilesCollectorThread.cpp index e466dc117a..f65613533b 100644 --- a/arangod/MMFiles/MMFilesCollectorThread.cpp +++ b/arangod/MMFiles/MMFilesCollectorThread.cpp @@ -32,6 +32,7 @@ #include "Basics/memory-map.h" #include "Logger/Logger.h" #include "MMFiles/MMFilesCollection.h" +#include "MMFiles/MMFilesCompactionLocker.h" #include "MMFiles/MMFilesDatafileHelper.h" #include "MMFiles/MMFilesEngine.h" #include "MMFiles/MMFilesIndexElement.h" @@ -48,7 +49,6 @@ #include "Utils/SingleCollectionTransaction.h" #include "Utils/StandaloneTransactionContext.h" #include "Transaction/Hints.h" -#include "VocBase/CompactionLocker.h" #include "VocBase/LogicalCollection.h" using namespace arangodb; diff --git a/arangod/VocBase/CompactionLocker.h b/arangod/MMFiles/MMFilesCompactionLocker.h similarity index 100% rename from arangod/VocBase/CompactionLocker.h rename to arangod/MMFiles/MMFilesCompactionLocker.h diff --git a/arangod/MMFiles/MMFilesCompactorThread.cpp b/arangod/MMFiles/MMFilesCompactorThread.cpp index 6c517e1414..a3de4deae6 100644 --- a/arangod/MMFiles/MMFilesCompactorThread.cpp +++ b/arangod/MMFiles/MMFilesCompactorThread.cpp @@ -31,6 +31,7 @@ #include "Basics/memory-map.h" #include "Logger/Logger.h" #include "MMFiles/MMFilesCollection.h" +#include "MMFiles/MMFilesCompactionLocker.h" #include "MMFiles/MMFilesDatafileHelper.h" #include "MMFiles/MMFilesDocumentPosition.h" #include "MMFiles/MMFilesIndexElement.h" @@ -41,7 +42,6 @@ #include "Utils/StandaloneTransactionContext.h" #include "Transaction/Helpers.h" #include "Transaction/Hints.h" -#include "VocBase/CompactionLocker.h" #include "VocBase/LogicalCollection.h" #include "VocBase/vocbase.h" diff --git a/arangod/VocBase/replication-dump.cpp b/arangod/VocBase/replication-dump.cpp index 8a8bb26fc8..9bedc296c9 100644 --- a/arangod/VocBase/replication-dump.cpp +++ b/arangod/VocBase/replication-dump.cpp @@ -28,13 +28,13 @@ #include "Basics/VPackStringBufferAdapter.h" #include "Logger/Logger.h" #include "MMFiles/MMFilesCollection.h" +#include "MMFiles/MMFilesCompactionLocker.h" #include "MMFiles/MMFilesDatafile.h" #include "MMFiles/MMFilesDatafileHelper.h" #include "MMFiles/MMFilesLogfileManager.h" #include "MMFiles/MMFilesWalLogfile.h" #include "MMFiles/MMFilesWalMarker.h" #include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE -#include "VocBase/CompactionLocker.h" #include "VocBase/Ditch.h" #include "VocBase/LogicalCollection.h" #include "VocBase/vocbase.h"