minor changes

Author: arthurpassos

src/Interpreters/Context.h

@@ -32,8 +32,6 @@
 #include <mutex>
 #include <optional>
 
-#include "Storages/ExportsList.h"
-
 
 namespace Poco::Net
 {
@@ -90,6 +88,7 @@ class AsynchronousMetrics;
 class BackgroundSchedulePool;
 class MergeList;
 class MovesList;
+class ExportsList;
 class ReplicatedFetchList;
 class RefreshSet;
 class Cluster;

src/Storages/MergeTree/MergeTreeData.h

@@ -1239,20 +1239,6 @@ class MergeTreeData : public IStorage, public WithMutableContext
     /// under lockForShare if rename is possible.
     String relative_data_path;
 
-    /// RAII Wrapper for atomic work with currently moving parts
-    /// Acquire them in constructor and remove them in destructor
-    /// Uses data.currently_moving_parts_mutex
-    struct CurrentlyMovingPartsTagger
-    {
-        MergeTreeMovingParts parts_to_move;
-        MergeTreeData & data;
-        CurrentlyMovingPartsTagger(MergeTreeMovingParts && moving_parts_, MergeTreeData & data_);
-
-        ~CurrentlyMovingPartsTagger();
-    };
-
-    using CurrentlyMovingPartsTaggerPtr = std::shared_ptr<CurrentlyMovingPartsTagger>;
-
 private:
     /// Columns and secondary indices sizes can be calculated lazily.
     mutable std::mutex columns_and_secondary_indices_sizes_mutex;
@@ -1687,7 +1673,19 @@ class MergeTreeData : public IStorage, public WithMutableContext
         DataPartsVector * out_covered_parts,
         bool rename_in_transaction);
 
+    /// RAII Wrapper for atomic work with currently moving parts
+    /// Acquire them in constructor and remove them in destructor
+    /// Uses data.currently_moving_parts_mutex
+    struct CurrentlyMovingPartsTagger
+    {
+        MergeTreeMovingParts parts_to_move;
+        MergeTreeData & data;
+        CurrentlyMovingPartsTagger(MergeTreeMovingParts && moving_parts_, MergeTreeData & data_);
+
+        ~CurrentlyMovingPartsTagger();
+    };
 
+    using CurrentlyMovingPartsTaggerPtr = std::shared_ptr<CurrentlyMovingPartsTagger>;
 
     /// Moves part to specified space, used in ALTER ... MOVE ... queries
     std::future<MovePartsOutcome> movePartsToSpace(const CurrentlyMovingPartsTaggerPtr & moving_tagger, const ReadSettings & read_settings, const WriteSettings & write_settings, bool async);

src/Storages/MergeTree/MergeTreeExportManifest.h

@@ -24,6 +24,7 @@ namespace DB
  *   "transaction_id": "<id>",
  *   "partition_id": "<partition_id>",
  *   "destination": "<database>.<table>",
+ *   "completed": <true/false>,
  *   "parts": [ {"part_name": "name", "remote_path": "path-or-empty"}, ... ]
  * }
  */

src/Storages/ObjectStorage/StorageObjectStorage.cpp

@@ -19,6 +19,7 @@
 #include <Processors/Transforms/ExtractColumnsTransform.h>
 
 #include <Storages/Cache/SchemaCache.h>
+#include <Storages/ExportsList.h>
 #include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/ObjectStorage/ReadBufferIterator.h>
 #include <Storages/ObjectStorage/StorageObjectStorageSink.h>