Thread PageMut lifetime through access guards and builders#1119
Closed
Thread PageMut lifetime through access guards and builders#1119
Conversation
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
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.
Motivation
AccessGuard/AccessGuardMutlifetimes correctly track thePageMutthey reference._lifetime: PhantomData<&'a ()>on guards with aPageMut<'a>so lifetimes are tied to the actual mutable page handle insideEitherPage.PageMutlifetime through functions that construct or return mutable pages.Description
PageMutand aPhantomDatafield to carry that lifetime insrc/tree_store/page_store/base.rs.EitherPagegeneric over the page lifetime and storedPageMut<'a>inside it, and updatedAccessGuard<'a, V>to holdEitherPage<'a>insrc/tree_store/btree_base.rs.PageMut<'a>lifetime intoAccessGuardMut<'a, V>andAccessGuardMutInPlace<'a, V>and adjusted their constructors and fields accordingly insrc/tree_store/btree_base.rs.PageMut<'static>so mutable handles remain moveable without tying them to a borrow ofTransactionalMemory, updatingsrc/tree_store/page_store/page_manager.rs.PageMuttyping (notablydirty_leaf_visitor,get_mut_helper, andinsert_inplace_helper) insrc/tree_store/btree.rsandsrc/tree_store/btree_mutator.rs.PageMut<'static>for leaf/branch builders to match the new model insrc/tree_store/btree_base.rs.src/tree_store/page_store/base.rs,src/tree_store/page_store/page_manager.rs,src/tree_store/btree_base.rs,src/tree_store/btree.rs, andsrc/tree_store/btree_mutator.rs.Testing
cargo test -qand all automated tests completed successfully.Codex Task