Use weak_ptr to the Storage in IMergeTreeDataPart#95129
Closed
alexey-milovidov wants to merge 2 commits intomasterfrom
Closed
Use weak_ptr to the Storage in IMergeTreeDataPart#95129alexey-milovidov wants to merge 2 commits intomasterfrom
alexey-milovidov wants to merge 2 commits intomasterfrom
Conversation
Contributor
|
Workflow [PR], commit [e88d08d] Summary: ❌
|
clickhouse-gh
bot
added
the
pr-not-for-changelog
alexey-milovidov
force-pushed
the
fix-storage-from-part-lifetime-v2
branch
from
3621311 to
ff914cf
Compare
Change `IMergeTreeDataPart::storage` from a reference to `std::weak_ptr<const IStorage>` to prevent segfaults when parts outlive their storage (e.g., during `DETACH TABLE`). Add `getStorage()` method that locks the weak_ptr and returns a shared_ptr, throwing if storage is destroyed. Add `tryGetStorage()` for safe use in destructors. Update all call sites to call `getStorage()` once at function start and hold the shared_ptr for the duration, avoiding repeated locking overhead. Co-Authored-By: Claude Opus 4.5 <[email protected]>
alexey-milovidov
force-pushed
the
fix-storage-from-part-lifetime-v2
branch
from
ff914cf to
7a92a31
Compare
Combine the two loops over parts_to_activate into one to avoid calling getStorage() twice per part. Co-Authored-By: Claude Opus 4.5 <[email protected]>
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
1 participant
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.
Change
IMergeTreeDataPart::storagefrom a reference tostd::weak_ptr<const IStorage>to prevent segfaults when parts outlive their storage (e.g., duringDETACH TABLE).Add
getStorage()method that locks the weak_ptr and returns a shared_ptr, throwing if storage is destroyed. AddtryGetStorage()for safe use in destructors.Update all call sites to call
getStorage()once at function start and hold the shared_ptr for the duration, avoiding repeated locking overhead.Changelog category (leave one):
Note: We didn't find any reason why
IMergeTreeDataPartcould outlive the storage, so this change should be a no-op. But maybe it will let us find issues faster.