Antalya 25.8.14 backport of #87687 - Fix two-level aggregation when using Merge over Distributed#1328
Conversation
…merge-distributed Fix two-level aggregation when using Merge over Distributed
…_merge_two_level_aggregation tests: fix 03403_distributed_merge_two_level_aggregation flakiness
tests/queries/0_stateless/03403_distributed_merge_two_level_aggregation.sql
Outdated
Show resolved
Hide resolved
|
The failed stateless tests are also related to Otherwise the actual output of the test shows that the issue has been resolved, which is seen by the line I'll update the |
…uckets_out_of_order_in_aggregation The test failed due to an extra step in actual pipeline output. It is caused by a missing optimization `enable_producing_buckets_out_of_order_in_aggregation` that was added to upstream later and is not worth backporting at this point. The change can be seen at [1]. [1]: https://github.com/ClickHouse/ClickHouse/pull/80179/changes#diff-1806a5c1f13b491c615e887366acf1daac6d85b1528be423e3762705482c80fbR574
QA verificationThis change fixes a logical error in distributed two-level aggregation when using Merge over Distributed tables. For the Altinity backport:
Considering that the stateless test was adapted for Antalya 25.8 (without The test was executed:
This confirmed the intended behavior:
The change is well-scoped, guarded by specific conditions, and covered by automation. Marking this PR as verified. |
This PR also backports ClickHouse#88406 to fix the flaky test added in the original PR
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fixed two-level aggregation when using
MergeoverDistributed(ClickHouse#87687 by @c-end + ClickHouse#88406 by @azat).CI/CD Options
Exclude tests:
Regression jobs to run: