Skip to content

Commit 9601392

Browse files
fix(shared): batch queued writer yields after SQL failures
1 parent c6064a6 commit 9601392

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

‎packages/shared/src/nodeSqliteClient.ts‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,8 @@ const make = Effect.fn("makeWithDatabase")(function* (
10771077
lockWaitMs: Number((clock.monotonicTimeNanosUnsafe() - start) / 1000n) / 1000,
10781078
});
10791079

1080-
let writerBorrowCompleted = false;
1080+
const writerBorrowBatchSize = 16;
1081+
let writerBorrowsSinceYield = 0;
10811082
const borrower: Borrower = (use) =>
10821083
Effect.flatMap(route, (target) =>
10831084
Effect.withFiber((fiber) => {
@@ -1097,23 +1098,25 @@ const make = Effect.fn("makeWithDatabase")(function* (
10971098
}
10981099
const writerUse = Effect.onExit(useConnection, (exit) =>
10991100
Effect.sync(() => {
1100-
writerBorrowCompleted = Exit.isSuccess(exit);
1101+
writerBorrowsSinceYield = Exit.hasInterrupts(exit)
1102+
? 0
1103+
: Math.min(writerBorrowsSinceYield + 1, writerBorrowBatchSize);
11011104
}),
11021105
);
11031106
return Effect.flatMap(target.lock.withPermitsIfAvailable(1)(writerUse), (result) =>
11041107
Option.isSome(result)
11051108
? Effect.succeed(result.value)
11061109
: target.lock.withPermits(1)(
11071110
Effect.andThen(
1108-
// Successful borrowers yield between queued statements; cancellation hands off immediately.
1109-
Effect.suspend(() =>
1110-
writerBorrowCompleted
1111-
? Effect.callback<void>((resume) => {
1112-
const immediate = setImmediate(() => resume(Effect.void));
1113-
return Effect.sync(() => clearImmediate(immediate));
1114-
})
1115-
: Effect.void,
1116-
),
1111+
// Failed SQL also consumes the batch; cancellation hands off immediately.
1112+
Effect.suspend(() => {
1113+
if (writerBorrowsSinceYield < writerBorrowBatchSize) return Effect.void;
1114+
writerBorrowsSinceYield = 0;
1115+
return Effect.callback<void>((resume) => {
1116+
const immediate = setImmediate(() => resume(Effect.void));
1117+
return Effect.sync(() => clearImmediate(immediate));
1118+
});
1119+
}),
11171120
writerUse,
11181121
),
11191122
),

0 commit comments

Comments
 (0)