Fix child batches and introduce callback for processing loaded trie nodes #1499
Conversation
This file contains 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
Harrm
changed the title
turuslan
reviewed
Feb 22, 2023
turuslan
approved these changes
Feb 23, 2023
kamilsa
approved these changes
Feb 28, 2023
…gome into feature/trie-proof-callback
turuslan
reviewed
Mar 1, 2023
Comment on lines
89
to
92
| for (auto &[child, kv] : child_batches_) { | ||
| OUTCOME_TRY(root, kv->commit(version)); | ||
| OUTCOME_TRY(current_batch_->put(child, common::BufferView{root})); | ||
| outcome::result<std::reference_wrapper<const storage::trie::TrieBatch>> | ||
| TrieStorageProviderImpl::getChildBatchAt(const common::Buffer &root_path) { | ||
| OUTCOME_TRY(batch_ptr, getOrCreateChildBatchAt(root_path)); | ||
| return *batch_ptr; | ||
| } | ||
|
|
||
| outcome::result<std::reference_wrapper<storage::trie::TrieBatch>> | ||
| TrieStorageProviderImpl::getMutableChildBatchAt( | ||
| const common::Buffer &root_path) { | ||
| // if the batch for this child trie can be found in the current transaction, | ||
| // just return it | ||
| if (!transaction_stack_.empty()) { | ||
| if (auto it = transaction_stack_.back().child_batches.find(root_path); | ||
| it != transaction_stack_.back().child_batches.end()) { | ||
| return *it->second; | ||
| } | ||
| // if there are no open transactions, just a base batch is sufficient | ||
| } else { | ||
| OUTCOME_TRY(batch_ptr, getOrCreateChildBatchAt(root_path)); | ||
| return *batch_ptr; | ||
| } |
There was a problem hiding this comment.
Revert, we need to write children roots back to top trie
There was a problem hiding this comment.
I'm not sure what you mean, the child roots are written to the main trie in the commit() method of a batch.
turuslan
reviewed
Mar 1, 2023
turuslan
reviewed
Mar 1, 2023
turuslan
reviewed
Mar 1, 2023
Comment on lines
111
to
137
| outcome::result<std::reference_wrapper<storage::trie::TrieBatch>> | ||
| TrieStorageProviderImpl::getMutableChildBatchAt( | ||
| const common::Buffer &root_path) { | ||
| // if the batch for this child trie can be found in the current transaction, | ||
| // just return it | ||
| if (!transaction_stack_.empty()) { | ||
| if (auto it = transaction_stack_.back().child_batches.find(root_path); | ||
| it != transaction_stack_.back().child_batches.end()) { | ||
| return *it->second; | ||
| } | ||
| // if there are no open transactions, just a base batch is sufficient | ||
| } else { | ||
| OUTCOME_TRY(batch_ptr, getOrCreateChildBatchAt(root_path)); | ||
| return *batch_ptr; | ||
| } | ||
| if (persistent_batch_) { | ||
| return persistent_batch_->commit(version); | ||
| // otherwise we need to create a new overlay batch in the current | ||
| // transaction | ||
| OUTCOME_TRY(batch_ptr, getOrCreateChildBatchAt(root_path)); | ||
|
|
||
| SL_DEBUG(logger_, | ||
| "Creating new overlay batch for child storage {}", | ||
| root_path.toHex()); | ||
| auto child_batch = | ||
| std::make_shared<storage::trie::TopperTrieBatchImpl>(batch_ptr); | ||
| transaction_stack_.back().child_batches.emplace(root_path, child_batch); | ||
| return *child_batch; | ||
| } |
There was a problem hiding this comment.
Looks like (unnecessary) duplicate of (complex) getOrCreateChildBatchAt.
There was a problem hiding this comment.
It's not a duplicate, it uses getOrCreateChildBatchAt to obtain the existing batch which is possibly on another transaction level, and then if the batch is not on the current transaction level it creates a batch on top of the obtained batch on the current transaction level.
There was a problem hiding this comment.
If it's necessary, then getConstChildBatchAt must return readonly batch, which errors on write attempt
turuslan
reviewed
Mar 3, 2023
turuslan
reviewed
Mar 5, 2023
turuslan
reviewed
Mar 6, 2023
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.
Referenced issues
Description of the Change
Benefits
Possible Drawbacks