25.3.8 Backport of #87303 - Fix condition not being moved to PREWHERE in case there is a row policy (version 2)#1129
Merged
zvonand merged 5 commits intoreleases/25.3.8from Nov 10, 2025
Conversation
This commit is a manual backport of two PRs:
1. ClickHouse#87303
2. ClickHouse#88017
Additionally, the test from ClickHouse#88036
was added.
Also `02679_explain_merge_tree_prewhere_row_policy` was fixed as per
0aed477
ilejn
reviewed
Nov 9, 2025
| added = added || restoreDAGInputs(row_level_filter->actions, inputs); | ||
|
|
||
| added = added || restoreDAGInputs(info.prewhere_actions, inputs); | ||
| added = added || restoreDAGInputs(info->prewhere_actions, inputs); |
Collaborator
Author
There was a problem hiding this comment.
Thanks, great catch!
ilejn
approved these changes
Nov 9, 2025
Collaborator
ilejn
left a comment
There was a problem hiding this comment.
LGTM except minor issue I've commented
25 tasks
zvonand
requested changes
Nov 10, 2025
Collaborator
Author
It seems I've forgotten to include the change to the test. We did change the reference in 24.8 to reflect this change. I'll fix it, thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 commit is a manual backport of two PRs:
1. ClickHouse#87303
2. ClickHouse#88017
Additionally, the test from ClickHouse#88036 was added.
Also
02679_explain_merge_tree_prewhere_row_policywas fixed as per 0aed477Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fixed move-to-prewhere optimization, which did not work in the presence of row policy (ClickHouse#87303 by @KochetovNicolai)
CI/CD Options
Exclude tests:
Regression jobs to run: