A more compact formulation of [ac8af73c16ab821] which uncovered two remaining direct...

FossilOrigin-Name: d391f1ce691fca4504c21a7e3e05a029f247da23d432ee34b0dae14be51d909c

diff --git a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
index f409abaa614f08256ff2c7c3e01206519a384b41..c161a3a4ba17d07d43fa6ff9756408597aa5894b 100644 (file)
--- a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
+++ b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
@@ -298,7 +298,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       const f = v?.[eventName];
       if( !f ) return;
       const ev = Object.create(null);
-      ev.storageName = store.jxClass;
+      ev.storageName = store.jzClass;
       ev.type = eventName;
       ev.data = ((args.length===1) ? args[0] : args);
       try{f(ev)?.catch?.(noop)}

diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js
index f08f487a55327093717e48cc6bf5f81a89e15e99..7a3383ae5723e03ecced3482eddfb2ad0b6baac0 100644 (file)
--- a/ext/wasm/tester1.c-pp.js
+++ b/ext/wasm/tester1.c-pp.js
@@ -3078,18 +3078,23 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
             reserve: true,
             events: {
               'open':   (ev)=>{
+                //console.warn('open',ev);
                 ++counts[ev.type];
-                T.assert('number'===typeof ev.data);
+                T.assert(filename===ev.storageName)
+                  .assert('number'===typeof ev.data);
               },
               'close': (ev)=>{
+                //console.warn('close',ev);
                 ++counts[ev.type];
                 T.assert('number'===typeof ev.data);
               },
               'delete': (ev)=>{
+                //console.warn('delete',ev);
                 ++counts[ev.type];
                 T.assert('string'===typeof ev.data);
               },
               'write':  (ev)=>{
+                //console.warn('write',ev);
                 ++counts[ev.type];
                 T.assert(Array.isArray(ev.data))
                   .assert('string'===typeof ev.data[0])

diff --git a/manifest b/manifest
index 89dd4fa5672b0c002eb45b70486112a1bbdfecb8..cba48183fdef13e3b58274b5fb1bce7629c3c150 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\swasm\sbuilds,\s#if\sout\sthe\simpls\sfor\sthe\s3\score\skvvfs\si/o\sroutines\swhich\sget\soverwritten\sfrom\sJS\s(and\sthus\saren't\sused)\sto\sreduce\sdependencies\son\sPOSIX\sAPIs.
-D 2025-11-25T15:35:53.299
+C A\smore\scompact\sformulation\sof\s[ac8af73c16ab821]\swhich\suncovered\stwo\sremaining\sdirect\scalls\sto\skvrecordRead(),\snow\sreplaced\swith\scalls\sthrough\sthe\sthunk.\sFix\sa\stypo\swhich\scaused\sthe\sstorage\sobject\sname\sto\snot\sbe\spassed\son\sto\sevent\slistener.
+D 2025-11-25T15:59:58.353
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -600,7 +600,7 @@ F ext/wasm/api/sqlite3-api-worker1.c-pp.js 1041dd645e8e821c082b628cd8d9acf70c667
 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 9654b565b346dc609b75d15337f20acfa7af7d9d558da1afeb9b6d8eaa404966
 F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d
-F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 4ca1a1b99f0e6e8fcf37eed52487a1f850d557123607030b9f9b4f5e573b8589
+F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 5eb75df70a029f042437a161994fa3bc15e38ad5ab1b2f3d56a48907a5563b8d
 F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js a2eea6442556867b589e04107796c6e1d04a472219529eeb45b7cd221d7d048b
 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 88ce2078267a2d1af57525a32d896295f4a8db7664de0e17e82dc9ff006ed8d3
 F ext/wasm/api/sqlite3-vtab-helper.c-pp.js 9097074724172e31e56ce20ccd7482259cf72a76124213cbc9469d757676da86
@@ -647,7 +647,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c
 F ext/wasm/tester1-worker.c-pp.html 0e432ec2c0d99cd470484337066e8d27e7aee4641d97115338f7d962bf7b081a
 F ext/wasm/tester1.c-pp.html 52d88fe2c6f21a046030a36410b4839b632f4424028197a45a3d5669ea724ddb
-F ext/wasm/tester1.c-pp.js 157df4565b400704ce1b605e41d706ebc97555e719131f714e39e2498eeb1ba6
+F ext/wasm/tester1.c-pp.js af5a136f09903820baa68ad0e68d9e19d4b43d79cf37b88393b72e42e403da49
 F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e
 F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@ -717,7 +717,7 @@ F src/notify.c 57c2d1a2805d6dee32acd5d250d928ab94e02d76369ae057dee7d445fd64e878
 F src/os.c 509452169d5ea739723e213b8e2481cf0e587f0e88579a912d200db5269f5f6d
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
-F src/os_kv.c e12a9a0c12292ed8a4e06ee71368dcc515122b995ac1d1860212750df3abb285
+F src/os_kv.c c0f9a04057731e5e8e41478b55aef2139c86b46a8731c7daf4793e8e5cee69af
 F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
 F src/os_unix.c 7945ede1e85b2d1b910e1b4af9ba342e964b1e30e79f4176480a60736445cb36
 F src/os_win.c a89b501fc195085c7d6c9eec7f5bd782625e94bb2a96b000f4d009703df1083f
@@ -2178,8 +2178,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f355fd484947a645206c9b9c2fd6fe691455dece7fb1aa5b72cb51a86b39474f
-R 93d4eb5b59489ea4dc2e925508b24b87
+P ac8af73c16ab821a7aa7d28a5fde8aeba0bc4d03c0af0dd2cff288c8fdabc49e
+R 0b657d9ec08d4510b19d52c8a768a0eb
 U stephan
-Z b720bd0cbd461c9ff070c111739d050c
+Z d985b9f24d5e7256a7dd8725b92921bf
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 70d4b76591417dff63827f74f538aa68d572bb4c..17ccdefa9506ea602192f4b90f5e0cf2780109a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac8af73c16ab821a7aa7d28a5fde8aeba0bc4d03c0af0dd2cff288c8fdabc49e
+d391f1ce691fca4504c21a7e3e05a029f247da23d432ee34b0dae14be51d909c

diff --git a/src/os_kv.c b/src/os_kv.c
index dfaaea1cf0ff7dc71cf9ad7c9516483e5a6a8af5..fccec706fd6ef30a6965b3d17a18a8c381a6b8ca 100644 (file)
--- a/src/os_kv.c
+++ b/src/os_kv.c
@@ -172,9 +172,12 @@ static sqlite3_io_methods kvvfs_jrnl_io_methods = {
 
 /* Forward declarations for the low-level storage engine
 */
+#ifndef SQLITE_WASM
+/* In WASM builds these are implemented in JS. */
 static int kvrecordWrite(const char*, const char *zKey, const char *zData);
 static int kvrecordDelete(const char*, const char *zKey);
 static int kvrecordRead(const char*, const char *zKey, char *zBuf, int nBuf);
+#endif
 #define KVRECORD_KEY_SZ  32
 
 /* Expand the key name with an appropriate prefix and put the result
@@ -211,6 +214,7 @@ static void kvrecordMakeKey(
                    zClass, zKeyIn);
 }
 
+#ifndef SQLITE_WASM
 /* Write content into a key.  zClass is the particular namespace of the
 ** underlying key/value store to use - either "local" or "session".
 **
@@ -223,7 +227,6 @@ static int kvrecordWrite(
   const char *zKey,
   const char *zData
 ){
-#ifndef SQLITE_WASM
   FILE *fd;
   char zXKey[KVRECORD_KEY_SZ];
   kvrecordMakeKey(zClass, zKey, zXKey);
@@ -238,15 +241,6 @@ static int kvrecordWrite(
   }else{
     return 1;
   }
-#else
-  /* block the above out to reduce the WASM side's dependency
-     on POSIX I/O APIS. */
-  UNUSED_PARAMETER(zClass);
-  UNUSED_PARAMETER(zKey);
-  UNUSED_PARAMETER(zData);
-  assert(!"overwritten by JS");
-  return SQLITE_ERROR;
-#endif
 }
 
 /* Delete a key (with its corresponding data) from the key/value
@@ -254,20 +248,11 @@ static int kvrecordWrite(
 ** this routine is a no-op.
 */
 static int kvrecordDelete(const char *zClass, const char *zKey){
-#ifndef SQLITE_WASM
   char zXKey[KVRECORD_KEY_SZ];
   kvrecordMakeKey(zClass, zKey, zXKey);
   unlink(zXKey);
   SQLITE_KV_TRACE(("KVVFS-DELETE %-15s\n", zXKey));
   return 0;
-#else
-  /* block the above out to reduce the WASM side's dependency
-     on POSIX I/O APIS. */
-  UNUSED_PARAMETER(zClass);
-  UNUSED_PARAMETER(zKey);
-  assert(!"overwritten by JS");
-  return SQLITE_ERROR;
-#endif
 }
 
 /* Read the value associated with a zKey from the key/value namespace given
@@ -291,7 +276,6 @@ static int kvrecordRead(
   char *zBuf,
   int nBuf
 ){
-#ifndef SQLITE_WASM
   FILE *fd;
   struct stat buf;
   char zXKey[KVRECORD_KEY_SZ];
@@ -326,17 +310,9 @@ static int kvrecordRead(
                  n, zBuf, n>50 ? "..." : ""));
     return (int)n;
   }
-#else
-  /* block the above out to reduce the WASM side's dependency
-     on POSIX I/O APIS. */
-  UNUSED_PARAMETER(zClass);
-  UNUSED_PARAMETER(zKey);
-  UNUSED_PARAMETER(zBuf);
-  UNUSED_PARAMETER(nBuf);
-  assert(!"overwritten by JS");
-  return SQLITE_ERROR;
-#endif
 }
+#endif /* #ifndef SQLITE_WASM */
+
 
 /*
 ** An internal level of indirection which enables us to replace the
@@ -379,9 +355,15 @@ struct sqlite3_kvvfs_methods {
 const
 #endif
 sqlite3_kvvfs_methods sqlite3KvvfsMethods = {
+#ifndef SQLITE_WASM
   .xRcrdRead       = kvrecordRead,
   .xRcrdWrite      = kvrecordWrite,
   .xRcrdDelete     = kvrecordDelete,
+#else
+  .xRcrdRead       = 0,
+  .xRcrdWrite      = 0,
+  .xRcrdDelete     = 0,
+#endif
   .nKeySize        = KVRECORD_KEY_SZ,
   .nBufferSize     = SQLITE_KVOS_SZ,
   .pVfs            = &sqlite3OsKvvfsObject,
@@ -585,16 +567,22 @@ static int kvvfsReadJrnl(
   assert( pFile->isJournal );
   SQLITE_KV_LOG(("xRead('%s-journal',%d,%lld)\n", pFile->zClass, iAmt, iOfst));
   if( pFile->aJrnl==0 ){
-    int szTxt = kvrecordRead(pFile->zClass, "jrnl", 0, 0);
+    int rc;
+    int szTxt = sqlite3KvvfsMethods.xRcrdRead(pFile->zClass, "jrnl",
+                                              0, 0);
     char *aTxt;
     if( szTxt<=4 ){
       return SQLITE_IOERR;
     }
     aTxt = sqlite3_malloc64( szTxt+1 );
     if( aTxt==0 ) return SQLITE_NOMEM;
-    kvrecordRead(pFile->zClass, "jrnl", aTxt, szTxt+1);
-    kvvfsDecodeJournal(pFile, aTxt, szTxt);
+    rc = sqlite3KvvfsMethods.xRcrdRead(pFile->zClass, "jrnl",
+                                       aTxt, szTxt+1);
+    if( rc>=0 ){
+      kvvfsDecodeJournal(pFile, aTxt, szTxt);
+    }
     sqlite3_free(aTxt);
+    if( rc ) return rc;
     if( pFile->aJrnl==0 ) return SQLITE_IOERR;
   }
   if( iOfst+iAmt>pFile->nJrnl ){