From 509a1a0ea26c4c6edb148b6b35bd575f2f91f25d Mon Sep 17 00:00:00 2001 From: Kyligence Git Date: Sat, 26 Oct 2024 07:10:10 -0500 Subject: [PATCH] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026) (#7689) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026) * Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/71019 * fix gtest build due to #7506 --------- Co-authored-by: kyligence-git Co-authored-by: Chang Chen --- cpp-ch/clickhouse.version | 4 ++-- .../Storages/SubstraitSource/ReadBufferBuilder.cpp | 2 +- cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 565b9c2bc4bcf..507ba25388c8f 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20241018 -CH_COMMIT=6f7cbecdc1f \ No newline at end of file +CH_BRANCH=rebase_ch/20241026 +CH_COMMIT=3691d19817d \ No newline at end of file diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp index e3753495b4d09..1bd9a7a78c175 100644 --- a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp +++ b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp @@ -393,7 +393,7 @@ class S3FileReadBufferBuilder : public ReadBufferBuilder bucket, object.remote_path, "", - DB::S3::RequestSettings(), + DB::S3::S3RequestSettings(), read_settings, /* use_external_buffer */ true, /* offset */ 0, diff --git a/cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp b/cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp index dd863d9f0b566..dbff858061470 100644 --- a/cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp +++ b/cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp @@ -226,7 +226,7 @@ TEST(MergeTree, SparkMergeTree) }; gm_write_settings.set(context); - auto writer = local_engine::SparkMergeTreeWriter::create(merge_tree_table, gm_write_settings, context); + auto writer = local_engine::SparkMergeTreeWriter::create(merge_tree_table, gm_write_settings, context, "no job id"); SparkMergeTreeWriter & spark_merge_tree_writer = *writer; auto [_, local_executor] = test::create_plan_and_executor(EMBEDDED_PLAN(_1_read_), split_template, file); @@ -237,8 +237,7 @@ TEST(MergeTree, SparkMergeTree) spark_merge_tree_writer.write(*local_executor->nextColumnar()); } while (local_executor->hasNext()); - auto json_info = spark_merge_tree_writer.close(); - std::cerr << json_info << std::endl; + spark_merge_tree_writer.close(); /// {