Skip to content

Commit f59a722

Browse files
committed
fix(server): keep full projection reads in one snapshot
1 parent 8d59237 commit f59a722

3 files changed

Lines changed: 63 additions & 2 deletions

File tree

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ import {
3131
} from "@t3tools/contracts";
3232
import * as DateTime from "effect/DateTime";
3333
import * as Effect from "effect/Effect";
34+
import * as Deferred from "effect/Deferred";
35+
import * as Fiber from "effect/Fiber";
3436
import * as Layer from "effect/Layer";
3537
import * as Option from "effect/Option";
3638
import * as Schema from "effect/Schema";
3739
import * as Tracer from "effect/Tracer";
3840
import * as SqlClient from "effect/sql/SqlClient";
41+
import * as Statement from "effect/sql/Statement";
3942
import { projectThreadAwarenessV2 } from "@t3tools/shared/agentAwareness";
4043

4144
import * as SqlitePersistence from "../persistence/Sqlite.ts";
@@ -257,6 +260,48 @@ it.effect("routes full projection reads to readers and retains uncommitted write
257260
);
258261
assert.isAbove(queries.length, 1);
259262
assert.deepEqual([...new Set(queries.map((row) => row.connection))], ["reader"]);
263+
const commitRequested = yield* Deferred.make<void>();
264+
const writer = yield* Deferred.await(commitRequested).pipe(
265+
Effect.andThen(
266+
sql.withTransaction(
267+
Effect.gen(function* () {
268+
yield* sql`
269+
UPDATE orchestration_v2_projection_threads
270+
SET payload_json = json_set(payload_json, '$.title', 'Committed title')
271+
WHERE thread_id = ${threadId}
272+
`;
273+
yield* sql`
274+
UPDATE orchestration_v2_projection_turn_items
275+
SET payload_json = json_set(payload_json, '$.title', 'Committed command')
276+
WHERE thread_id = ${parentId}
277+
`;
278+
}),
279+
),
280+
),
281+
Effect.forkChild,
282+
);
283+
let commitInjected = false;
284+
const duringCommit = yield* store.getThreadProjection(threadId).pipe(
285+
Effect.provideService(Statement.CurrentTransformer, (statement) => {
286+
const [query] = statement.compile();
287+
if (!commitInjected && query.includes("FROM orchestration_v2_projection_turn_items")) {
288+
commitInjected = true;
289+
return Deferred.succeed(commitRequested, undefined).pipe(
290+
Effect.andThen(Fiber.join(writer).pipe(Effect.orDie)),
291+
Effect.as(statement),
292+
);
293+
}
294+
return Effect.succeed(statement);
295+
}),
296+
);
297+
assert.isTrue(commitInjected);
298+
assert.deepEqual(duringCommit, projection);
299+
const afterCommit = yield* store.getThreadProjection(threadId);
300+
assert.equal(afterCommit.thread.title, "Committed title");
301+
assert.equal(
302+
afterCommit.visibleTurnItems.find((row) => row.visibility === "inherited")?.item.title,
303+
"Committed command",
304+
);
260305
yield* sql.withTransaction(
261306
Effect.gen(function* () {
262307
yield* sql`

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4522,7 +4522,15 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
45224522
);
45234523

45244524
const getThreadProjection: ProjectionStoreV2Shape["getThreadProjection"] = (threadId) =>
4525-
readProjection(threadId, new Set());
4525+
sql
4526+
.withTransaction(readProjection(threadId, new Set()))
4527+
.pipe(
4528+
Effect.mapError((cause) =>
4529+
isProjectionStoreThreadNotFoundError(cause) || isProjectionStoreReadError(cause)
4530+
? cause
4531+
: new ProjectionStoreReadError({ threadId, cause }),
4532+
),
4533+
);
45264534

45274535
const getRuntimeRecoveryProjection: ProjectionStoreV2Shape["getRuntimeRecoveryProjection"] =
45284536
Effect.fn("ProjectionStore.getRuntimeRecoveryProjection")(

‎apps/server/src/persistence/testkit/SqliteRouting.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
22
import * as Effect from "effect/Effect";
33
import * as FileSystem from "effect/FileSystem";
44
import * as Layer from "effect/Layer";
5+
import * as Option from "effect/Option";
56
import * as Path from "effect/Path";
67
import * as Statement from "effect/sql/Statement";
78
import * as Tracer from "effect/Tracer";
@@ -27,7 +28,14 @@ export const traceSqlRouting = () => {
2728
end(endTime, exit);
2829
const query = span.attributes.get("db.query.text");
2930
if (typeof query === "string") {
30-
queries.push({ query, connection: span.attributes.get("db.connection") });
31+
let owner: Tracer.AnySpan | undefined = span;
32+
let connection: unknown;
33+
while (owner?._tag === "Span") {
34+
connection = owner.attributes.get("db.connection");
35+
if (connection !== undefined) break;
36+
owner = Option.getOrUndefined(owner.parent);
37+
}
38+
queries.push({ query, connection });
3139
}
3240
};
3341
return span;

0 commit comments

Comments
 (0)