-
-
Notifications
You must be signed in to change notification settings - Fork 34.3k
sqlite: fix crash session extension callbacks with workers #59848
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e31c90e
sqlite: fix crash session extension callbacks with workers
louwers d19c293
test: fix inclusion of common module
louwers 46b18f4
Update src/node_sqlite.cc
louwers 6ebd672
Update src/node_sqlite.cc
louwers d0dc60a
sqlite: fix compilation
louwers 5ae2b74
sqlite: run formatter
louwers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| 'use strict'; | ||
| require('../common'); | ||
| const tmpdir = require('../common/tmpdir'); | ||
| const { join } = require('node:path'); | ||
|
|
||
| let cnt = 0; | ||
|
|
||
| tmpdir.refresh(); | ||
|
|
||
| function nextDb() { | ||
| return join(tmpdir.path, `database-${cnt++}.db`); | ||
| } | ||
|
|
||
| module.exports = { nextDb }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // This worker is used for one of the tests in test-sqlite-session.js | ||
|
|
||
| 'use strict'; | ||
| require('../common'); | ||
| const { parentPort, workerData } = require('worker_threads'); | ||
| const { DatabaseSync, constants } = require('node:sqlite'); | ||
| const { changeset, mode, dbPath } = workerData; | ||
|
|
||
| const db = new DatabaseSync(dbPath); | ||
|
|
||
| const options = {}; | ||
| if (mode !== constants.SQLITE_CHANGESET_ABORT && mode !== constants.SQLITE_CHANGESET_OMIT) { | ||
| throw new Error('Unexpected value for mode'); | ||
| } | ||
| options.onConflict = () => mode; | ||
|
|
||
| try { | ||
| const result = db.applyChangeset(changeset, options); | ||
| parentPort.postMessage({ mode, result, error: null }); | ||
| } catch (error) { | ||
| parentPort.postMessage({ mode, result: null, errorMessage: error.message, errcode: error.errcode }); | ||
| } finally { | ||
| db.close(); // Just to make sure it is closed ASAP | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.