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 0bfee3a98 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240330)
(#5213)
0bfee3a98 is described below
commit 0bfee3a981797d78e8598ede3ea09854e0718ff8
Author: Kyligence Git <[email protected]>
AuthorDate: Sat Mar 30 01:22:45 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240330) (#5213)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240330)
* fix build due to https://github.com/ClickHouse/ClickHouse/pull/61992
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Operator/GraceMergingAggregatedStep.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index a6da9fa54..b272486b9 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240328
-CH_COMMIT=fb5764001b8
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240330
+CH_COMMIT=adaaf28c014
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Operator/GraceMergingAggregatedStep.cpp
b/cpp-ch/local-engine/Operator/GraceMergingAggregatedStep.cpp
index 00d2e3116..ca86785fe 100644
--- a/cpp-ch/local-engine/Operator/GraceMergingAggregatedStep.cpp
+++ b/cpp-ch/local-engine/Operator/GraceMergingAggregatedStep.cpp
@@ -307,7 +307,7 @@ void GraceMergingAggregatedTransform::rehashDataVariants()
scattered_blocks[i] = {};
}
-
params->aggregator.mergeOnBlock(scattered_blocks[current_bucket_index],
*current_data_variants, no_more_keys);
+
params->aggregator.mergeOnBlock(scattered_blocks[current_bucket_index],
*current_data_variants, no_more_keys, is_cancelled);
}
if (block_rows)
per_key_memory_usage = block_memory_usage * 1.0 / block_rows;
@@ -548,7 +548,7 @@ void GraceMergingAggregatedTransform::mergeOneBlock(const
DB::Block &block, bool
if (is_original_block && no_pre_aggregated)
params->aggregator.executeOnBlock(block, *current_data_variants,
key_columns, aggregate_columns, no_more_keys);
else
- params->aggregator.mergeOnBlock(block, *current_data_variants,
no_more_keys);
+ params->aggregator.mergeOnBlock(block, *current_data_variants,
no_more_keys, is_cancelled);
}
else
{
@@ -580,7 +580,7 @@ void GraceMergingAggregatedTransform::mergeOneBlock(const
DB::Block &block, bool
}
else
{
-
params->aggregator.mergeOnBlock(scattered_blocks[current_bucket_index],
*current_data_variants, no_more_keys);
+
params->aggregator.mergeOnBlock(scattered_blocks[current_bucket_index],
*current_data_variants, no_more_keys, is_cancelled);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
