Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026) #7689

Merged
merged 3 commits into from
Oct 26, 2024
Merged

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026) #7689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1546a7
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241026)
Oct 25, 2024
7c86ba9
Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/71019
baibaichen Oct 26, 2024
76caf9f
fix gtest build due to #7506
baibaichen Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions cpp-ch/local-engine/tests/gtest_write_pipeline_mergetree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();

///
{
Expand Down
Loading