Skip to content

Cherry pick #88605 to 25.9: Fix potential crash caused by concurrent mutation of underlying const PREWHERE columns#88717

Merged
robot-ch-test-poll merged 2 commits intobackport/25.9/88605from
cherrypick/25.9/88605
Oct 17, 2025
Merged

Cherry pick #88605 to 25.9: Fix potential crash caused by concurrent mutation of underlying const PREWHERE columns#88717
robot-ch-test-poll merged 2 commits intobackport/25.9/88605from
cherrypick/25.9/88605

Conversation

@robot-ch-test-poll
Copy link
Copy Markdown
Contributor

Original pull-request #88605

Do not merge this PR manually

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.

Troubleshooting

If the conflicts were resolved in a wrong way

If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the Original pull-request for pr-backports-created label, and delete if it's presented there

The PR source

The PR is created in the CI job

azat added 2 commits October 16, 2025 20:29
… PREWHERE columns

The issue was that in MergeTreeReadTask we may have column that has
other references, usually it is a constant column that created during
analysis (that is not a constant anymore where we call shrink, i.e.
after `materialize()`), and we do not need to mutate such column anyway.

v2: move code from MergeTreeSplitPrewhereIntoReadSteps.cpp::addClonedDAGToDAG() into MergeTreeReadTask
Fix potential crash caused by concurrent mutation of underlying const PREWHERE columns
@robot-ch-test-poll robot-ch-test-poll added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request pr-bugfix Pull request with bugfix, not backported by default labels Oct 17, 2025
@robot-ch-test-poll robot-ch-test-poll merged commit 055e9e8 into backport/25.9/88605 Oct 17, 2025
111 of 116 checks passed
@robot-ch-test-poll robot-ch-test-poll deleted the cherrypick/25.9/88605 branch October 17, 2025 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-bugfix Pull request with bugfix, not backported by default pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants