Fix conflict with apache#7029

Kyligence · Sep 6, 2024 · 1c79fa5 · 1c79fa5
1 parent d941f88
commit 1c79fa5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
@@ -50,14 +50,14 @@ class SparkStorageMergeTree : public MergeTreeData
 {
     friend class MergeSparkMergeTreeTask;
 
-    struct CustomMutationsSnapshot : public IMutationsSnapshot
+    struct SparkMutationsSnapshot : public IMutationsSnapshot
     {
-        CustomMutationsSnapshot() = default;
+        SparkMutationsSnapshot() = default;
 
         MutationCommands getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const override { return {}; }
         std::shared_ptr<MergeTreeData::IMutationsSnapshot> cloneEmpty() const override
         {
-            return std::make_shared<CustomMutationsSnapshot>();
+            return std::make_shared<SparkMutationsSnapshot>();
         }
 
         NameSet getAllUpdatedColumns() const override { return {}; }
@@ -112,7 +112,7 @@ class SparkStorageMergeTree : public MergeTreeData
 public:
     MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & /*params*/) const override
     {
-        return std::make_shared<CustomMutationsSnapshot>();
+        return std::make_shared<SparkMutationsSnapshot>();
     };
 };