Fix UT due to ClickHouse/ClickHouse#65832

apache · Sep 6, 2024 · 1bdebdc · 1bdebdc
1 parent e0656b7
commit 1bdebdc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/cpp-ch/local-engine/Parser/MergeTreeRelParser.cpp b/cpp-ch/local-engine/Parser/MergeTreeRelParser.cpp
@@ -96,8 +96,7 @@ DB::QueryPlanPtr MergeTreeRelParser::parseReadRel(
 
     auto read_step = storage->reader.readFromParts(
         selected_parts,
-        /* alter_conversions = */
-        {},
+        storage->getMutationsSnapshot({}),
         names_and_types_list.getNames(),
         storage_snapshot,
         *query_info,

diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
@@ -50,6 +50,19 @@ class SparkStorageMergeTree : public MergeTreeData
 {
     friend class MergeSparkMergeTreeTask;
 
+    struct CustomMutationsSnapshot : public IMutationsSnapshot
+    {
+        CustomMutationsSnapshot() = default;
+
+        MutationCommands getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const override { return {}; }
+        std::shared_ptr<MergeTreeData::IMutationsSnapshot> cloneEmpty() const override
+        {
+            return std::make_shared<CustomMutationsSnapshot>();
+        }
+
+        NameSet getAllUpdatedColumns() const override { return {}; }
+    };
+
 public:
     static void wrapRangesInDataParts(DB::ReadFromMergeTree & source, const DB::RangesInDataParts & ranges);
     static void analysisPartsByRanges(DB::ReadFromMergeTree & source, const DB::RangesInDataParts & ranges_in_data_parts);
@@ -95,11 +108,12 @@ class SparkStorageMergeTree : public MergeTreeData
     void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr context) override;
     bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const override;
     void attachRestoredParts(MutableDataPartsVector && /*parts*/) override { throw std::runtime_error("not implement"); }
+
 public:
-    MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & params) const override
+    MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params & /*params*/) const override
     {
-        throw std::runtime_error("not implement");
-    };    
+        return std::make_shared<CustomMutationsSnapshot>();
+    };
 };
 
 class SparkWriteStorageMergeTree final : public SparkStorageMergeTree