This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 4ee1bdd2f4 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250305)
(#8899)
4ee1bdd2f4 is described below
commit 4ee1bdd2f4303dc9e178bca8e3a42e285f18c2d8
Author: Kyligence Git <[email protected]>
AuthorDate: Wed Mar 5 02:07:49 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250305) (#8899)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250305)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/77067
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 67e86b3630..62ee14c729 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250304
-CH_COMMIT=6be5cc2a06c
+CH_BRANCH=rebase_ch/20250305
+CH_COMMIT=7786030d877
diff --git a/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
index 95e695c19c..1842e8e107 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
@@ -46,6 +46,8 @@ namespace Setting
extern const SettingsJoinAlgorithm join_algorithm;
extern const SettingsUInt64 max_block_size;
extern const SettingsUInt64 min_joined_block_size_bytes;
+extern const SettingsNonZeroUInt64 grace_hash_join_initial_buckets;
+extern const SettingsNonZeroUInt64 grace_hash_join_max_buckets;
}
namespace ErrorCodes
{
@@ -782,7 +784,9 @@ DB::QueryPlanPtr JoinRelParser::buildSingleOnClauseHashJoin(
if (join_algorithm.isSet(DB::JoinAlgorithm::GRACE_HASH))
{
hash_join = std::make_shared<GraceHashJoin>(
- context, table_join, left_plan->getCurrentHeader(),
right_plan->getCurrentHeader(), context->getTempDataOnDisk());
+
context->getSettingsRef()[Setting::grace_hash_join_initial_buckets],
+ context->getSettingsRef()[Setting::grace_hash_join_max_buckets],
+ table_join, left_plan->getCurrentHeader(),
right_plan->getCurrentHeader(), context->getTempDataOnDisk());
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
