Add tests for the RBU module.

FossilOrigin-Name: a194e53670e25a48c2bb51b54755abff88ed6ae2596c5858fb4aac16cb452bdf

diff --git a/ext/rbu/rbufault2.test b/ext/rbu/rbufault2.test
index 5b006f78ea65521a839d764ee31ee0a7e06884e1..36f2b6b6f238b638ff4595a8301d7b94f18e8dcf 100644 (file)
--- a/ext/rbu/rbufault2.test
+++ b/ext/rbu/rbufault2.test
@@ -52,6 +52,15 @@ do_faultsim_test 1 -faults oom* -prep {
 }
 
 
+sqlite3rbu_create_vfs -default rbu ""
+sqlite3 db test.db
+set ::vfsname [file_control_vfsname db]
+do_faultsim_test 2 -faults oom* -prep {
+} -body {
+  file_control_vfsname db
+} 
+db close
+sqlite3rbu_destroy_vfs rbu
 
 
 finish_test

diff --git a/ext/rbu/rbumisc.test b/ext/rbu/rbumisc.test
index d8fe030b48c654b58e44bb006c971a6bb49bdba7..c2a3906c09f19c1d5ab50e4b5093e355432afed2 100644 (file)
--- a/ext/rbu/rbumisc.test
+++ b/ext/rbu/rbumisc.test
@@ -18,14 +18,7 @@ sqlite3_shutdown
 sqlite3_config_uri 1
 reset_db
 
