More tests for the kvvfs vtab.

FossilOrigin-Name: 0358a99eedb503aaf8eff32a3143a2591081dfd3fd9eeecc51c601c98c714d6f

diff --git a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
index 5c6cb9302f94661afc5a52a8ad62c319d7b0da0a..ee4ebe019399917bd27120d1d30334d529153516 100644 (file)
--- a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
+++ b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
@@ -1456,19 +1456,28 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     Object.keys(cols).forEach((v,i)=>cols[v].colId = i);
 
     const VT = sqlite3.vtab;
-    const cursorState = function(cursor){
-      return ((cursor instanceof capi.sqlite3_vtab_cursor)
-       ? cursor
-       : VT.xCursor.get(cursor)
-      ).vTabState
-        ??= Object.assign(Object.create(null),{
+    const ProtoCursor = Object.assign(Object.create(null),{
+      row: function(){
+        return cache.storagePool[this.names[this.rowid]];
+      }
+    });
+    Object.assign(Object.create(ProtoCursor),{
           rowid: 0,
           names: Object.keys(cache.storagePool)
-            .filter(v=>!cache.rxJournalSuffix.test(v)),
-          row: function(){
-            return cache.storagePool[this.names[this.rowid]];
-          }
+            .filter(v=>!cache.rxJournalSuffix.test(v))
+        })
+    const cursorState = function(cursor, reset){
+      const o = (cursor instanceof capi.sqlite3_vtab_cursor)
+            ? cursor
+            : VT.xCursor.get(cursor);
+      if( reset || !o.vTabState ){
+        o.vTabState = Object.assign(Object.create(ProtoCursor),{
+          rowid: 0,
+          names: Object.keys(cache.storagePool)
+            .filter(v=>!cache.rxJournalSuffix.test(v))
         });
+      }
+      return o.vTabState;
     };
 
     const dbg = 1 ? ()=>{} : (...args)=>debug("vtab",...args);
@@ -1568,8 +1577,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           xFilter: function(pCursor, idxNum, idxCStr,
                             argc, argv/* [sqlite3_value* ...] */){
             dbg("xFilter",...arguments);
-            const st = cursorState(pCursor);
-            st.rowid = 0;
+            const st = cursorState(pCursor, true);
             return 0;
           },
           xBestIndex: function(pVtab, pIdxInfo){

diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js
index b7d4afe15298ea583ce0dbd4f6bed0af155604af..cac2a21725a6f42aac204c3e21572225be08f5fc 100644 (file)
--- a/ext/wasm/tester1.c-pp.js
+++ b/ext/wasm/tester1.c-pp.js
@@ -153,6 +153,10 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
     logClass('error',...args);
   };
 
+  const debug = (...args)=>{
+    console.debug('tester1',...args);
+  };
+
   const toss = (...args)=>{
     error(...args);
     throw new Error(args.join(' '));
@@ -3014,7 +3018,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
           const dbFilename = db.dbFilename();
           //console.warn("db.dbFilename() =",dbFilename);
           T.assert(3 === db.selectValue('select count(*) from kvvfs'));
-          console.debug("kvvfs to Object:",exportDb(dbFilename));
+          debug("kvvfs to Object:",exportDb(dbFilename));
           const n = sqlite3.kvvfs.size( dbFilename );
           T.assert( n>0, "Db size count failed" );
 
@@ -3070,7 +3074,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
           T.assert(6 === db.selectValue(sqlCount));
           let exp = exportDb(filename);
           let expectRows = 6;
-          console.debug("exported db",exp);
+          debug("exported db",exp);
           db.close();
           T.assert(expectRows === duo.selectValue(sqlCount));
           duo.close();
@@ -3108,8 +3112,8 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
 
           importDb(exp, true);
           db = new JDb({
-            filename,
-            flags: 't'
+            filename
+            //flags: 't'
           });
           duo = new JDb(filename);
           T.assert(expectRows === duo.selectValue(sqlCount));
@@ -3140,8 +3144,8 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
 
           if( 1 ){
             const pageSize = 1024 * 16;
-            console.debug("Export before vacuum", exportDb(filename));
-            console.debug("page size before vacuum",
+            debug("Export before vacuum", exportDb(filename));
+            debug("page size before vacuum",
                           db.selectArray(
                             "select page_size from pragma_page_size()"
                           ));
@@ -3151,10 +3155,12 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
               "vacuum;"
             ]);
             --expectRows;
-            console.debug("page size after",
-                          db.selectArray(
-                            "select page_size from pragma_page_size()"
-                          ));
+            if( 0 ){
+              debug("page size after",
+                    db.selectArray(
+                      "select page_size from pragma_page_size()"
+                    ));
+            }
             T.assert(expectRows === duo.selectValue(sqlCount),
                      "Unexpected record count.");
             T.assert( 8192 == db.selectValue(
@@ -3172,7 +3178,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
             T.assert(expectRows === duo.selectValue(sqlCount),
                      "Unexpected record count.");
             exp = exportDb(filename);
-            console.debug("vacuumed export",exp);
+            debug("vacuumed export",exp);
           }else{
             expectRows = 6;
           }
@@ -3184,7 +3190,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
           importDb(exp);
           T.assert( kvvfs.exists(exp.name) );
           db = new JDb(exp.name);
-          console.debug("column count after export",db.selectValue(sqlCount));
+          debug("column count after export",db.selectValue(sqlCount));
           T.assert(expectRows === db.selectValue(sqlCount),
                    "Unexpected record count.");
 
@@ -3252,7 +3258,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
           db = new DB(dbFileRaw);
           db.exec(sqlSetup);
           db.close();
-          console.debug("kvvfs listener counts:",counts);
+          debug("kvvfs listener counts:",counts);
           T.assert( counts.open )
             .assert( counts.close )
             .assert( counts.delete )
@@ -3277,15 +3283,24 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
       test: function(sqlite3){
         const kvvfs = sqlite3.kvvfs;
         const db = new sqlite3.oo1.DB();
+        const db2 = new sqlite3.oo1.DB('file:foo?vfs=kvvfs&delete-on-close=1');
         try{
           kvvfs.create_module(db);
           /*db.exec([
-            "create virtual table vt using kvvfs()"
+            "create virtual table vt using sqlite_kvvfs()"
           ]);*/
-          let rc = db.selectObjects("select * from sqlite_kvvfs");
-          console.log("vtab rc", rc);
+          let rc = db.selectObjects("select * from sqlite_kvvfs order by name");
+          debug("sqlite_kvvfs vtab:", rc);
+          rc = db.selectObject("select * from sqlite_kvvfs where name='foo'");
+          T.assert(rc, "Expecting foo storage record")
+            .assert('foo'===rc.name, "Unexpected name")
+            .assert(1===rc.nRef, "Unexpected refcount");
+          db2.close();
+          rc = db.selectObject("select * from sqlite_kvvfs where name='foo'");
+          T.assert(!rc, "Expecting foo storage to be gone");
         }finally{
           db.close();
+          db2.close();
         }
       }
     })/* kvvfs vtab */
@@ -3313,7 +3328,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
         let countCommit = 0, countRollback = 0;;
         const db = new sqlite3.oo1.DB(':memory:',1 ? 'c' : 'ct');
         let rc = capi.sqlite3_commit_hook(db, (p)=>{
-          //console.debug("commit hook",arguments);
+          //debug("commit hook",arguments);
           ++countCommit;
           return (17 == p) ? 0 : capi.SQLITE_ERROR;
         }, 17);

diff --git a/manifest b/manifest
index b1271a14aa7b5ce17b27d8a39e9de6a7fbabdf2a..94773bbb061c6a92a656346a2eed4a713e6e1275 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\skvvfs\svtab\sfor\sinspecting\sthe\sstorage\sstate.\sThis\sis\sfor\stesting\sand\smy\sown\sedification,\snot\spart\sof\sthe\spublic\sAPI.
-D 2025-11-29T16:41:27.823
+C More\stests\sfor\sthe\skvvfs\svtab.
+D 2025-11-29T21:19:35.418
 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 3f65769166670f2bd044374958f8eeb43b9fae8179ef58506acee38cb435de54
+F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js a1e556dd5c1769edf1be913d768a74fcfea33b4fefc70dacb9a51f32b42e5bfc
 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 366596d8ff73d4cefb938bbe95bc839d503c3fab6c8335ce4bf52f0d8a7dee81
@@ -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 05bb1099472d410b8b5b822af0f362ec565c617eea924d5f53a3b643fc1466d8
+F ext/wasm/tester1.c-pp.js 611c67df4ea42013f36d4c688e3482520fedd5b482effff9563b5143e68c38fe
 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
@@ -2180,8 +2180,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 0e1a6ca0f1123da680918027b16608bf87593a9d91f7b1f3fc0c3a454185740d
-R 2aee549605fa5886143a182c3a989cec
+P eaff2e8b7f63575e85fb9be800a2c59163e402d6a25fc6a955b9df15afe13b92
+R a57997d54941b9d2a633b9ebeaee3c38
 U stephan
-Z db62e7bb06a82ac76e6e3341ca1c99a3
+Z 72d312635cca3a260df8159a5e2d240e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9f0211379b2f0477c3210aa58aabe82189f3f8d2..95f09c50328ea87c3ef76a7fb980b9a016bd8f78 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eaff2e8b7f63575e85fb9be800a2c59163e402d6a25fc6a955b9df15afe13b92
+0358a99eedb503aaf8eff32a3143a2591081dfd3fd9eeecc51c601c98c714d6f