MerkleDB Compact Path Bytes #2010
Merged
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
This reverts commit 79684fa.
This reverts commit 9b8a7ac.
Co-authored-by: Dan Laine <[email protected]> Signed-off-by: David Boehm <[email protected]>
dboehm-avalabs
changed the title
danlaine
approved these changes
Sep 29, 2023
| @@ -944,7 +959,7 @@ func (db *merkleDB) VerifyChangeProof( | |||
| } | |||
|
|
|||
| // Note that if [start] is Nothing, smallestPath is the empty path. | |||
There was a problem hiding this comment.
This comment seems out of date now
Comment on lines
+114
to
+120
| // check that the tokens in the partially filled final byte of [prefix] are | ||
| // equal to the tokens in the final byte of [p]. | ||
| for i := prefix.tokensLength - remainderTokens; i < prefix.tokensLength; i++ { | ||
| if p.Token(i) != prefix.Token(i) { | ||
| return false | ||
| } | ||
| } |
There was a problem hiding this comment.
I feel like we should be able to do some masking here rather than explicitly checking each token
Comment on lines
+206
to
+210
| bytesNeeded := tokens / p.tokensPerByte | ||
| if tokens%p.tokensPerByte > 0 { | ||
| bytesNeeded++ | ||
| } | ||
| return bytesNeeded |
There was a problem hiding this comment.
return (tokens + p.tokensPerByte - 1) / p.tokensPerByte
| func shiftCopy(dst []byte, src string, shift byte) { | ||
| i := 0 | ||
| for ; i < len(src)-1; i++ { | ||
| dst[i] = src[i]<<shift + src[i+1]>>(8-shift) |
There was a problem hiding this comment.
I'd probably have written this as:
dst[i] = src[i]<<shift | src[i+1]>>(8-shift)
| // We want to zero out everything to the right of the last token, which is at index [tokensToTake] - 1 | ||
| // Mask will be (8-bitsToShift) number of 1's followed by (bitsToShift) number of 0's | ||
| mask := byte(0xFF << p.bitsToShift(tokensToTake-1)) | ||
| buffer[len(buffer)-1] = buffer[len(buffer)-1] & mask |
There was a problem hiding this comment.
buffer[len(buffer)-1] &= mask
Comment on lines
+181
to
+184
| bytesKey := stringToByteSlice(key) | ||
| if !changes.ConsumeBytes { | ||
| bytesKey = slices.Clone(bytesKey) | ||
| } |
There was a problem hiding this comment.
Either this doesn't feel needed - or this always feels needed... Either way I feel like something is weird here
Comment on lines
+173
to
+175
| if !changes.ConsumeBytes { | ||
| key = slices.Clone(op.Key) | ||
| } |
There was a problem hiding this comment.
Super nit - but the order of var declaration + updating seems really weird here
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.
We wish to support merkle trie branch factors other than 16, so this PR attempts to change paths to support that. At the same time, it reworks them to be stored in compressed format so that they don't have to be converted back and forth when interacting with the database.