Antalya 25.8.14 backport of #87687 - Fix two-level aggregation when using Merge over Distributed #1328
+253
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…merge-distributed Fix two-level aggregation when using Merge over Distributed
…_merge_two_level_aggregation tests: fix 03403_distributed_merge_two_level_aggregation flakiness
mkmkme
added
backport
ianton-ru
reviewed
Jan 21, 2026
| sum(1) | ||
| FROM remote('127.0.0.{1,1}', currentDatabase(), merge_test_table) | ||
| GROUP BY 1 | ||
| SETTINGS distributed_aggregation_memory_efficient = 1, max_threads = 4, optimize_aggregation_in_order = 0, prefer_localhost_replica = 1, async_socket_for_remote = 1, enable_analyzer = 0, enable_producing_buckets_out_of_order_in_aggregation = 0, enable_memory_bound_merging_of_aggregation_results = 0; |
There was a problem hiding this comment.
As I understand, setting enable_producing_buckets_out_of_order_in_aggregation was introduced only in 25.9 and not backported to Antalya, test must fail.
Collaborator
Author
There was a problem hiding this comment.
Thanks, great catch! I'll remove this setting from the test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: