Skip to content

fix(fork): merge upstream db0ae7b into patch/sqlite-reader-pool - #270

Merged
fireboltdude1357 merged 435 commits into
patch/sqlite-reader-poolfrom
fix/sqlite-reader-pool-upstream-db0ae7b
Nov 14, 2026
Merged

fireboltdude1357 merged 435 commits into
patch/sqlite-reader-poolfrom
fix/sqlite-reader-pool-upstream-db0ae7b

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/sqlite-reader-pool conflicts with upstream db0ae7b in packages/shared/src/nodeSqliteClient.ts (4 hunks).

Upstream pingdotgg#27979 ("queued SQLite reads stop waiting on one reader while another is free") now does what this patch was for. It replaces claim-count routing with one admission semaphore across all readers, takes the lowest free slot first, and counts admission in the lock wait. The patch's own upstream PR, pingdotgg#24762, was closed without merging.

I took upstream's nodeSqliteClient.ts as is and kept the patch's 4 pool tests in nodeSqliteClient.test.ts:

  • an unrelated read beside a held reader;
  • a waiting read served before a later one;
  • the reader handed on after a queued read is interrupted;
  • queued reads moved to the writer in order when the readers turn off.

All 4 pass against upstream's implementation in 5 out of 5 runs, so they now only guard upstream's behavior. The branch differs from upstream only by those 143 test lines. Removing the patch from .github/fork-patches.txt is a separate change.

On a scratch stack of upstream db0ae7b with all 26 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the test files the patches touch, plus Sqlite.test.ts, all pass (50 files, 1433 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 13, 2026 13:24
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Yuruzuu and others added 29 commits November 14, 2026 04:31
…es (pingdotgg#25872)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tHub API rejects the request (pingdotgg#28339)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t a project until restart (pingdotgg#36704)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…36712)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#28968)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…selects (pingdotgg#28388)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…text" (pingdotgg#28535)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rry-pick and reftable cherry-picks (pingdotgg#28912)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…overlap (pingdotgg#29028)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…erver address (pingdotgg#28348)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#28375)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#28575)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36647)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t folder labels (pingdotgg#28644)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… review diff (pingdotgg#28632)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#29376)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#28581)

Co-authored-by: nikolay.akinshin <nikolay.akinshin@south.rt.ru>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#28850)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#28391)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…te-reader-pool-upstream-db0ae7b

# Conflicts:
#	packages/shared/src/nodeSqliteClient.ts
@fireboltdude1357
fireboltdude1357 merged commit 31fc3aa into patch/sqlite-reader-pool Nov 14, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.