Fix condition not being moved to PREWHERE in case there is a row policy (version 2)#87303
Merged
Fix condition not being moved to PREWHERE in case there is a row policy (version 2)#87303
Conversation
Contributor
clickhouse-gh
bot
added
the
pr-bugfix
Contributor
|
Hey @KochetovNicolai! Great to see this issue being fixed. Will this PR also address #85834 ? |
Contributor
Answering myself: Yes, it seems this PR fixes that as well. |
1 task
* Only row policy can end up not in WHERE section * Row-policy filter is never modified: No need to update it's value in the SourceStepWithFilter::updatePrewhereInfo
It was just a copy from SelectQueryInfo and it was error-prone because it's easy to forget to update it's value.
novikd
approved these changes
Oct 1, 2025
Comment on lines
+622
to
+626
| if (prewhere_info) | ||
| { | ||
| for (const auto * input : filter_info.actions.getInputs()) | ||
| prewhere_info->prewhere_actions.tryRestoreColumn(input->result_name); | ||
| } |
Member
There was a problem hiding this comment.
I still don't get why is it needed
Member
Author
There was a problem hiding this comment.
This is because additional filters may need a column which can be removed by prewhere.
Simply saying, we don't track dependency for additional filters DAG. And I don't want to, it will make the code more complicated.
There is a test which I had to fix, so added this hack.
robot-clickhouse-ci-2
added
the
pr-must-backport-synced
rienath
added a commit
that referenced
this pull request
Oct 8, 2025
Cherry pick #87303 to 25.9: Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
robot-clickhouse
added a commit
that referenced
this pull request
Oct 8, 2025
… case there is a row policy (version 2)
clickhouse-gh bot
added a commit
that referenced
this pull request
Oct 9, 2025
Backport #87303 to 25.9: Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
|
Thank you for this fix , can someone say if this is going to be backported also to older versions , such as 24.8 , where it seems to happen as well |
Member
|
Yes, backport to 25.8 is wip
…________________________________
From: Roee Zilkha ***@***.***>
Sent: Sunday, October 12, 2025 10:51:45 AM
To: ClickHouse/ClickHouse ***@***.***>
Cc: Raufs Dunamalijevs ***@***.***>; Comment ***@***.***>
Subject: Re: [ClickHouse/ClickHouse] Fix condition not being moved to PREWHERE in case there is a row policy (version 2) (PR #87303)
[https://avatars.githubusercontent.com/u/17226062?s=20&v=4]rzilkha left a comment (ClickHouse/ClickHouse#87303)<#87303 (comment)>
Thank you for this fix , can someone say if this is going to be backported also to older versions , such as 24.8 , where it seems to happen as well
—
Reply to this email directly, view it on GitHub<#87303 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AHGI6CSNKQESZOYFP7BE7Q33XIJCDAVCNFSM6AAAAACG4USEUSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTGOJUGA3TQNZYGI>.
You are receiving this because you commented.Message ID: ***@***.***>
|
mkmkme
added a commit
to Altinity/ClickHouse
that referenced
this pull request
Oct 15, 2025
This commit is a manual backport of two PRs: 1. ClickHouse#87303 2. ClickHouse#88017 Additionally, the test from ClickHouse#88036 was added.
25 tasks
zvonand
added a commit
to Altinity/ClickHouse
that referenced
this pull request
Oct 16, 2025
24.8.14 Backport of ClickHouse#87303 - Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
Member
|
@rzilkha we decided against it. This is a performance improvement that touches a lot of files. Such large backport can introduce problems in a stable release |
robot-clickhouse
added
the
pr-backports-created
mkmkme
added a commit
to Altinity/ClickHouse
that referenced
this pull request
Nov 7, 2025
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
25 tasks
zvonand
added a commit
to Altinity/ClickHouse
that referenced
this pull request
Nov 10, 2025
25.3.8 Backport of ClickHouse#87303 - Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
zvonand
pushed a commit
to Altinity/ClickHouse
that referenced
this pull request
Dec 24, 2025
…re_with_optimize_2 Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
25 tasks
zvonand
pushed a commit
to Altinity/ClickHouse
that referenced
this pull request
Dec 26, 2025
…re_with_optimize_2 Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
zvonand
pushed a commit
to Altinity/ClickHouse
that referenced
this pull request
Jan 15, 2026
Backport ClickHouse#87303 to 25.9: Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
zvonand
pushed a commit
to Altinity/ClickHouse
that referenced
this pull request
Jan 15, 2026
…llow-up Follow up to ClickHouse#87303
25 tasks
zvonand
pushed a commit
to Altinity/ClickHouse
that referenced
this pull request
Jan 27, 2026
Backport ClickHouse#87303 to 25.9: Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
zvonand
pushed a commit
to Altinity/ClickHouse
that referenced
this pull request
Jan 27, 2026
…llow-up Follow up to ClickHouse#87303
25 tasks
zvonand
added a commit
to Altinity/ClickHouse
that referenced
this pull request
Feb 2, 2026
25.8.15 Backport of ClickHouse#87303 - Fix condition not being moved to PREWHERE in case there is a row policy (version 2)
1 task
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
9 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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):
Fixed move-to-prewhere optimization, which did not work in the presence of row policy.
Continuation of #85118.
Closes #69777.
Closes #83748.
Documentation entry for user-facing changes