Fix some snap sync issues #6802
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
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
matkt
force-pushed
the
feature/snap-fix-test
branch
from
99c9a1c to
11405c2
Compare
garyschulte
approved these changes
Mar 25, 2024
Comment on lines
155
to
174
|
|
||
| public static boolean isInRange( | ||
| final Bytes location, final Bytes startKeyPath, final Bytes endKeyPath) { | ||
| final MutableBytes path = MutableBytes.create(Bytes32.SIZE * 2); | ||
| path.set(0, location); | ||
| return !location.isEmpty() | ||
| && Arrays.compare(path.toArrayUnsafe(), startKeyPath.toArrayUnsafe()) >= 0 | ||
| && Arrays.compare(path.toArrayUnsafe(), endKeyPath.toArrayUnsafe()) <= 0; | ||
| } | ||
|
|
||
| public static Bytes createPath(final Bytes bytes) { | ||
| final MutableBytes path = MutableBytes.create(bytes.size() * 2); | ||
| int j = 0; | ||
| for (int i = 0; i < bytes.size(); i += 1, j += 2) { | ||
| final byte b = bytes.get(i); | ||
| path.set(j, (byte) ((b >>> 4) & 0x0f)); | ||
| path.set(j + 1, (byte) (b & 0x0f)); | ||
| } | ||
| return path; | ||
| } |
There was a problem hiding this comment.
both of these could use javadoc
Comment on lines
80
to
86
| public static boolean isInRange( | ||
| final Bytes location, final Bytes startKeyPath, final Bytes endKeyPath) { | ||
| final MutableBytes path = MutableBytes.create(Bytes32.SIZE * 2); | ||
| path.set(0, location); | ||
| return Arrays.compare(path.toArrayUnsafe(), startKeyPath.toArrayUnsafe()) >= 0 | ||
| && Arrays.compare(path.toArrayUnsafe(), endKeyPath.toArrayUnsafe()) <= 0; | ||
| } |
There was a problem hiding this comment.
Can we not use the range manager implementation here?
There was a problem hiding this comment.
it's a modified version where location.isEmpty is removed in the check . I can create another PR to check if we can merge the two range methods
Comment on lines
40
to
74
| @Override | ||
| public void visit(final Bytes location, final ExtensionNode<V> extensionNode) { | ||
| if (!extensionNode.isDirty()) { | ||
| return; | ||
| } | ||
|
|
||
| final Node<V> child = extensionNode.getChild(); | ||
| if (child.isDirty()) { | ||
| child.accept(Bytes.concatenate(location, extensionNode.getPath()), this); | ||
| } | ||
| if (child.isHealNeeded() | ||
| || !isInRange( | ||
| Bytes.concatenate(location, extensionNode.getPath()), startKeyPath, endKeyPath)) { | ||
| extensionNode.markHealNeeded(); // not save an incomplete node | ||
| } | ||
|
|
||
| maybeStoreNode(location, extensionNode); | ||
| } | ||
|
|
||
| @Override | ||
| public void visit(final Bytes location, final BranchNode<V> branchNode) { | ||
| if (!branchNode.isDirty()) { | ||
| return; | ||
| } | ||
|
|
||
| for (int i = 0; i < branchNode.maxChild(); ++i) { | ||
| Bytes index = Bytes.of(i); | ||
| final Node<V> child = branchNode.child((byte) i); | ||
| if (child.isDirty()) { | ||
| child.accept(Bytes.concatenate(location, index), this); | ||
| } | ||
| if (child.isHealNeeded() | ||
| || !isInRange(Bytes.concatenate(location, index), startKeyPath, endKeyPath)) { | ||
| branchNode.markHealNeeded(); // not save an incomplete node | ||
| } |
There was a problem hiding this comment.
can we add javadoc on these too.
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
jflo
pushed a commit
to jflo/besu
that referenced
this pull request
Mar 26, 2024
The purpose of this commit is to fix some bugs detected in the snap sync. This should allow for greater stability with the snap sync and the healing of the flat DB. --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: Justin Florentine <justin+github@florentine.us>
amsmota
pushed a commit
to Citi/besu
that referenced
this pull request
Apr 16, 2024
The purpose of this commit is to fix some bugs detected in the snap sync. This should allow for greater stability with the snap sync and the healing of the flat DB. --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
amsmota
pushed a commit
to Citi/besu
that referenced
this pull request
Apr 16, 2024
The purpose of this commit is to fix some bugs detected in the snap sync. This should allow for greater stability with the snap sync and the healing of the flat DB. --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
matthew1001
pushed a commit
to kaleido-io/besu
that referenced
this pull request
Jun 7, 2024
The purpose of this commit is to fix some bugs detected in the snap sync. This should allow for greater stability with the snap sync and the healing of the flat DB. --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com>
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.
PR description
The purpose of this PR is to fix some bugs detected in the snap sync. This should allow for greater stability with the snap sync and the healing of the flat DB.
Fixed Issue(s)
Thanks for sending a pull request! Have you done the following?
doc-change-requiredlabel to this PR if updates are required.Locally, you can run these tests to catch failures early:
./gradlew build./gradlew acceptanceTest./gradlew integrationTest./gradlew ethereum:referenceTests:referenceTests