Skip to content

chore: bump grovedb to 2d95c567 (#850 merged: limited branches graft below a shared key) - #4597

Merged
QuantumExplorer merged 1 commit into
v4.2-devfrom
chore/grovedb-pin-merge-graft
Sep 5, 2026
Merged

chore: bump grovedb to 2d95c567 (#850 merged: limited branches graft below a shared key)#4597
QuantumExplorer merged 1 commit into
v4.2-devfrom
chore/grovedb-pin-merge-graft

Conversation

@QuantumExplorer

@QuantumExplorer QuantumExplorer commented Sep 4, 2026

Copy link
Copy Markdown
Member

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::merge to 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 on post cannot merge with a by-id fetch on post, 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 six Cargo.toml pins move together; no platform code change.

How Has This Been Tested?

cargo check -p drive --features server against 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

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have added "!" to the title and described breaking changes in the corresponding section if my code contains any
  • I have made corresponding changes to the documentation if needed

🤖 Generated with Claude Code

@coderabbitai

coderabbitai Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/grovedb-pin-merge-graft

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added this to the v4.2.0 milestone Sep 4, 2026
@thepastaclaw

thepastaclaw commented Sep 4, 2026

Copy link
Copy Markdown
Collaborator

ℹ️ Review skipped (commit c6926e5)
Last checked: 2026-09-05 04:03 UTC

@QuantumExplorer
QuantumExplorer force-pushed the chore/grovedb-pin-merge-graft branch 2 times, most recently from 9b5eb61 to 2d3bc73 Compare September 4, 2026 18:14
@QuantumExplorer QuantumExplorer changed the title chore: bump grovedb to 58bb830f (merge grafts limited branches below a shared key) chore: bump grovedb to 5b5f4bf1 (merge grafts limited branches below a shared key) Sep 4, 2026
@codecov

codecov Bot commented Sep 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.39%. Comparing base (61d96d2) to head (c6926e5).
⚠️ Report is 5 commits behind head on v4.2-dev.

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     
Components Coverage Δ
dpp 87.19% <ø> (ø)
drive 84.63% <ø> (-0.46%) ⬇️
drive-abci 89.82% <ø> (+<0.01%) ⬆️
sdk ∅ <ø> (∅)
dapi-client ∅ <ø> (∅)
platform-version ∅ <ø> (∅)
platform-value 92.92% <ø> (ø)
platform-wallet ∅ <ø> (∅)
drive-proof-verifier 49.22% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…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
QuantumExplorer force-pushed the chore/grovedb-pin-merge-graft branch from 94bf0be to c6926e5 Compare September 5, 2026 03:56
@QuantumExplorer QuantumExplorer changed the title chore: bump grovedb to 5b5f4bf1 (merge grafts limited branches below a shared key) chore: bump grovedb to 2d95c567 (#850 merged: limited branches graft below a shared key) Sep 5, 2026
@QuantumExplorer
QuantumExplorer merged commit 749e391 into v4.2-dev Sep 5, 2026
12 checks passed
@QuantumExplorer
QuantumExplorer deleted the chore/grovedb-pin-merge-graft branch September 5, 2026 03:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants