Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 51 additions & 11 deletions packages/react-native-nitro-sqlite/src/DatabaseQueue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,15 @@ function enqueueOperation<Result>(
return Promise.reject(error)
}

// Nothing is waiting and no transaction or synchronous call holds the queue.
const canStartStatementNow =
kind === 'statement' &&
databaseQueue.queue.length === 0 &&
(!databaseQueue.inProgress || databaseQueue.activeStatements > 0)
if (canStartStatementNow) return startStatement(databaseQueue, callback)

return new Promise<Result>((resolve, reject) => {
const finish = () => {
if (kind === 'statement') {
databaseQueue.activeStatements--
if (databaseQueue.activeStatements === 0) {
databaseQueue.inProgress = false
}
} else {
databaseQueue.inProgress = false
}
startNextOperations(databaseQueue)
}
const finish = () => finishOperation(databaseQueue, kind)

// Chains the operation directly instead of awaiting it in an async function,
// which saves a promise and several microtask turns per queued query.
Expand Down Expand Up @@ -139,6 +136,49 @@ function enqueueOperation<Result>(
})
}

/** Starts a statement right away and chains the queue update onto its promise,
* without the queued path's extra promise, entry object and closures.
*/
function startStatement<Result>(
databaseQueue: DatabaseQueue,
callback: () => Promise<Result>,
): Promise<Result> {
databaseQueue.inProgress = true
databaseQueue.activeStatements++
let operation: Promise<Result>
try {
operation = Promise.resolve(callback())
} catch (error) {
finishOperation(databaseQueue, 'statement')
return Promise.reject(error)
}
return operation.then(
(result) => {
finishOperation(databaseQueue, 'statement')
return result
},
(error: unknown) => {
finishOperation(databaseQueue, 'statement')
throw error
},
)
}

function finishOperation(
databaseQueue: DatabaseQueue,
kind: QueuedOperation['kind'],
) {
if (kind === 'statement') {
databaseQueue.activeStatements--
if (databaseQueue.activeStatements === 0) {
databaseQueue.inProgress = false
}
} else {
databaseQueue.inProgress = false
}
startNextOperations(databaseQueue)
}

function startNextOperations(queue: DatabaseQueue) {
if (queue.draining || (queue.inProgress && queue.activeStatements === 0)) {
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,12 @@ describe('DatabaseQueue', () => {
const failed = queueStatementAsync(dbName, () => {
throw new Error('sync failure')
})
const failedExclusive = queueOperationAsync(dbName, () => {
throw new Error('exclusive sync failure')
})

await expect(failed).rejects.toThrow('sync failure')
await expect(failedExclusive).rejects.toThrow('exclusive sync failure')
expect(getDatabaseQueue(dbName)).toMatchObject({
inProgress: false,
activeStatements: 0,
Expand Down Expand Up @@ -129,6 +133,37 @@ describe('DatabaseQueue', () => {
expect(getDatabaseQueue(dbName).inProgress).toBe(false)
})

it('starts statements without queuing them unless a transaction holds or awaits the queue', async () => {
openDatabaseQueue(dbName)
const transactionMayFinish = deferred<void>()
const order: string[] = []

const before = queueStatementAsync(dbName, async () => {
order.push('before')
})
expect(order).toEqual(['before'])
expect(getDatabaseQueue(dbName).queue).toHaveLength(0)
await before

const transaction = queueOperationAsync(dbName, async () => {
order.push('transaction')
await transactionMayFinish.promise
})
const during = queueStatementAsync(dbName, async () => {
order.push('during')
})
expect(order).toEqual(['before', 'transaction'])
expect(getDatabaseQueue(dbName).queue).toHaveLength(1)

transactionMayFinish.resolve()
await Promise.all([transaction, during])
expect(order).toEqual(['before', 'transaction', 'during'])
expect(getDatabaseQueue(dbName)).toMatchObject({
inProgress: false,
activeStatements: 0,
})
})

it('waits for every earlier statement before starting a transaction', async () => {
openDatabaseQueue(dbName)
const first = deferred<void>()
Expand Down
Loading