fix(trie): make TrieImpl.insert() idempotent for duplicate key#126
fix(trie): make TrieImpl.insert() idempotent for duplicate key#126halibobo1205 wants to merge 3 commits intodevelopfrom
Conversation
|
CodeAnt AI is reviewing your PR. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI finished reviewing your PR. |
|
@codex: review |
|
Codex Review: Didn't find any major issues. Keep them coming! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
|
CodeAnt AI is running Incremental review Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
@codex: review |
|
Codex Review: Didn't find any major issues. Can't wait for the next one! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
|
CodeAnt AI Incremental review completed. |
6199a44 to
2c1b10a
Compare
|
CodeAnt AI is running Incremental review Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI Incremental review completed. |
|
@codex: review |
|
Codex Review: Didn't find any major issues. Keep them coming! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
…puts
Reorder condition checks in insert() so that commonPrefix.equals(k) is
evaluated before commonPrefix.isEmpty(). When both k and currentNodeKey
are empty (which happens on a duplicate put of a fully-split key), the
old order incorrectly fired the "no common prefix" branch and replaced
KVNode("",v) with BranchNode{terminal:v}, corrupting the root hash.
Also short-circuit kvNodeSetValueOrNode() when the new value equals the
existing one (by reference or by byte content) to avoid unnecessary
dirty marking and downstream hash recomputation.
close tronprotocol#6608
2c1b10a to
45c1797
Compare
|
CodeAnt AI is running Incremental review Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI Incremental review completed. |
|
CodeAnt AI is running Incremental review Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI Incremental review completed. |
|
CodeAnt AI is running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
Sequence DiagramThis PR fixes TrieImpl insert so that writing the same key and value is idempotent and does not change the trie structure or root hash, and it adds tests to confirm insertion order independence and delete plus reinsert behavior. sequenceDiagram
participant Caller
participant Trie
participant Node
Caller->>Trie: put(key, value)
Trie->>Node: Insert key into trie
Node->>Node: Compare new key and value with existing entry
alt Same key and same value
Node-->>Trie: Keep node unchanged and not dirty
Trie-->>Caller: Root hash remains unchanged
else Same key with different value
Node-->>Trie: Update node value and mark dirty
Trie->>Trie: Recompute root hash
Trie-->>Caller: Root hash reflects updated value
end
Caller->>Trie: delete(key) then put(key, original value)
Trie->>Trie: Root hash after reinsert matches original
Generated by CodeAnt AI |
|
CodeAnt AI finished running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI is running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
Sequence DiagramThis PR changes trie insertion so that re-putting an existing key with the same value leaves the leaf node and root hash unchanged, by preferring the full-key match path and short-circuiting value updates when the bytes are equal. sequenceDiagram
participant Caller
participant Trie
participant Node
Caller->>Trie: put(existing key, value)
Trie->>Node: insert at leaf with key
Node->>Node: compute common prefix with leaf key
alt key fully matches leaf key
Node->>Node: kvNodeSetValueOrNode(new value)
alt value bytes equal existing bytes
Node-->>Trie: return without marking dirty
else value differs
Node-->>Trie: update value and mark dirty
end
else prefix differs
Trie->>Trie: restructure into branch and child nodes
end
Trie-->>Caller: root hash (unchanged for same value re-put)
Generated by CodeAnt AI |
|
CodeAnt AI finished running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI is running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
Sequence DiagramThis PR changes the trie insertion so that re-putting an existing key with the same value leaves the trie structure and root hash unchanged, and adds tests that verify root hash stability across duplicate writes, shuffled insert order, and delete/reinsert operations. sequenceDiagram
participant Caller
participant Trie
participant Node
participant Hasher
Caller->>Trie: put(key, value)
Trie->>Node: insert at leaf for key
Node->>Node: compare existing value with new value
alt value unchanged
Node-->>Trie: return same node without marking dirty
Trie->>Hasher: skip hash recomputation
Trie-->>Caller: root hash unchanged
else value changed
Node->>Node: update value and mark node dirty
Trie->>Hasher: recompute hashes up to root
Hasher-->>Caller: new root hash
end
Generated by CodeAnt AI |
|
CodeAnt AI finished running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
|
CodeAnt AI is running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
Sequence DiagramThis PR fixes TrieImpl so that re-putting the same key and value no longer changes the trie shape or root hash, and ensures delete followed by reinsertion restores the original hash. sequenceDiagram
participant Test
participant Trie
participant Node
Test->>Trie: put initial key set
Trie->>Trie: build trie nodes and compute root hash
Test->>Trie: getRootHash (baseline)
Trie-->>Test: baseline hash
Test->>Trie: put same key and value again
Trie->>Trie: locate existing leaf for key
Trie->>Node: kvNodeSetValueOrNode(same value)
Node-->>Trie: detect same bytes and skip update
Trie-->>Test: root hash remains baseline
Test->>Trie: delete key then re-put same key and value
Trie->>Trie: update nodes and recompute root hash
Trie-->>Test: root hash matches baseline again
Generated by CodeAnt AI |
|
CodeAnt AI finished running the review. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
User description
Reorder condition checks in insert() so that commonPrefix.equals(k) is evaluated before commonPrefix.isEmpty(). When both k and currentNodeKey are empty (which happens on a duplicate put of a fully-split key), the old order incorrectly fired the "no common prefix" branch and replaced KVNode("",v) with BranchNode{terminal:v}, corrupting the root hash.
Also short-circuit kvNodeSetValueOrNode() when the new value equals the existing one (by reference or by byte content) to avoid unnecessary dirty marking and downstream hash recomputation.
Re-enable testOrder() with both deterministic regression sequences and 1000 random shuffles. Fix test() to expect rootHash equality after a same-value re-put.
CodeAnt-AI Description
Keep trie hashes stable when the same key is written again
What Changed
Impact
✅ Stable root hashes after repeated puts✅ Correct trie structure after duplicate writes✅ Fewer trie regression failures🔄 Retrigger CodeAnt AI Review
Details
💡 Usage Guide
Checking Your Pull Request
Every time you make a pull request, our system automatically looks through it. We check for security issues, mistakes in how you're setting up your infrastructure, and common code problems. We do this to make sure your changes are solid and won't cause any trouble later.
Talking to CodeAnt AI
Got a question or need a hand with something in your pull request? You can easily get in touch with CodeAnt AI right here. Just type the following in a comment on your pull request, and replace "Your question here" with whatever you want to ask:
This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.
Example
Preserve Org Learnings with CodeAnt
You can record team preferences so CodeAnt AI applies them in future reviews. Reply directly to the specific CodeAnt AI suggestion (in the same thread) and replace "Your feedback here" with your input:
This helps CodeAnt AI learn and adapt to your team's coding style and standards.
Example
Retrigger review
Ask CodeAnt AI to review the PR again, by typing:
Check Your Repository Health
To analyze the health of your code repository, visit our dashboard at https://app.codeant.ai. This tool helps you identify potential issues and areas for improvement in your codebase, ensuring your repository maintains high standards of code health.