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 30df1dc7f0 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250416)
(#9338)
30df1dc7f0 is described below
commit 30df1dc7f012990ca7def3c9f6311245b442ccf4
Author: Kyligence Git <[email protected]>
AuthorDate: Wed Apr 16 01:43:30 2025 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250416) (#9338)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250416)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/78703
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/78485
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Common/AggregateUtil.cpp | 2 +-
cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp | 1 -
cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp | 9 +++------
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 7d8c7ebe7c..6d5901e267 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250409
-CH_COMMIT=b921ba27dd9
+CH_BRANCH=rebase_ch/20250416
+CH_COMMIT=a774d05dda1
diff --git a/cpp-ch/local-engine/Common/AggregateUtil.cpp
b/cpp-ch/local-engine/Common/AggregateUtil.cpp
index 36b26e94bd..f2f23c13ef 100644
--- a/cpp-ch/local-engine/Common/AggregateUtil.cpp
+++ b/cpp-ch/local-engine/Common/AggregateUtil.cpp
@@ -155,7 +155,7 @@ bool AggregateDataBlockConverter::hasNext()
else
{
size_t keys = data_variants->size();
- auto blocks = aggregator.convertToBlocks(*data_variants, final, 1);
+ auto blocks = aggregator.convertToBlocks(*data_variants, final);
size_t total_allocated_bytes = 0;
size_t total_bytes = 0;
while (!blocks.empty())
diff --git a/cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp
index 1cdf03091b..0fc12d3543 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/AggregateRelParser.cpp
@@ -357,7 +357,6 @@ void AggregateRelParser::addMergingAggregatedStep()
true,
false,
1,
- 1,
false,
settings[Setting::max_block_size],
settings[Setting::aggregation_in_order_max_block_bytes],
diff --git a/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
b/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
index 52729c97e2..f20a9b88ad 100644
--- a/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
+++ b/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
@@ -794,14 +794,11 @@ const ColumnIndexFilter::AtomMap
ColumnIndexFilter::atom_map{
ColumnIndexFilter::ColumnIndexFilter(const DB::ActionsDAG & filter_dag,
DB::ContextPtr context)
{
- const auto inverted_dag =
DB::KeyCondition::cloneASTWithInversionPushDown({filter_dag.getOutputs().at(0)},
context);
-
- assert(inverted_dag.getOutputs().size() == 1);
-
- const auto * inverted_dag_filter_node = inverted_dag.getOutputs()[0];
+ DB::ActionsDAGWithInversionPushDown
inverted_dag(filter_dag.getOutputs().front(), context);
+ assert(inverted_dag.predicate != nullptr);
DB::RPNBuilder<RPNElement> builder(
- inverted_dag_filter_node,
+ inverted_dag.predicate,
std::move(context),
[&](const DB::RPNBuilderTreeNode & node, RPNElement & out) { return
extractAtomFromTree(node, out); });
rpn_ = std::move(builder).extractRPN();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
