diff --git a/arangod/StorageEngine/MMFilesCollection.h b/arangod/StorageEngine/MMFilesCollection.h index 437e838952..0b83ef046b 100644 --- a/arangod/StorageEngine/MMFilesCollection.h +++ b/arangod/StorageEngine/MMFilesCollection.h @@ -69,10 +69,10 @@ class MMFilesCollection final : public PhysicalCollection { char*& resultPosition, TRI_datafile_t*& resultDatafile) override; /// @brief create compactor file - TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize) override; + TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize); /// @brief close an existing compactor - int closeCompactor(TRI_datafile_t* datafile) override; + int closeCompactor(TRI_datafile_t* datafile); /// @brief replace a datafile with a compactor int replaceDatafileWithCompactor(TRI_datafile_t* datafile, TRI_datafile_t* compactor); diff --git a/arangod/StorageEngine/MMFilesCompactorThread.cpp b/arangod/StorageEngine/MMFilesCompactorThread.cpp index e8a236fc1b..639109d623 100644 --- a/arangod/StorageEngine/MMFilesCompactorThread.cpp +++ b/arangod/StorageEngine/MMFilesCompactorThread.cpp @@ -438,7 +438,7 @@ void MMFilesCompactorThread::compactDatafiles(LogicalCollection* collection, // now create a new compactor file // we are re-using the _fid of the first original datafile! - compactor = collection->createCompactor(initial._fid, static_cast(initial._targetSize)); + compactor = static_cast(collection->getPhysical())->createCompactor(initial._fid, static_cast(initial._targetSize)); if (compactor == nullptr) { // some error occurred @@ -495,7 +495,7 @@ void MMFilesCompactorThread::compactDatafiles(LogicalCollection* collection, document->_datafileStatistics.remove(compaction._datafile->_fid); } - if (collection->closeCompactor(compactor) != TRI_ERROR_NO_ERROR) { + if (static_cast(collection->getPhysical())->closeCompactor(compactor) != TRI_ERROR_NO_ERROR) { LOG_TOPIC(ERR, Logger::COMPACTOR) << "could not close compactor file"; // TODO: how do we recover from this state? return; diff --git a/arangod/VocBase/LogicalCollection.h b/arangod/VocBase/LogicalCollection.h index a22652d653..347f814474 100644 --- a/arangod/VocBase/LogicalCollection.h +++ b/arangod/VocBase/LogicalCollection.h @@ -176,16 +176,6 @@ class LogicalCollection { return getPhysical()->reserveJournalSpace(tick, size, resultPosition, resultDatafile); } - /// @brief create compactor file - TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize) { - return getPhysical()->createCompactor(fid, maximalSize); - } - - /// @brief close an existing compactor - int closeCompactor(TRI_datafile_t* datafile) { - return getPhysical()->closeCompactor(datafile); - } - int applyForTickRange(TRI_voc_tick_t dataMin, TRI_voc_tick_t dataMax, std::function const& callback) { return getPhysical()->applyForTickRange(dataMin, dataMax, callback); diff --git a/arangod/VocBase/PhysicalCollection.h b/arangod/VocBase/PhysicalCollection.h index 89b765f1da..82681c9f40 100644 --- a/arangod/VocBase/PhysicalCollection.h +++ b/arangod/VocBase/PhysicalCollection.h @@ -70,12 +70,6 @@ class PhysicalCollection { virtual int reserveJournalSpace(TRI_voc_tick_t tick, TRI_voc_size_t size, char*& resultPosition, TRI_datafile_t*& resultDatafile) = 0; - /// @brief create compactor file - virtual TRI_datafile_t* createCompactor(TRI_voc_fid_t fid, TRI_voc_size_t maximalSize) = 0; - - /// @brief close an existing compactor - virtual int closeCompactor(TRI_datafile_t* datafile) = 0; - /// @brief seal a datafile virtual int sealDatafile(TRI_datafile_t* datafile, bool isCompactor) = 0;