Skip to content

Commit

Permalink
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026) (#7689)
Browse files Browse the repository at this point in the history
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026)

* Fix Build due to ClickHouse/ClickHouse#71019

* fix gtest build due to #7506

---------

Co-authored-by: kyligence-git <gluten@kyligence.io>
Co-authored-by: Chang Chen <baibaichen@gmail.com>
3 people authored Oct 26, 2024
1 parent 1dabf59 commit f5d42f1
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20241018
CH_COMMIT=6f7cbecdc1f
CH_BRANCH=rebase_ch/20241026
CH_COMMIT=3691d19817d
Original file line number Diff line number Diff line change
@@ -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,
5 changes: 2 additions & 3 deletions cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp
Original file line number Diff line number Diff line change
@@ -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();

///
{

0 comments on commit f5d42f1

Please sign in to comment.