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 787403f2ed [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240830)
(#7062)
787403f2ed is described below
commit 787403f2ed0afda57875e0c1293de306a8028d46
Author: Kyligence Git <[email protected]>
AuthorDate: Fri Aug 30 01:09:16 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240830) (#7062)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240830)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/68744
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Parser/AggregateRelParser.cpp | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index e7a0e17e48..486c96a540 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240828
-CH_COMMIT=ed25251b0d3
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240830
+CH_COMMIT=fc5f00d8cb7
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
b/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
index 494403cf4c..05f63bfc5b 100644
--- a/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/AggregateRelParser.cpp
@@ -305,9 +305,12 @@ void AggregateRelParser::addMergingAggregatedStep()
}
else
{
+ /// We don't use the grouping set feature in CH, so
grouping_sets_params_list should always be empty.
+ DB::GroupingSetsParamsList grouping_sets_params_list;
auto merging_step = std::make_unique<DB::MergingAggregatedStep>(
plan->getCurrentDataStream(),
params,
+ grouping_sets_params_list,
true,
false,
1,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
