remove transferMarkers from StorageEngine.h

arangod/MMFiles/MMFilesCollectorThread.cpp

@@ -33,8 +33,9 @@
 #include "Logger/Logger.h"
 #include "MMFiles/MMFilesCollection.h"
 #include "MMFiles/MMFilesDatafileHelper.h"
-#include "MMFiles/MMFilesLogfileManager.h"
+#include "MMFiles/MMFilesEngine.h"
 #include "MMFiles/MMFilesIndexElement.h"
+#include "MMFiles/MMFilesLogfileManager.h"
 #include "MMFiles/MMFilesPersistentIndex.h"
 #include "MMFiles/MMFilesPrimaryIndex.h"
 #include "MMFiles/MMFilesWalLogfile.h"
@@ -900,7 +901,8 @@ int MMFilesCollectorThread::transferMarkers(MMFilesWalLogfile* logfile,
   int res = TRI_ERROR_INTERNAL;
 
   try {
-    res = engine->transferMarkers(collection, cache.get(), operations);
+    auto en = static_cast<MMFilesEngine*>(engine);
+    res = en->transferMarkers(collection, cache.get(), operations);
     
     if (res == TRI_ERROR_NO_ERROR && !cache->operations->empty()) {
       queueOperations(logfile, cache);

arangod/MMFiles/MMFilesEngine.h

@@ -28,6 +28,7 @@
 #include "Basics/Common.h"
 #include "Basics/Mutex.h"
 #include "MMFiles/MMFilesDatafile.h"
+#include "MMFiles/MMFilesCollectorCache.h"
 #include "StorageEngine/StorageEngine.h"
 #include "VocBase/AccessMode.h"
 
@@ -249,7 +250,7 @@ public:
   
   /// @brief transfer markers into a collection
   int transferMarkers(LogicalCollection* collection, MMFilesCollectorCache*,
-                      MMFilesOperationsType const&) override;
+                      MMFilesOperationsType const&);
 
   /// @brief Add engine specific AQL functions.
 

arangod/MMFiles/README.md

@@ -13,8 +13,8 @@ insert on the same document will result in the last insert discarding the
 previous operations. When a journal file of size (journalSize()) is full, it
 will be sealed and renamed. By applying these operations it will become a
 datafile that is read-only. Datafiles will eventually be merged by a compactor
-thread that does the about the same work as the transferMarkers function,
-reducing the size of the stored data.
+thread that does about the same work as the transferMarkers function, reducing
+the size of the stored data.
 
 Ditches
 -------

arangod/StorageEngine/StorageEngine.h

@@ -28,7 +28,6 @@
 #include "Basics/Common.h"
 #include "ApplicationFeatures/ApplicationFeature.h"
 #include "Indexes/IndexFactory.h"
-#include "MMFiles/MMFilesCollectorCache.h"  //TODO -- REMOVE
 #include "VocBase/AccessMode.h"
 #include "VocBase/voc-types.h"
 #include "VocBase/vocbase.h"
@@ -309,10 +308,6 @@ class StorageEngine : public application_features::ApplicationFeature {
 
   virtual int openCollection(TRI_vocbase_t* vocbase, LogicalCollection* collection, bool ignoreErrors) = 0;
 
-  /// @brief transfer markers into a collection
-  virtual int transferMarkers(LogicalCollection* collection, MMFilesCollectorCache*,
-                              MMFilesOperationsType const&) = 0;
-
   // AQL functions
   // -------------
 

arangod/VocBase/LogicalCollection.h

@@ -19,6 +19,7 @@
 /// Copyright holder is ArangoDB GmbH, Cologne, Germany
 ///
 /// @author Michael Hackstein
+/// @author Jan Christoph Uhde
 ////////////////////////////////////////////////////////////////////////////////
 
 #ifndef ARANGOD_VOCBASE_LOGICAL_COLLECTION_H