[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240928) (#7379)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240928) * Fix build due to ClickHouse/ClickHouse#65625 * Fix build due to ClickHouse/ClickHouse#68410 --------- Co-authored-by: kyligence-git <gluten@kyligence.io> Co-authored-by: Chang Chen <baibaichen@gmail.com>
apache · Sep 28, 2024 · e29946d · e29946d
1 parent b9fbb47
commit e29946d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240920
-CH_COMMIT=14c2da664d7
+CH_BRANCH=rebase_ch/20240928
+CH_COMMIT=348196b6011
diff --git a/cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp b/cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp
@@ -336,7 +336,6 @@ void AggregateRelParser::addMergingAggregatedStep()
             false,
             settings[Setting::max_block_size],
             settings[Setting::aggregation_in_order_max_block_bytes],
-            SortDescription(),
             settings[Setting::enable_memory_bound_merging_of_aggregation_results]);
         steps.emplace_back(merging_step.get());
         plan->addStep(std::move(merging_step));

diff --git a/cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp b/cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp
@@ -50,7 +50,7 @@ SortRelParser::parse(DB::QueryPlanPtr query_plan, const substrait::Rel & rel, st
         return currentThreadGroupMemoryUsageRatio() > spill_mem_ratio;
     };
     auto sorting_step = std::make_unique<DB::SortingStep>(
-        query_plan->getCurrentDataStream(), sort_descr, limit, settings, false);
+        query_plan->getCurrentDataStream(), sort_descr, limit, settings);
     sorting_step->setStepDescription("Sorting step");
     steps.emplace_back(sorting_step.get());
     query_plan->addStep(std::move(sorting_step));

diff --git a/cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp b/cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp
@@ -118,7 +118,7 @@ void restoreMetaData<ROCKSDB>(const SparkStorageMergeTreePtr & storage, const Me
                     transaction->createDirectoryRecursive(part_path);
                 auto key = s3->generateObjectKeyForPath(metadata_file_path.generic_string(), std::nullopt);
                 StoredObject metadata_object(key.serialize());
-                auto part_metadata = extractPartMetaData(*s3->readObject(metadata_object));
+                auto part_metadata = extractPartMetaData(*s3->readObject(metadata_object, ReadSettings{}));
                 for (const auto & item : part_metadata)
                 {
                     auto item_path = part_path / item.first;
@@ -180,7 +180,7 @@ void restoreMetaData<LOCAL>(
                     metadata_disk->createDirectories(part_path);
                 auto key = s3->generateObjectKeyForPath(metadata_file_path.generic_string(), std::nullopt);
                 StoredObject metadata_object(key.serialize());
-                auto part_metadata = extractPartMetaData(*s3->readObject(metadata_object));
+                auto part_metadata = extractPartMetaData(*s3->readObject(metadata_object, ReadSettings{}));
                 for (const auto & item : part_metadata)
                 {
                     auto item_path = part_path / item.first;

diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
@@ -157,7 +157,7 @@ void SparkStorageMergeTree::prefetchMetaDataFile(std::unordered_set<std::string>
     {
         if (!disk->exists(meta_path))
             continue;
-        auto in = disk->readFile(meta_path);
+        auto in = disk->readFile(meta_path, ReadSettings{});
         String ignore_data;
         readStringUntilEOF(ignore_data, *in);
     }