-#-------------------------------------------------------------------------
-# Ensure that RBU is not confused by oddly named tables in an RBU 
-# database.
-#
-do_execsql_test 1.0 {
-  CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY);
-}
-do_test 1.1 {
+proc populate_rbu_db {} {
   forcedelete rbu.db
   sqlite3 rbu rbu.db
   rbu eval {
@@ -44,6 +37,17 @@ do_test 1.1 {
     INSERT INTO dat VALUES(3, 3, 3, 0);
   }
   rbu close
+}
+
+#-------------------------------------------------------------------------
+# Ensure that RBU is not confused by oddly named tables in an RBU 
+# database.
+#
+do_execsql_test 1.0 {
+  CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY);
+}
+do_test 1.1 {
+  populate_rbu_db
 } {}
 
 do_test 1.2 {
@@ -62,9 +66,7 @@ do_test 1.3 {
 
 do_test 1.4 {
   db eval { DELETE FROM x1 }
-  sqlite3 rbu rbu.db
-  rbu eval { DELETE FROM rbu_state }
-  rbu close
+  populate_rbu_db
 
   sqlite3rbu rbu test.db rbu.db
   rbu step
@@ -77,4 +79,102 @@ do_test 1.4 {
   list [catch { rbu close } msg] $msg
 } {1 {SQLITE_ERROR - cannot update wal mode database}}
 
+#-------------------------------------------------------------------------
+# Test the effect of a wal file appearing after the target database has
+# been opened, but before it has been locked.
+#
+catch { db close }
+testvfs tvfs -default 1
+
+for {set N 1} {$N < 10} {incr N} {
+  reset_db
+  populate_rbu_db
+  do_execsql_test 2.$N.0 {
+    CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY);
+  }
+  
+  set nAccessCnt 0
+  do_test 2.$N.1 {
+    sqlite3rbu rbu test.db rbu.db
+    rbu step
+    rbu step
+    rbu close
+  } {SQLITE_OK}
+  
+  tvfs script xAccess
+  tvfs filter xAccess
+  set nAccessCnt 0
+  proc xAccess {method file args} {
+    global nAccessCnt
+    if {[file tail $file]=="test.db-wal"} {
+      incr nAccessCnt -1
+      if {$nAccessCnt==0} {
+        set fd [open test.db-wal w]
+        puts -nonewline $fd [string repeat 0 2000]
+        close $fd
+      }
+    }
+    return SQLITE_OK
+  }
+
+  foreach r {
+     {1 {SQLITE_ERROR - cannot update wal mode database}}
+     {0 SQLITE_OK}
+     {1 {SQLITE_CANTOPEN - unable to open database file}}
+  } {
+    set RES($r) 1
+  }
+  do_test 2.$N.2 {
+    set ::nAccessCnt $N
+    set res [list [catch {
+      sqlite3rbu rbu test.db rbu.db
+      rbu step
+      rbu close
+    } msg ] $msg]
+    set RES($res)
+  } {1}
+  catch {rbu close}
+}
+catch {db close}
+catch {tvfs delete}
+
+#-------------------------------------------------------------------------
+testvfs tvfs -default 1
+reset_db
+populate_rbu_db
+do_execsql_test 3.0 {
+  CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY);
+}
+  
+tvfs script xFileControl
+tvfs filter xFileControl
+
+proc xFileControl {method file verb args} {
+  if {$verb=="ZIPVFS" && [info exists ::zipvfs_filecontrol]} {
+    return $::zipvfs_filecontrol 
+  }
+  return "SQLITE_NOTFOUND"
+}
+
+breakpoint
+foreach {tn ret err} {
+  1 SQLITE_OK           0
+  2 SQLITE_ERROR        1
+  3 SQLITE_NOTFOUND     0
+  4 SQLITE_OMIT         1
+} {
+  set ::zipvfs_filecontrol $ret
+  do_test 3.$tn.1 {
+    catch {
+      sqlite3rbu rbu test.db rbu.db
+      rbu step
+      rbu close
+    }
+  } $err
+}
+catch {db close}
+catch {tvfs delete}
+
+#-------------------------------------------------------------------------
+
 finish_test

diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c
index 481d01eafcd0cf32ca52a5cd3bc140deb5cb8974..a4fbeb614e2e641251a10c5f19b1c0fdb358c686 100644 (file)
--- a/ext/rbu/sqlite3rbu.c
+++ b/ext/rbu/sqlite3rbu.c
@@ -4707,9 +4707,7 @@ static int rbuVfsFileControl(sqlite3_file *pFile, int op, void *pArg){
       }else if( rc==SQLITE_NOTFOUND ){
         pRbu->pTargetFd = p;
         p->pRbu = pRbu;
-        if( p->openFlags & SQLITE_OPEN_MAIN_DB ){
-          rbuMainlistAdd(p);
-        }
+        rbuMainlistAdd(p);
         if( p->pWalFd ) p->pWalFd->pRbu = pRbu;
         rc = SQLITE_OK;
       }
@@ -4772,10 +4770,7 @@ static int rbuVfsShmLock(sqlite3_file *pFile, int ofst, int n, int flags){
     if( ofst==WAL_LOCK_CKPT && n==1 ) rc = SQLITE_BUSY;
   }else{
     int bCapture = 0;
-    if( n==1 && (flags & SQLITE_SHM_EXCLUSIVE)
-     && pRbu && pRbu->eStage==RBU_STAGE_CAPTURE
-     && (ofst==WAL_LOCK_WRITE || ofst==WAL_LOCK_CKPT || ofst==WAL_LOCK_READ0)
-    ){
+    if( pRbu && pRbu->eStage==RBU_STAGE_CAPTURE ){
       bCapture = 1;
     }
 
@@ -4808,20 +4803,24 @@ static int rbuVfsShmMap(
   ** rbu is in the RBU_STAGE_OAL state, use heap memory for *-shm space 
   ** instead of a file on disk.  */
   assert( p->openFlags & (SQLITE_OPEN_MAIN_DB|SQLITE_OPEN_TEMP_DB) );
-  if( eStage==RBU_STAGE_OAL || eStage==RBU_STAGE_MOVE ){
-    if( iRegion<=p->nShm ){
-      sqlite3_int64 nByte = (iRegion+1) * sizeof(char*);
-      char **apNew = (char**)sqlite3_realloc64(p->apShm, nByte);
-      if( apNew==0 ){
-        rc = SQLITE_NOMEM;
-      }else{
-        memset(&apNew[p->nShm], 0, sizeof(char*) * (1 + iRegion - p->nShm));
-        p->apShm = apNew;
-        p->nShm = iRegion+1;
-      }
+  if( eStage==RBU_STAGE_OAL ){
+    sqlite3_int64 nByte = (iRegion+1) * sizeof(char*);
+    char **apNew = (char**)sqlite3_realloc64(p->apShm, nByte);
+
+    /* This is an RBU connection that uses its own heap memory for the
+    ** pages of the *-shm file. Since no other process can have run
+    ** recovery, the connection must request *-shm pages in order
+    ** from start to finish.  */
+    assert( iRegion==p->nShm );
+    if( apNew==0 ){
+      rc = SQLITE_NOMEM;
+    }else{
+      memset(&apNew[p->nShm], 0, sizeof(char*) * (1 + iRegion - p->nShm));
+      p->apShm = apNew;
+      p->nShm = iRegion+1;
     }
 
-    if( rc==SQLITE_OK && p->apShm[iRegion]==0 ){
+    if( rc==SQLITE_OK ){
       char *pNew = (char*)sqlite3_malloc64(szRegion);
       if( pNew==0 ){
         rc = SQLITE_NOMEM;

diff --git a/manifest b/manifest
index bf5bd20228d13567168a82a9cdd0a6f126ccb7fa..05c19cba8b0ef86ec69961fa6999cd15bddf90ad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2019-05-10T17:54:58.895
+C Add\stests\sfor\sthe\sRBU\smodule.
+D 2019-05-10T20:44:10.289
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -345,11 +345,11 @@ F ext/rbu/rbucrash2.test efa143cc94228eb0266d3f1abfbee60a5838a84cef7cc3fcb8c145b
 F ext/rbu/rbudiff.test 156957851136b63c143478518dc1bda6c832103cdbe8ac1d7cdd47edb3cbe0a3
 F ext/rbu/rbudor.test e3e8623926012f43eebe51fedf06a102df2640750d971596b052495f2536db20
 F ext/rbu/rbufault.test 2d7f567b79d558f6e093c58808cab4354f8a174e3802f69e7790a9689b3c09f8
-F ext/rbu/rbufault2.test 06e735c002c17802d93debca41f59b027e7429db7de17f2a81318ecfd3c651d4
+F ext/rbu/rbufault2.test c81327a3ac2c385b9b954db3644d4e0df93eeebfc3de9f1f29975a1e73fd3d0c
 F ext/rbu/rbufault3.test b2fcc9db5c982b869f67d1d4688d8cb515d5b92f58011fff95665f2e62cec179
 F ext/rbu/rbufault4.test 03d2849c3df7d7bd14a622e789ff049e5080edd34a79cd432e01204db2a5930a
 F ext/rbu/rbufts.test 0ae8d1da191c75bd776b86e24456db0fb6e97b7c944259fae5407ea55d23c31d
-F ext/rbu/rbumisc.test df6201ac3263ac8c68c4f1a4803d8c006c241102eb1d30d8074b0c14e59de335
+F ext/rbu/rbumisc.test 329986cf5dd51890c4eb906c2f960ebb773a79a64bed90f506b7c417825b37eb
 F ext/rbu/rbumulti.test 5fb139058f37ddc5a113c5b93238de915b769b7792de41b44c983bc7c18cf5b9
 F ext/rbu/rbupartial.test 1c8bd6d42615b94caf08f129f5817fa26975523f0f51bceda1dca90e8114c7c4
 F ext/rbu/rbuprogress.test 04614ff8820bab9c1ec1b7dbec1edc4b45474421d4fe7abbd2a879a9c02884f9
@@ -361,7 +361,7 @@ F ext/rbu/rbuvacuum.test 55e101e90168c2b31df6c9638fe73dc7f7cc666b6142266d1563697
 F ext/rbu/rbuvacuum2.test b8e5b51dc8b2c0153373d024c0936be3f66f9234acbd6d0baab0869d56b14e6b
 F ext/rbu/rbuvacuum3.test 8addd82e4b83b4c93fa47428eae4fd0dbf410f8512c186f38e348feb49ba03dc
 F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2f1dbccfd10
-F ext/rbu/sqlite3rbu.c 311fe2c2bc73e2ddb9ee8eb10be35aca90f6074869734671f615270b1a1ce283
+F ext/rbu/sqlite3rbu.c 8741c0ee1496b41ff888b983a1a32547bc8822602603c68b3e524e5e0e287395
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -578,7 +578,7 @@ F src/test_tclsh.c eeafce33ad2136d57e5dec10f1e9a4347447eb72ffd504a1c7b9c6bfe2e71
 F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb268dfc
 F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
 F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
-F src/test_vfs.c 0868f1d4d7cdc7c6df60e895ca26b19e4f433dd1be0fc9c18c3ee63755804039
+F src/test_vfs.c 32618cbd953963278804bb47e97be7085d9e0d8755b1e734c3e54e9b9e115277
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1
 F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a90484215
@@ -1825,8 +1825,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2846bc0429c0956473bfe99dde135f2c206720f0be4c2800118b280e446ce325 ca068d82387fc3cda9d2050cedb4f9c61b6d9dc54f89015b4b2ee492243ed5c9
-R a374a86e729efdadd775e6bfeb83ab34
-T +closed ca068d82387fc3cda9d2050cedb4f9c61b6d9dc54f89015b4b2ee492243ed5c9
-U drh
-Z 58072126b73b126150a44fa2fc1abfc6
+P 956ca2a452aa3707bca553007a7ef221af3d4f6b0af747d17070926e000f2362
+R aedd4a737d702eedb0953d5c2736092f
+U dan
+Z e9d784d22aa55b9ee9b4a684291d2b0b

diff --git a/manifest.uuid b/manifest.uuid
index 366b7cbb62247cc90b2a0eee86e06b1d447ff5e3..27d0a83e5ad7aaea0db961cade3c365bddac34a9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-956ca2a452aa3707bca553007a7ef221af3d4f6b0af747d17070926e000f2362
\ No newline at end of file
+a194e53670e25a48c2bb51b54755abff88ed6ae2596c5858fb4aac16cb452bdf
\ No newline at end of file

diff --git a/src/test_vfs.c b/src/test_vfs.c
index 43e872bb3b7012d5f38b124f32b3fe0b02af63eb..3357a0a27dace84364f42ed9d0fda25286020a37 100644 (file)
--- a/src/test_vfs.c
+++ b/src/test_vfs.c
@@ -235,6 +235,7 @@ static int tvfsResultCode(Testvfs *p, int *pRc){
     { SQLITE_BUSY,     "SQLITE_BUSY"   },
     { SQLITE_READONLY, "SQLITE_READONLY"   },
     { SQLITE_READONLY_CANTINIT, "SQLITE_READONLY_CANTINIT"   },
+    { SQLITE_NOTFOUND, "SQLITE_NOTFOUND"   },
     { -1,              "SQLITE_OMIT"   },
   };
 
@@ -552,6 +553,7 @@ static int tvfsFileControl(sqlite3_file *pFile, int op, void *pArg){
     } aF[] = {
       { SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, "BEGIN_ATOMIC_WRITE" },
       { SQLITE_FCNTL_COMMIT_ATOMIC_WRITE, "COMMIT_ATOMIC_WRITE" },
+      { SQLITE_FCNTL_ZIPVFS, "ZIPVFS" },
     };
     int i;
     for(i=0; i<sizeof(aF)/sizeof(aF[0]); i++){
@@ -565,7 +567,7 @@ static int tvfsFileControl(sqlite3_file *pFile, int op, void *pArg){
           0, 0
       );
       tvfsResultCode(p, &rc);
-      if( rc ) return rc;
+      if( rc ) return (rc<0 ? SQLITE_OK : rc);
     }
   }
   return sqlite3OsFileControl(pFd->pReal, op, pArg);