fix(sqlite): avoid retaining large bindings in cached statements

This commit is contained in:
Brennan Benson
2026-11-10 22:20:25 -08:00
parent 4d1c628b24
commit 4517e188da
2 changed files with 42 additions and 7 deletions
+41 -6
View File
@@ -2,16 +2,43 @@ import type { StatementResultingChanges } from 'node:sqlite'
import { SqliteIntegerReader } from './sqlite-integer-reader'
import type { SqliteBindings, SqliteRow, SqliteStatement } from './sqlite-statement'
// SQLite retains bound text/blob values until rebinding or statement finalization.
const LARGE_BINDING_BYTES = 64 * 1024
function hasLargeBinding(parameters: SqliteBindings): boolean {
let bytes = 0
for (const value of parameters) {
bytes +=
typeof value === 'string' ? value.length : ArrayBuffer.isView(value) ? value.byteLength : 0
if (bytes > LARGE_BINDING_BYTES) {
return true
}
}
return false
}
export class NodeSqliteStatement implements SqliteStatement {
private readonly integers = new SqliteIntegerReader()
constructor(private readonly statement: SqliteStatement) {
private readonly statement: SqliteStatement
constructor(private readonly prepare: () => SqliteStatement) {
this.statement = this.prepareStatement()
}
private prepareStatement(): SqliteStatement {
const statement = this.prepare()
// Native number reads overflow their INT64_MIN guard on some builds and round insert rowids.
statement.setReadBigInts(true)
return statement
}
private execution(parameters: SqliteBindings): SqliteStatement {
return hasLargeBinding(parameters) ? this.prepareStatement() : this.statement
}
all(...parameters: SqliteBindings): SqliteRow[] {
const rows = this.statement.all(...parameters)
const rows = this.execution(parameters).all(...parameters)
for (const row of rows) {
this.integers.row(row)
}
@@ -19,17 +46,25 @@ export class NodeSqliteStatement implements SqliteStatement {
}
get(...parameters: SqliteBindings): SqliteRow | undefined {
const row = this.statement.get(...parameters)
const row = this.execution(parameters).get(...parameters)
return row === undefined ? undefined : this.integers.row(row)
}
run(...parameters: SqliteBindings): StatementResultingChanges {
return this.integers.result(this.statement.run(...parameters))
return this.integers.result(this.execution(parameters).run(...parameters))
}
*iterate(...parameters: SqliteBindings): IterableIterator<SqliteRow> {
for (const row of this.statement.iterate(...parameters)) {
yield this.integers.row(row)
let rows: IterableIterator<SqliteRow> | undefined
try {
rows = this.execution(parameters).iterate(...parameters)
parameters.length = 0
for (const row of rows) {
yield this.integers.row(row)
}
} finally {
rows = undefined
parameters.length = 0
}
}
+1 -1
View File
@@ -102,7 +102,7 @@ class SyncDatabase {
this.statementCache.set(sql, cached)
return cached
}
const statement = new NodeSqliteStatement(this.db.prepare(sql))
const statement = new NodeSqliteStatement(() => this.db.prepare(sql))
if (isStatementCacheable(sql)) {
if (this.statementCache.size >= STATEMENT_CACHE_LIMIT) {
const oldest = this.statementCache.keys().next().value