Cherry pick #88860 to 25.8: Fix premature TTL column removal causing merge failures and wrong defaults#92258
Merged
robot-ch-test-poll2 merged 22 commits intobackport/25.8/88860from Dec 18, 2025
Conversation
…aults. When column-level TTLs expired, columns were sometimes removed too early (before DEFAULT expression evaluation or before merge-time transforms that expect them to exist). As a result: - Missing columns were filled with **type defaults** instead of the column’s **table-defined DEFAULT** expression. - Skip index statistics became incorrect because indexes were computed using wrong default values. - Merge algorithms depending on certain columns (e.g. GraphiteMergeTree’s `Timestamp`, VersionedCollapsingMergeTree’s `sign`, ReplacingMergeTree’s `version`, or AggregatingMergeTree’s state columns) could fail with `Not found column ... in block` errors. Now TTL-expired columns are properly handled.
Fix premature TTL column removal causing merge failures and wrong defaults
robot-ch-test-poll3
added
pr-cherrypick
Member
Collaborator
Sure. But i don't see any conflict here. What's the process of resolving them? Should i just do the backport by myself and push them to my repo? |
Member
|
yeah, I usually do it as follows: Then simply push to your fork, I'll push it here |
Collaborator
|
@Felixoid I’ve prepared cherry-pick branches here: https://github.com/amosbird/ClickHouse/tree/cherrypick/25.8/88860 P.S. I noticed that #92259 was closed. Is that because 25.9 is already out of support (older than 3 months)? |
Member
|
It will be closed very soon; it's not worth caring about. |
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
5 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.
Original pull-request #88860
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-picklocally.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:
pr-cherrypicklabel from the PRYou also need to check the Original pull-request for
pr-backports-createdlabel, and delete if it's presented thereThe PR source
The PR is created in the CI job