Skip to content

Commit d1ae8dc

Browse files
committed
fix(server): record replay floors only for deleted events
1 parent be66da5 commit d1ae8dc

2 files changed

Lines changed: 48 additions & 2 deletions

File tree

‎apps/server/src/orchestration-v2/EventHistoryRetentionAnchors.test.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import * as Effect from "effect/Effect";
1616
import * as Stream from "effect/Stream";
1717
import * as TestClock from "effect/testing/TestClock";
1818
import * as SqlClient from "effect/sql/SqlClient";
19+
import * as Statement from "effect/sql/Statement";
1920

2021
import * as OrchestrationEventStore from "../persistence/OrchestrationEventStore.ts";
2122
import * as ThreadManagement from "./ThreadManagementService.ts";
@@ -281,3 +282,38 @@ it.effect("retention keeps a deleted thread tombstone for old cursors", () =>
281282
assert.equal(resumed[0]?.kind === "event" ? resumed[0].event.type : null, "thread.deleted");
282283
}).pipe(Effect.provide(layerTest)),
283284
);
285+
286+
it.effect("a prompt reference added before deletion does not advance the replay floor", () =>
287+
Effect.gen(function* () {
288+
const sink = yield* EventSink.EventSinkV2;
289+
const maintenance = yield* ProjectionMaintenance.ProjectionMaintenanceV2;
290+
const applicationEvents = yield* OrchestrationEventStore.OrchestrationEventStore;
291+
const sql = yield* SqlClient.SqlClient;
292+
const oldAt = yield* DateTime.now;
293+
const thread = makeThread(ThreadId.make("thread:prompt-reference-race"), oldAt);
294+
yield* sink.write({
295+
events: [createdEvent(thread, oldAt), ...promptEvents(thread.id, oldAt, 1)],
296+
});
297+
yield* TestClock.adjust(Duration.hours(25));
298+
const now = yield* DateTime.now;
299+
yield* sink.write({ events: [visitedEvent(thread, "recent", now)] });
300+
let inserted = false;
301+
const addReference: Statement.Transformer = (statement) => {
302+
const [query] = statement.compile();
303+
if (!inserted && query.includes("DELETE FROM orchestration_events AS candidate")) {
304+
inserted = true;
305+
return sink
306+
.write({ events: promptEvents(thread.id, now, 2) })
307+
.pipe(Effect.orDie, Effect.as(statement));
308+
}
309+
return Effect.succeed(statement);
310+
};
311+
const result = yield* maintenance
312+
.compactEventStore()
313+
.pipe(Effect.provideService(Statement.CurrentTransformer, addReference));
314+
assert.isTrue(inserted);
315+
assert.equal(result.deletedEventCount, 0);
316+
assert.equal(yield* applicationEvents.replayFloor(thread.id), 0);
317+
assert.deepEqual(yield* sql`SELECT * FROM orchestration_v2_event_retention`, []);
318+
}).pipe(Effect.provide(layerTest)),
319+
);

‎apps/server/src/orchestration-v2/ProjectionMaintenance.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ export const layer: Layer.Layer<
349349
`.pipe(NodeSqliteClient.readOnly);
350350
const page = rows.slice(0, COMPACTION_PAGE_SIZE);
351351
const obsolete: number[] = [];
352-
const replayFloors = new Map<string, number>();
352+
const retentionCandidates = new Map<number, string>();
353353
for (const row of page) {
354354
const streamKey = `${row.aggregate_kind}\0${row.stream_id}`;
355355
const isNewestInStream = !newestStreamKeys.has(streamKey);
@@ -365,7 +365,7 @@ export const layer: Layer.Layer<
365365
row.event_type !== "thread.deleted"
366366
) {
367367
obsolete.push(row.sequence);
368-
if (!replayFloors.has(row.stream_id)) replayFloors.set(row.stream_id, row.sequence);
368+
retentionCandidates.set(row.sequence, row.stream_id);
369369
continue;
370370
}
371371
if (row.prompt_sequence !== null) retainedPromptSequences.add(row.prompt_sequence);
@@ -435,6 +435,16 @@ export const layer: Layer.Layer<
435435
RETURNING sequence
436436
`;
437437
deletedEventCount += deleted.length;
438+
const replayFloors = new Map<string, number>();
439+
for (const row of deleted) {
440+
const threadId = retentionCandidates.get(row.sequence);
441+
if (threadId !== undefined) {
442+
replayFloors.set(
443+
threadId,
444+
Math.max(replayFloors.get(threadId) ?? 0, row.sequence),
445+
);
446+
}
447+
}
438448
for (const [threadId, floor] of replayFloors) {
439449
yield* sql`
440450
INSERT INTO orchestration_v2_event_retention (thread_id, replay_floor)

0 commit comments

Comments
 (0)