Skip to content

Add ArenaCompactTree::merge_zipper_into_file: append-only merge into an ACT file#53

Open
imlvts wants to merge 1 commit into
Adam-Vandervorst:masterfrom
imlvts:act-merge-append
Open

Add ArenaCompactTree::merge_zipper_into_file: append-only merge into an ACT file#53
imlvts wants to merge 1 commit into
Adam-Vandervorst:masterfrom
imlvts:act-merge-append

Conversation

@imlvts

@imlvts imlvts commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator

Merges any zipper (Zipper + ZipperMoving + ZipperValues) into an existing on-disk ACT by appending only the new data and rewriting the root offset; existing bytes are never modified. Backward relative offsets let appended nodes reference old subtrees directly, so untouched subtrees are shared byte-for-byte. Because siblings must be stored contiguously, a node with any changed child gets its sibling run re-emitted as shallow copies whose children still point into the old arena; line nodes are split as needed, reusing the old line data when a whole segment survives. On value conflicts the zipper's value wins, and a merge that adds nothing leaves the file untouched.

Works with PathMap read zippers and ACT zippers alike (ACT -> ACT merge), enabling incremental accumulation into one ACT file without rebuilding it.

Also fixes get_val_at reading past a branch's last sibling when asked for a byte absent from the child mask (missing test_bit check; subtract-overflow panic in debug builds).

…an ACT file

Merges any zipper (Zipper + ZipperMoving + ZipperValues) into an
existing on-disk ACT by appending only the new data and rewriting the
root offset; existing bytes are never modified. Backward relative
offsets let appended nodes reference old subtrees directly, so
untouched subtrees are shared byte-for-byte. Because siblings must be
stored contiguously, a node with any changed child gets its sibling run
re-emitted as shallow copies whose children still point into the old
arena; line nodes are split as needed, reusing the old line data when a
whole segment survives. On value conflicts the zipper's value wins, and
a merge that adds nothing leaves the file untouched.

Works with PathMap read zippers and ACT zippers alike (ACT -> ACT
merge), enabling incremental accumulation into one ACT file without
rebuilding it.

Also fixes get_val_at reading past a branch's last sibling when asked
for a byte absent from the child mask (missing test_bit check;
subtract-overflow panic in debug builds).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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.

1 participant