From: dan <dan@noemail.net>
Date: Wed, 8 May 2019 18:49:51 +0000 (+0000)
Subject: Add tests to improve code coverage of the RBU module.
X-Git-Tag: version-3.29.0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42e84ae1ab2774a881aa271660ec79889bf761d4;p=thirdparty%2Fsqlite.git

Add tests to improve code coverage of the RBU module.

FossilOrigin-Name: ecb56b75a0e66462acdcce285b93f9fc56944c42902d886d6bada419059519a9
---

diff --git a/ext/rbu/rbufault3.test b/ext/rbu/rbufault3.test
index 5d44885e9e..4f690284a2 100644
--- a/ext/rbu/rbufault3.test
+++ b/ext/rbu/rbufault3.test
@@ -83,7 +83,6 @@ foreach {fault errlist} {
 
   do_faultsim_test 3 -faults $fault -prep {
     faultsim_restore_and_reopen
-    forcedelete test.db2
   } -body {
     sqlite3rbu_vacuum rbu test.db test.db2
     rbu step
@@ -91,7 +90,6 @@ foreach {fault errlist} {
   } -test {
     eval [list faultsim_test_result {0 SQLITE_OK} {*}$::errlist]
   }
-
 }
 
 finish_test
diff --git a/ext/rbu/rbumisc.test b/ext/rbu/rbumisc.test
new file mode 100644
index 0000000000..6378104b21
--- /dev/null
+++ b/ext/rbu/rbumisc.test
@@ -0,0 +1,53 @@
+# 2014 August 30
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+
+source [file join [file dirname [info script]] rbu_common.tcl]
+set ::testprefix rbumisc
+
+db close
+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 {
+  forcedelete rbu.db
+  sqlite3 rbu rbu.db
+  rbu eval {
+    CREATE TABLE data_x1(a, b, c, rbu_control);
+    INSERT INTO data_x1 VALUES(1, 1, 1, 0);
+    INSERT INTO data_x1 VALUES(2, 2, 2, 0);
+
+    CREATE TABLE dat(a, b, c, rbu_control);
+    CREATE TABLE "data x1"(a, b, c, rbu_control);
+    CREATE TABLE datax1(a, b, c, rbu_control);
+    CREATE TABLE data_(a, b, c, rbu_control);
+
+    INSERT INTO "data x1" VALUES(3, 3, 3, 0);
+    INSERT INTO datax1 VALUES(3, 3, 3, 0);
+    INSERT INTO data_ VALUES(3, 3, 3, 0);
+    INSERT INTO dat VALUES(3, 3, 3, 0);
+  }
+} {}
+
+do_test 1.2 {
+  step_rbu test.db rbu.db
+  db eval { SELECT * FROM x1 }
+} {1 1 1 2 2 2}
+
+finish_test
diff --git a/ext/rbu/rbutemplimit.test b/ext/rbu/rbutemplimit.test
index 9397b568df..958b2bfcbc 100644
--- a/ext/rbu/rbutemplimit.test
+++ b/ext/rbu/rbutemplimit.test
@@ -65,6 +65,7 @@ proc step_rbu_cachesize {target rbu stepsize cachesize temp_limit} {
   while 1 {
     sqlite3rbu rbu $target $rbu
     rbu temp_size_limit $temp_limit
+    if { [rbu temp_size_limit -1]!=$temp_limit } { error "round trip problem!" }
     sqlite3_exec_nr [rbu db 1] "PRAGMA cache_size = $cachesize"
     for {set i 0} {$i < $stepsize} {incr i} {
       set rc [rbu step]
diff --git a/ext/rbu/rbuvacuum4.test b/ext/rbu/rbuvacuum4.test
index 9984c9120a..5cf33d6765 100644
--- a/ext/rbu/rbuvacuum4.test
+++ b/ext/rbu/rbuvacuum4.test
@@ -50,13 +50,20 @@ do_execsql_test 3.0 {
   INSERT INTO t1 VALUES(1, 2, 3);
   INSERT INTO t1 VALUES(4, 5, 6);
   INSERT INTO t1 VALUES(7, 8, 9);
+
+  CREATE TABLE t2(a, b, c INTEGER, PRIMARY KEY(c));
+  CREATE INDEX i2 oN t2(b, a);
+  INSERT INTO t2 VALUES('a', 'b', -1);
+  INSERT INTO t2 VALUES('c', 'd', -2);
+  INSERT INTO t2 VALUES('e', 'f', -3);
 }
 
 do_rbu_vacuum_test 3.1 1
 
 do_execsql_test 3.2 {
   SELECT * FROM t1;
-} {1 2 3 4 5 6 7 8 9}
+  SELECT * FROM t2;
+} {1 2 3 4 5 6 7 8 9 e f -3 c d -2 a b -1}
 
 #-------------------------------------------------------------------------
 reset_db
@@ -96,6 +103,8 @@ do_execsql_test 5.0 {
   INSERT INTO "a b c" VALUES(3, 9, 1);
   INSERT INTO "a b c" VALUES('aaa', 'bbb', 'ccc');
 
+  CREATE INDEX abc2 ON "a b c"("c c" DESC, a);
+
   CREATE TABLE x(a);
   INSERT INTO x VALUES('a'), ('b'), ('d');
   CREATE UNIQUE INDEX y ON x(a);
diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c
index 0ed2837ca7..170505ca0b 100644
--- a/ext/rbu/sqlite3rbu.c
+++ b/ext/rbu/sqlite3rbu.c
@@ -1546,65 +1546,60 @@ char *rbuVacuumIndexStart(
   char *zVector = 0;
   char *zRet = 0;
   int bFailed = 0;
+  const char *zSep = "";
+  int iCol = 0;
+  sqlite3_stmt *pXInfo = 0;
 
-  if( p->rc==SQLITE_OK ){
-    const char *zSep = "";
-    int iCol = 0;
-    sqlite3_stmt *pXInfo = 0;
-    p->rc = prepareFreeAndCollectError(p->dbMain, &pXInfo, &p->zErrmsg,
-        sqlite3_mprintf("PRAGMA main.index_xinfo = %Q", pIter->zIdx)
-    );
-    while( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pXInfo) ){
-      int iCid = sqlite3_column_int(pXInfo, 1);
-      const char *zCollate = (const char*)sqlite3_column_text(pXInfo, 4);
-      const char *zCol;
-      if( sqlite3_column_int(pXInfo, 3) ){
-        bFailed = 1;
-        break;
-      }
+  p->rc = prepareFreeAndCollectError(p->dbMain, &pXInfo, &p->zErrmsg,
+      sqlite3_mprintf("PRAGMA main.index_xinfo = %Q", pIter->zIdx)
+  );
+  while( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pXInfo) ){
+    int iCid = sqlite3_column_int(pXInfo, 1);
+    const char *zCollate = (const char*)sqlite3_column_text(pXInfo, 4);
+    const char *zCol;
+    if( sqlite3_column_int(pXInfo, 3) ){
+      bFailed = 1;
+      break;
+    }
 
-      if( iCid<0 ){
-        if( pIter->eType==RBU_PK_IPK ){
-          int i;
-          for(i=0; pIter->abTblPk[i]==0; i++);
-          assert( i<pIter->nTblCol );
-          zCol = pIter->azTblCol[i];
-        }else{
-          zCol = "_rowid_";
-        }
+    if( iCid<0 ){
+      if( pIter->eType==RBU_PK_IPK ){
+        int i;
+        for(i=0; pIter->abTblPk[i]==0; i++);
+        assert( i<pIter->nTblCol );
+        zCol = pIter->azTblCol[i];
       }else{
-        zCol = pIter->azTblCol[iCid];
+        zCol = "_rowid_";
       }
-
-      zLhs = rbuMPrintf(p, "%z%s \"%w\" COLLATE %Q",
-          zLhs, zSep, zCol, zCollate
-      );
-      zOrder = rbuMPrintf(p, "%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC",
-          zOrder, zSep, iCol, zCol, zCollate
-      );
-      zSelect = rbuMPrintf(p, "%z%s quote(\"rbu_imp_%d%w\")",
-          zSelect, zSep, iCol, zCol
-      );
-      zSep = ", ";
-      iCol++;
+    }else{
+      zCol = pIter->azTblCol[iCid];
     }
-    rbuFinalize(p, pXInfo);
+
+    zLhs = rbuMPrintf(p, "%z%s \"%w\" COLLATE %Q",
+        zLhs, zSep, zCol, zCollate
+        );
+    zOrder = rbuMPrintf(p, "%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC",
+        zOrder, zSep, iCol, zCol, zCollate
+        );
+    zSelect = rbuMPrintf(p, "%z%s quote(\"rbu_imp_%d%w\")",
+        zSelect, zSep, iCol, zCol
+        );
+    zSep = ", ";
+    iCol++;
   }
+  rbuFinalize(p, pXInfo);
   if( bFailed ) goto index_start_out;
 
   if( p->rc==SQLITE_OK ){
-    int iCol;
     sqlite3_stmt *pSel = 0;
 
-    if( p->rc==SQLITE_OK ){
-      p->rc = prepareFreeAndCollectError(p->dbMain, &pSel, &p->zErrmsg,
-          sqlite3_mprintf("SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1",
-            zSelect, pIter->zTbl, zOrder
-          )
-      );
-    }
+    p->rc = prepareFreeAndCollectError(p->dbMain, &pSel, &p->zErrmsg,
+        sqlite3_mprintf("SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1",
+          zSelect, pIter->zTbl, zOrder
+        )
+    );
     if( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pSel) ){
-      const char *zSep = "";
+      zSep = "";
       for(iCol=0; iCol<pIter->nCol; iCol++){
         const char *zQuoted = (const char*)sqlite3_column_text(pSel, iCol);
         if( zQuoted[0]=='N' ){
diff --git a/manifest b/manifest
index cf25773aa5..de029bebe7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Provide\sthe\sSQLITE_OMIT_CASE_SENSITIVE_LIKE_PRAGMA\scompile-time\soption\sto\nomit\sthe\scase_sensitive_like\spragma.\s\sThis\schange,\sin\scombination\swith\ndocumentation\schanges,\sis\sthe\scurrent\ssolution\sto\sticket\n[a340eef47b0cad5].
-D 2019-05-08T17:27:18.827
+C Add\stests\sto\simprove\scode\scoverage\sof\sthe\sRBU\smodule.
+D 2019-05-08T18:49:51.870
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -346,21 +346,22 @@ F ext/rbu/rbudiff.test 156957851136b63c143478518dc1bda6c832103cdbe8ac1d7cdd47edb
 F ext/rbu/rbudor.test e3e8623926012f43eebe51fedf06a102df2640750d971596b052495f2536db20
 F ext/rbu/rbufault.test 2d7f567b79d558f6e093c58808cab4354f8a174e3802f69e7790a9689b3c09f8
 F ext/rbu/rbufault2.test 06e735c002c17802d93debca41f59b027e7429db7de17f2a81318ecfd3c651d4
-F ext/rbu/rbufault3.test e0052ccba428ffdd2bb989d3ae84716f058ec5ab5f7196c64ba407b9d23c7255
+F ext/rbu/rbufault3.test b2fcc9db5c982b869f67d1d4688d8cb515d5b92f58011fff95665f2e62cec179
 F ext/rbu/rbufault4.test 03d2849c3df7d7bd14a622e789ff049e5080edd34a79cd432e01204db2a5930a
 F ext/rbu/rbufts.test 0ae8d1da191c75bd776b86e24456db0fb6e97b7c944259fae5407ea55d23c31d
+F ext/rbu/rbumisc.test 0988f5e24df5c38067a97586cb24da68c80409651dedc958dbeec3dfe0c6ad11
 F ext/rbu/rbumulti.test 5fb139058f37ddc5a113c5b93238de915b769b7792de41b44c983bc7c18cf5b9
 F ext/rbu/rbupartial.test 1c8bd6d42615b94caf08f129f5817fa26975523f0f51bceda1dca90e8114c7c4
 F ext/rbu/rbuprogress.test 04614ff8820bab9c1ec1b7dbec1edc4b45474421d4fe7abbd2a879a9c02884f9
 F ext/rbu/rburesume.test dbdc4ca504e9c76375a69e5f0d91205db967dcc509a5166ca80231f8fda49eb1
 F ext/rbu/rbusave.test f4190a1a86fccf84f723af5c93813365ae33feda35845ba107b59683d1cdd926
 F ext/rbu/rbusplit.test b37e7b40b38760881dc9c854bd40b4744c6b6cd74990754eca3bda0f407051e8
-F ext/rbu/rbutemplimit.test 7f408f49b90fa0a720d7599f3aec74a3c85e6cd78e56fdf726ce00af9147a341
+F ext/rbu/rbutemplimit.test 05ceefa90a2e26a99f40dd48282ed63a00df5e59c1f2bfd479c143e201a1b0ba
 F ext/rbu/rbuvacuum.test 55e101e90168c2b31df6c9638fe73dc7f7cc666b6142266d1563697d79f73534
 F ext/rbu/rbuvacuum2.test b8e5b51dc8b2c0153373d024c0936be3f66f9234acbd6d0baab0869d56b14e6b
 F ext/rbu/rbuvacuum3.test 8addd82e4b83b4c93fa47428eae4fd0dbf410f8512c186f38e348feb49ba03dc
-F ext/rbu/rbuvacuum4.test 08abd9e18d8aee5bb812de0d6a928cc8bbacae58ecb1f150637e80f4c93c8afa
-F ext/rbu/sqlite3rbu.c ec93d28c5cef16ccef7ed76c2b6c410e8eb078c73705b6e7b683f88f722228f2
+F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2f1dbccfd10
+F ext/rbu/sqlite3rbu.c 65794a321345f00232ffc113159272d3a6934fd5a65e09df8b86d6bf2485246f
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -1824,7 +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 658b84d7f4a0886591c5aab30ed9e31c4a0f56db303eb863f24833ca37085d14
-R 1aacbe8635fd2d86ce3c1e661cee2fa2
-U drh
-Z 3ad5497a837c2c025e871372e9c65994
+P eabe7f2d4ff0e0dd868dcab7ec1d4a9168a25f80d3a52f0eeea2f90bd33782f2
+R f38629c2df688919c2eea086352e406a
+U dan
+Z 0dea2404f0db0801946b811401465571
diff --git a/manifest.uuid b/manifest.uuid
index 36d1783772..8af2174662 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eabe7f2d4ff0e0dd868dcab7ec1d4a9168a25f80d3a52f0eeea2f90bd33782f2
\ No newline at end of file
+ecb56b75a0e66462acdcce285b93f9fc56944c42902d886d6bada419059519a9
\ No newline at end of file