From 1c79fa57cc0d1f4ad508a5135a1b7fe93e3a85ec Mon Sep 17 00:00:00 2001
From: Chang Chen <baibaichen@gmail.com>
Date: Fri, 6 Sep 2024 17:46:43 +0800
Subject: [PATCH] Fix conflict with
 https://github.com/apache/incubator-gluten/pull/7029

---
 .../Storages/MergeTree/SparkStorageMergeTree.h            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
index b327324faace..7d51a731b77c 100644
--- 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>();
     };
 };