chore: bump grovedb to 2d95c567 (#850 merged: limited branches graft below a shared key) - #4597
Merged
Merged
Conversation
QuantumExplorer
requested review from
ZocoLini,
lklimek,
llbartekll and
shumkov
as code owners
September 4, 2026 18:08
Contributor
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Collaborator
|
ℹ️ Review skipped (commit c6926e5) |
QuantumExplorer
force-pushed
the
chore/grovedb-pin-merge-graft
branch
2 times, most recently
from
September 4, 2026 18:14
9b5eb61 to
2d3bc73
Compare
5 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## v4.2-dev #4597 +/- ##
============================================
- Coverage 86.73% 86.39% -0.35%
============================================
Files 2756 2786 +30
Lines 360939 364716 +3777
============================================
+ Hits 313072 315103 +2031
- Misses 47867 49613 +1746
🚀 New features to boost your workflow:
|
This was referenced Sep 4, 2026
QuantumExplorer
force-pushed
the
chore/grovedb-pin-merge-graft
branch
from
September 5, 2026 03:55
2d3bc73 to
94bf0be
Compare
…below a shared key) Pins grovedb at dashpay/grovedb#850: `PathQuery::merge` (v1) now descends into a key another grafted branch already owns and grafts a limited branch where the two actually diverge, instead of refusing the collision at the first key past the common path; a lone body landing at a merged root keeps the caps on its own branches. Composite document queries (a page plus derived sub-queries under one merged proof) need this: a limited page on `post` merged with a by-id fetch on `post`, or a limited page and a limited lookup under one contract once a cross-contract sub-query lifts the common path to the root, all collide one level above where they diverge. Also carries #849 (flat-subtree drop) from develop. No API change on the platform side. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
QuantumExplorer
force-pushed
the
chore/grovedb-pin-merge-graft
branch
from
September 5, 2026 03:56
94bf0be to
c6926e5
Compare
This was referenced Sep 5, 2026
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.
Issue being fixed or feature implemented
Composite document queries (next PR in this stack: a page plus sub-queries derived from its results, joins / lookups / counts, proven as ONE merged grovedb proof) need
PathQuery::mergeto accept limited branches that share a key with another branch and diverge right below it. Today's merge (v1) grafts a limited input exclusively at the first key past the common path and refuses any collision there, so a limited page onpostcannot merge with a by-id fetch onpost, and a limited page cannot merge with a limited lookup under the same contract once a cross-contract sub-query lifts the common path to the root.What was done?
Pins grovedb at
2d95c567, the develop merge commit of dashpay/grovedb#850, which makes the merge descend into an owned key and graft where the branches actually diverge, refusing only when the bodies would meet (ownership follows execution order: the root must select the key exactly and the first conditional matching it must be that exact key). The pin also carries #849 (flat-subtree drop) from grovedb develop. All sixCargo.tomlpins move together; no platform code change.How Has This Been Tested?
cargo check -p drive --features serveragainst the merge commit; the composite-query PRs stacked on this one run their end-to-end merge/prove/verify suites (rs-drive and drive-abci) against it.Breaking Changes
None.
Checklist
🤖 Generated with Claude Code