Skip to content

Commit 779a5e7

Browse files
committed
perf(history): scope marker lookups to retained runs
1 parent 1f9a6ed commit 779a5e7

2 files changed

Lines changed: 27 additions & 5 deletions

File tree

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

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,11 +1984,29 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
19841984
payload_json = json_set(payload_json, '$.ordinal', 1000)
19851985
WHERE thread_id = ${threadId} AND ordinal = 999`;
19861986
const promptId = TurnItemId.make("turn-item:bounded-sql-history:1");
1987-
const deferred = yield* projectionStore.getThreadSnapshotWindow(threadId, {
1988-
rowLimit: sqlPageLimit,
1989-
userTurnLimit: 10,
1990-
deferWork: true,
1991-
});
1987+
const { statements: deferredStatements, tracer: deferredTracer } = traceSqlStatements();
1988+
const deferred = yield* projectionStore
1989+
.getThreadSnapshotWindow(threadId, {
1990+
rowLimit: sqlPageLimit,
1991+
userTurnLimit: 10,
1992+
deferWork: true,
1993+
})
1994+
.pipe(Effect.withTracer(deferredTracer));
1995+
const deferredQuery = deferredStatements.find((statement) =>
1996+
statement.includes("blocked_runs AS MATERIALIZED"),
1997+
);
1998+
assert.isDefined(deferredQuery);
1999+
const deferredPlan = yield* sql.unsafe<{
2000+
readonly id: number;
2001+
readonly parent: number;
2002+
readonly detail: string;
2003+
}>(`EXPLAIN QUERY PLAN ${deferredQuery}`);
2004+
const blockedRunsPlan = deferredPlan.find((row) => row.detail === "MATERIALIZE blocked_runs");
2005+
assert.isDefined(blockedRunsPlan);
2006+
const blockedLookup = deferredPlan.find(
2007+
(row) => row.parent === blockedRunsPlan!.id && row.detail.startsWith("SEARCH "),
2008+
);
2009+
assert.include(blockedLookup?.detail ?? "", "run_id=?");
19922010
assert.lengthOf(deferred.projection.visibleTurnItems, 3);
19932011
assert.strictEqual(deferred.projection.visibleTurnItems[0]?.sourceItemId, promptId);
19942012
const anchor = deferred.projection.visibleTurnItems[1]!;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2849,6 +2849,10 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
28492849
SELECT DISTINCT run_id FROM orchestration_v2_projection_turn_items
28502850
WHERE thread_id = ${threadId} AND run_id IS NOT NULL
28512851
AND ${window.deferWork ? 1 : 0} = 1
2852+
AND run_id IN (
2853+
SELECT run_id FROM eligible
2854+
WHERE ordinal >= ${boundary.ordinal} AND run_id IS NOT NULL
2855+
)
28522856
AND (type IN ('run_interrupt_request', 'run_interrupt_result')
28532857
OR (type = 'error' AND status = 'failed' AND parent_item_id IS NULL))
28542858
), work_segments AS (

0 commit comments

Comments
 (0)