Skip to content

Commit 72bd82b

Browse files
committed
perf(server): run- and node-scoped turn-item reads keep their own index
1 parent 13e718b commit 72bd82b

2 files changed

Lines changed: 22 additions & 5 deletions

File tree

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6795,6 +6795,12 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
67956795
omitSettledSubagents: true,
67966796
})
67976797
.pipe(Effect.withTracer(tracer));
6798+
yield* projectionStore
6799+
.getThreadRecords(threadId, ["turnItems"], {
6800+
turnItemTypes: ["command_execution"],
6801+
turnItemRunId: RunId.make(`run:${suffix}`),
6802+
})
6803+
.pipe(Effect.withTracer(tracer));
67986804
yield* projectionStore.getThreadShell(threadId).pipe(Effect.withTracer(tracer));
67996805
const planOf = Effect.fnUntraced(function* (marker: string) {
68006806
const statement = statements.find((query) => query.includes(marker));
@@ -6810,6 +6816,11 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
68106816
uses: "turn_items_thread_type_idx (<expr>=? AND <expr>=?)",
68116817
avoids: "turn_items_thread_ordinal_idx",
68126818
},
6819+
{
6820+
marker: "AND type IN (SELECT value FROM json_each",
6821+
uses: "SEARCH orchestration_v2_projection_turn_items USING INDEX",
6822+
avoids: "turn_items_thread_type_idx",
6823+
},
68136824
{
68146825
marker: "MIN(ordinal) AS ordinal",
68156826
uses: "turn_items_thread_type_idx (<expr>=? AND <expr>=?)",

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3141,6 +3141,11 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
31413141
readonly work_last_ordinal?: number | null;
31423142
readonly work_item_count?: number | null;
31433143
};
3144+
const byTypeOnly =
3145+
filter?.turnItemTypes !== undefined &&
3146+
filter.turnItemRunId === undefined &&
3147+
filter.turnItemRunIds === undefined &&
3148+
filter.turnItemNodeIds === undefined;
31443149
const boundedTurnItemRows: ReadonlyArray<WindowPayloadRow> =
31453150
(fields !== undefined && !fields.includes("turnItems")) ||
31463151
(window === undefined &&
@@ -3158,13 +3163,14 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
31583163
FROM orchestration_v2_projection_turn_items
31593164
${
31603165
// The ordinal index would read every item of the thread to find these types.
3161-
filter?.turnItemTypes === undefined
3162-
? sql``
3163-
: sql`INDEXED BY orchestration_v2_projection_turn_items_thread_type_idx`
3166+
// Run and node filters keep their narrower indexes.
3167+
byTypeOnly
3168+
? sql`INDEXED BY orchestration_v2_projection_turn_items_thread_type_idx`
3169+
: sql``
31643170
}
3165-
WHERE ${filter?.turnItemTypes === undefined ? sql`thread_id = ${threadId}` : sql`(thread_id || '') = ${threadId}`}
3171+
WHERE ${byTypeOnly ? sql`(thread_id || '') = ${threadId}` : sql`thread_id = ${threadId}`}
31663172
${filter?.turnItemRequestIds === undefined ? sql`` : sql`AND json_extract(payload_json, '$.requestId') IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRequestIds)}))`}
3167-
${filter?.turnItemTypes === undefined ? sql`` : sql`AND (type || '') IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))`}
3173+
${filter?.turnItemTypes === undefined ? sql`` : byTypeOnly ? sql`AND (type || '') IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))` : sql`AND type IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))`}
31683174
${filter?.turnItemStatuses === undefined ? sql`` : sql`AND status IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemStatuses)}))`}
31693175
${filter?.turnItemRunId === undefined ? sql`` : sql`AND run_id = ${filter.turnItemRunId}`}
31703176
${filter?.turnItemNodeIds === undefined ? sql`` : sql`AND node_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemNodeIds)}))`}

0 commit comments

Comments
 (0)