Skip to content

Commit e59d3df

Browse files
perf(server): user-only message reads use the user-message index for ordinals
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent ade4730 commit e59d3df

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,23 @@ it.effect("record reads filter notification sources without dropping matching me
755755
matching.messages.map((message) => [message.id, message.text]),
756756
[["monitor", "Complete body for monitor"]],
757757
);
758+
const { statements, tracer } = traceSqlStatements();
759+
const userMessages = yield* store
760+
.getThreadRecords(threadId, ["messages"], { messageRoles: ["user"] })
761+
.pipe(Effect.withTracer(tracer));
762+
assert.lengthOf(userMessages.messages, 3);
763+
const ordinalLookup = statements.find((statement) => statement.includes("MIN(ordinal)"));
764+
assert.isDefined(ordinalLookup);
765+
const sql = yield* SqlClient.SqlClient;
766+
const plan = (yield* sql.unsafe<{ readonly detail: string }>(
767+
`EXPLAIN QUERY PLAN ${ordinalLookup}`,
768+
[threadId, "[]"],
769+
)).map((row) => row.detail);
770+
// User-only reads must stay on the partial index instead of scanning every turn item.
771+
assert.isTrue(
772+
plan.some((detail) => detail.includes("turn_items_user_message_idx")),
773+
plan.join("\n"),
774+
);
758775
assert.lengthOf((yield* store.getThreadRecords(threadId, ["messages"])).messages, 4);
759776
assert.lengthOf(
760777
(yield* store.getThreadRecords(threadId, ["messages"], {
@@ -2946,7 +2963,7 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
29462963
parent_item_id, ordinal, type, status, updated_at, payload_json
29472964
) VALUES (
29482965
${`turn-item:bounded-sql-history:ordinal-${suffix}`}, ${itemThreadId}, NULL, NULL, NULL,
2949-
NULL, NULL, ${ordinal}, 'assistant_message', 'completed', ${nowIso},
2966+
NULL, NULL, ${ordinal}, 'user_message', 'completed', ${nowIso},
29502967
${encodeUnknownJsonString({ messageId })}
29512968
)
29522969
`;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3743,10 +3743,13 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
37433743
(filter.messageRoles.includes("user") && filter.messageRoles.includes("assistant")))
37443744
? undefined
37453745
: messages.map((message) => message.id);
3746+
// The literal `type = 'user_message'` lets SQLite pick the partial user-message index.
3747+
const userOnly = messages.every((message) => message.role === "user");
37463748
const rows = yield* sql<{ message_id: string; ordinal: number }>`
37473749
SELECT json_extract(payload_json, '$.messageId') AS message_id, MIN(ordinal) AS ordinal
37483750
FROM orchestration_v2_projection_turn_items
3749-
WHERE thread_id = ${threadId} AND type IN ('user_message', 'assistant_message')
3751+
WHERE thread_id = ${threadId}
3752+
AND ${userOnly ? sql`type = 'user_message'` : sql`type IN ('user_message', 'assistant_message')`}
37503753
${loadedMessageIds === undefined ? sql`` : sql`AND json_extract(payload_json, '$.messageId') IN (SELECT value FROM json_each(${encodeIdList(loadedMessageIds)}))`}
37513754
GROUP BY json_extract(payload_json, '$.messageId')
37523755
`;

0 commit comments

Comments
 (0)