Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Improve the JS-exception-to-C-result-code conversion to account for the case of a file disappearing while the OPFS VFS is waiting to acquire a lock on it. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | branch-3.46 |
Files: | files | file ages | folders |
SHA3-256: |
d34e788044eec3bf90d6d2db5a2ce20b |
User & Date: | stephan 2024-06-17 13:06:53 |
Context
2024-06-17
| ||
13:06 | Improve the JS-exception-to-C-result-code conversion to account for the case of a file disappearing while the OPFS VFS is waiting to acquire a lock on it. (Leaf check-in: d34e7880 user: stephan tags: branch-3.46) | |
2024-06-12
| ||
22:15 | Remove some dead JS code. Improve the exception-to-C-result-code conversion to account for the case of a file disappearing while the OPFS VFS is waiting to acquire a lock on it. (check-in: 5bd9fd5f user: stephan tags: trunk) | |
21:08 | Fix a potential db corruption case triggered by the OPFS VFS's xCheckReservedLock() implementation. (check-in: a7cd07d9 user: stephan tags: branch-3.46) | |
Changes
Changes to ext/wasm/api/sqlite3-opfs-async-proxy.js.
︙ | ︙ | |||
261 262 263 264 265 266 267 268 | errorObject.message ].join(' '), { cause: errorObject }); this.name = 'GetSyncHandleError'; } }; GetSyncHandleError.convertRc = (e,rc)=>{ | > > > > > > < < | | | | | | < | > > > > > > | < > | > > | | | | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | errorObject.message ].join(' '), { cause: errorObject }); this.name = 'GetSyncHandleError'; } }; /** Attempts to find a suitable SQLITE_xyz result code for Error object e. Returns either such a translation or rc if if it does not know how to translate the exception. */ GetSyncHandleError.convertRc = (e,rc)=>{ if( e instanceof GetSyncHandleError ){ if( e.cause.name==='NoModificationAllowedError' /* Inconsistent exception.name from Chrome/ium with the same exception.message text: */ || (e.cause.name==='DOMException' && 0===e.cause.message.indexOf('Access Handles cannot')) ){ return state.sq3Codes.SQLITE_BUSY; }else if( 'NotFoundError'===e.cause.name ){ /** Maintenance reminder: SQLITE_NOTFOUND, though it looks like a good match, has different semantics than NotFoundError and is not suitable here. */ return state.sq3Codes.SQLITE_CANTOPEN; } }else if( 'NotFoundError'===e?.name ){ return state.sq3Codes.SQLITE_CANTOPEN; } return rc; }; /** Returns the sync access handle associated with the given file handle object (which must be a valid handle object, as created by xOpen()), lazily opening it if needed. In order to help alleviate cross-tab contention for a dabase, if an exception is thrown while acquiring the handle, this routine |
︙ | ︙ | |||
582 583 584 585 586 587 588 | readOnly: create ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags), deleteOnClose: !!(state.sq3Codes.SQLITE_OPEN_DELETEONCLOSE & flags) }); fh.releaseImplicitLocks = (opfsFlags & state.opfsFlags.OPFS_UNLOCK_ASAP) || state.opfsFlags.defaultUnlockAsap; | < < < < < < < < < < < < < | 593 594 595 596 597 598 599 600 601 602 603 604 605 606 | readOnly: create ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags), deleteOnClose: !!(state.sq3Codes.SQLITE_OPEN_DELETEONCLOSE & flags) }); fh.releaseImplicitLocks = (opfsFlags & state.opfsFlags.OPFS_UNLOCK_ASAP) || state.opfsFlags.defaultUnlockAsap; __openFiles[fid] = fh; storeAndNotify(opName, 0); }catch(e){ wTimeEnd(); error(opName,e); state.s11n.storeException(1,e); storeAndNotify(opName, state.sq3Codes.SQLITE_IOERR); |
︙ | ︙ |
Changes to ext/wasm/api/sqlite3-vfs-opfs.c-pp.js.
︙ | ︙ | |||
388 389 390 391 392 393 394 395 396 397 398 399 400 401 | counterpart... */ state.sq3Codes = Object.create(null); [ 'SQLITE_ACCESS_EXISTS', 'SQLITE_ACCESS_READWRITE', 'SQLITE_BUSY', 'SQLITE_ERROR', 'SQLITE_IOERR', 'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE', 'SQLITE_IOERR_DELETE', 'SQLITE_IOERR_FSYNC', 'SQLITE_IOERR_LOCK', | > | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | counterpart... */ state.sq3Codes = Object.create(null); [ 'SQLITE_ACCESS_EXISTS', 'SQLITE_ACCESS_READWRITE', 'SQLITE_BUSY', 'SQLITE_CANTOPEN', 'SQLITE_ERROR', 'SQLITE_IOERR', 'SQLITE_IOERR_ACCESS', 'SQLITE_IOERR_CLOSE', 'SQLITE_IOERR_DELETE', 'SQLITE_IOERR_FSYNC', 'SQLITE_IOERR_LOCK', |
︙ | ︙ |