diff options
| -rw-r--r-- | ext/wasm/api/sqlite3-vfs-opfs-sahpool.js | 13 | ||||
| -rw-r--r-- | ext/wasm/tester1.c-pp.js | 16 | ||||
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 |
4 files changed, 27 insertions, 18 deletions
diff --git a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.js b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.js index fc088c419..7547c01a8 100644 --- a/ext/wasm/api/sqlite3-vfs-opfs-sahpool.js +++ b/ext/wasm/api/sqlite3-vfs-opfs-sahpool.js @@ -160,12 +160,6 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ } return this.getCapacity(); } - /** - Removes n entries from the pool's current capacity - if possible. It can only remove currently-unallocated - files. Returns a Promise resolving to the number of - removed files. - */ async reduceCapacity(n){ let nRm = 0; for(const ah of Array.from(this.availableSAH)){ @@ -424,7 +418,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ getCapacity(){ return this.#p.getCapacity(this.#p); } - getActiveFileCount(){ + getFileCount(){ return this.#p.getFileCount(); } async reserveMinimumCapacity(min){ @@ -610,9 +604,10 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ in the SAH pool. The default capacity is only large enough for one or two databases and their associated temp files. - - number getActiveFileCount() + - number getFileCount() - Returns the number of files from the pool currently in use. + Returns the number of files from the pool currently allocated to + slots. This is not the same as the files being "opened". - void importDb(name, byteArray) diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index e63d8440c..27a8118e8 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -2784,18 +2784,32 @@ globalThis.sqlite3InitModule = sqlite3InitModule; can have more than the initial capacity on the next run. */) .assert(u1.getCapacity() + 2 === (await u2.addCapacity(2))) + .assert(2 === (await u2.reduceCapacity(2))) .assert(sqlite3.oo1.OpfsSAHPool.default instanceof Function) .assert(sqlite3.oo1.OpfsSAHPool.default === sqlite3.oo1.OpfsSAHPool[sahPoolConfig.name]) .assert(sqlite3.capi.sqlite3_js_vfs_list().indexOf(sahPoolConfig.name) >= 0); - const db = new sqlite3.oo1.OpfsSAHPool.default("foo.db"); + T.assert(0 === u1.getFileCount()); + const DbCtor = sqlite3.oo1.OpfsSAHPool.default; + const dbName = '/foo.db'; + let db = new DbCtor(dbName); + T.assert(1 === u1.getFileCount()); db.exec([ 'create table t(a);', 'insert into t(a) values(1),(2),(3)' ]); + T.assert(1 === u1.getFileCount()); T.assert(3 === db.selectValue('select count(*) from t')); db.close(); + T.assert(1 === u1.getFileCount()); + db = new DbCtor(dbName); + T.assert(1 === u1.getFileCount()); + db.close(); + T.assert(1 === u1.getFileCount()) + .assert(true === u1.unlink(dbName)) + .assert(false === u1.unlink(dbName)) + .assert(0 === u1.getFileCount()); T.assert(true === await u2.removeVfs()) .assert(false === await u1.removeVfs()) @@ -1,5 +1,5 @@ -C Fix\sa\sshadowed\svar\sin\sopfs-sahpool\sand\sadd\smore\stests. -D 2023-07-18T19:27:11.899 +C More\sopfs-sahpool\stests. +D 2023-07-18T19:47:19.982 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -502,7 +502,7 @@ F ext/wasm/api/sqlite3-api-worker1.js 9f32af64df1a031071912eea7a201557fe39b17386 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 8cf8a897726f14071fae6be6648125162b256dfb4f96555b865dbb7a6b65e379 F ext/wasm/api/sqlite3-v-helper.js fc9ed95433d943a65905d16b7ed51515ddb6667d2a2c5a711c7ce33b29d3be31 -F ext/wasm/api/sqlite3-vfs-opfs-sahpool.js 4490d1b6a123d6d99fe5896e801de9dc8f81fa292a78e462ff10ebb5e9a10992 +F ext/wasm/api/sqlite3-vfs-opfs-sahpool.js a33b88beb55e0e19a8f9c3d37620e9aa58a0a32cacf7c398195d3d045d414815 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 4946af0d6fbd395aa39966562ca85900664605a5f0cc10fff50146dee527812c F ext/wasm/api/sqlite3-wasm.c 8867f1d41c112fb4a2cfe22ff224eccaf309fcdea266cee0ec554f85db72ef0f F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc06df0d599e625bde6a10a394e326dc68da9ff07fa5404354580f81566e591f @@ -549,7 +549,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js f09266873e1a34d9bdb6d3981ec8c9e382f31f215c9fd2f9016d2394b8ae9b7b F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2 -F ext/wasm/tester1.c-pp.js f26ed573b2b6948891c6f5c25e7018f3a4245b183532cfa386b74869634bd08e +F ext/wasm/tester1.c-pp.js f625ce01681956cfd895a834d8aeb68d59595200441628ac2e41adf48788d8c9 F ext/wasm/tests/opfs/concurrency/index.html 0802373d57034d51835ff6041cda438c7a982deea6079efd98098d3e42fbcbc1 F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 @@ -2044,8 +2044,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 91c789234963b660ae900f0738906b28a477993709e286d8125b2f4d6101601c -R 7463e6a2312d04dbe1f49055415382e0 +P 9c8a73aff0f291e0c18072372e0d8961d3a05910489598d0d342227d99871954 +R 17462841136511130de69ca7a00ea9cc U stephan -Z 6742837371ae9c474a1547585ca5d4c8 +Z c3c355ff206bb421832084a0cbc9cd73 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 208135c32..a80d58ffe 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9c8a73aff0f291e0c18072372e0d8961d3a05910489598d0d342227d99871954
\ No newline at end of file +60713fa9c4627ef17e0b8778eee37913d2b930c5a06414721a00af30e1395090
\ No newline at end of file |