summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-04 23:51:08 -0300
committerGabriel Schneider <[email protected]>2026-11-05 09:54:56 -0300
commite0e54fd0820696d5d1fdd937ae17e9dd57556472 (patch)
treec82f6f5c13f08d089f89be1753e18ab8a59b81ad
parent370aaefe45a338c76a0e2d1a2a0a52d7d3e2f060 (diff)
downloadpardes-e0e54fd0820696d5d1fdd937ae17e9dd57556472.tar.gz
pardes-e0e54fd0820696d5d1fdd937ae17e9dd57556472.zip
replica: a unit kept to replay on the copy, rebased past rebase_after, is keepSince's, which confirm's two branches each spelled out
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
-rw-r--r--src/replica.zig30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/replica.zig b/src/replica.zig
index 4dbe3ad9..4a93ec3d 100644
--- a/src/replica.zig
+++ b/src/replica.zig
@@ -810,14 +810,7 @@ pub const Replica = struct {
r.clearSince();
return;
}
- const kept = r.gpa.dupe(u8, u.tape) catch return r.fail("out of memory");
- r.since.append(r.gpa, kept) catch return r.fail("out of memory");
- if (r.since.items.len >= rebase_after) {
- r.stats.rebases += 1;
- r.toConfirmed();
- r.dirty = true;
- }
- return;
+ return r.keepSince(u.tape);
}
const ends = lastDigest(u.tape);
defer if (ends) |d| {
@@ -829,14 +822,7 @@ pub const Replica = struct {
// what the session will apply on top of it. Replayed when the
// copy is next put back.
r.neutral += 1;
- const kept = r.gpa.dupe(u8, u.tape) catch return r.fail("out of memory");
- r.since.append(r.gpa, kept) catch return r.fail("out of memory");
- if (r.since.items.len >= rebase_after) {
- r.stats.rebases += 1;
- r.toConfirmed();
- r.dirty = true;
- }
- return;
+ return r.keepSince(u.tape);
}
if (r.applied > 0) {
if (u.origin == r.id) r.stats.mispredicted += 1 else r.stats.foreign += 1;
@@ -864,6 +850,18 @@ pub const Replica = struct {
if (r.diverged == null) r.diverged = r.gpa.dupe(u8, why) catch return;
}
+ /// A unit kept to replay when the copy is next put back; past
+ /// `rebase_after` of them, that is now (`toConfirmed`).
+ fn keepSince(r: *Replica, unit: []const u8) void {
+ const kept = r.gpa.dupe(u8, unit) catch return r.fail("out of memory");
+ r.since.append(r.gpa, kept) catch return r.fail("out of memory");
+ if (r.since.items.len >= rebase_after) {
+ r.stats.rebases += 1;
+ r.toConfirmed();
+ r.dirty = true;
+ }
+ }
+
fn clearSince(r: *Replica) void {
for (r.since.items) |u| r.gpa.free(u);
r.since.clearRetainingCapacity();