Improvements to query invariant checking in fuzzcheck.

FossilOrigin-Name: 56c60a35ea457f06db58ec3f694a1ae16fd03e6625da1d7879d63d72bbcb1c62

diff --git a/manifest b/manifest
index f2f58ab32bb3b8961d451c703504d98c01152bcf..8e5006703509237784f0bd17e7a234e863a95cc7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\srunning\san\sincremental\svacuum,\sdetect\sgrowth\sin\sthe\ssize\sof\sthe\sdatabase\nfile\s(which\scan\sonly\soccur\sif\sthe\sfile\sis\scorrupt)\sand\sfail\swith\sSQLITE_CORRUPT.
-D 2022-06-15T14:57:04.251
+C Improvements\sto\squery\sinvariant\schecking\sin\sfuzzcheck.
+D 2022-06-15T16:26:37.537
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1085,7 +1085,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 94b45d08b3500f71c90704381d26ba18b1b2988cdc896a16bd9491c48dada67b
+F test/fuzzcheck.c 7adeab621cace8aeccf5e92a7370532aa524d397a2b2f57fefb711cac66c5d15
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1097,7 +1097,7 @@ F test/fuzzdata8.db ca9a97f401b06b0d5376139ec7e1f9e773e13345a9a2d9ccc0032cdbfede
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c f8c304b8640afbf58536b0825f7fe5749af731f1bb72347ee7cee26e7181ab40
+F test/fuzzinvariants.c a2e39feba77582fd4b5620b0cb8ac104f509e59a8f3a6adfc343d34946abbc23
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1977,8 +1977,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 fef282f9fbb10967102f9676d85b8c6a3b36aff7109f1becdaeaeddef0dff4f1
-R a5fe9d41c5873f090af7d61350af7dff
+P cd7a44124558ea6a43c89b1cba4402d7bf6a6ccb83be0eeb7dd01b56933bca73
+R 7ab1978afe29575b6a560fe06e42e44a
 U drh
-Z b3c7fcb81f6ca7a7c7393e5acbb520dd
+Z 9ee4ed2d9aaf0440a4b83db4634923b1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 27831e289b4947b8357cddcfad82c2aa18427ead..a65fd280d35b46f11c5b75635f99a335e95b95e5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd7a44124558ea6a43c89b1cba4402d7bf6a6ccb83be0eeb7dd01b56933bca73
\ No newline at end of file
+56c60a35ea457f06db58ec3f694a1ae16fd03e6625da1d7879d63d72bbcb1c62
\ No newline at end of file

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index e1d3a12ecf74b83cf8445ba6e9a45df1c5804142..d6397db5fd0bbfd9e7a5dfeeb63c616004969421 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -154,6 +154,7 @@ static struct GlobalVars {
   Blob *pFirstSql;                 /* First SQL script */
   unsigned int uRandom;            /* Seed for the SQLite PRNG */
   unsigned char doInvariantChecks; /* True to run query invariant checks */
+  unsigned int nInvariant;         /* Number of invariant checks run */
   char zTestName[100];             /* Name of current test */
 } g;
 
@@ -925,7 +926,8 @@ int fuzz_invariant(
   sqlite3_stmt *pStmt,    /* Test statement stopped on an SQLITE_ROW */
   int iCnt,               /* Invariant sequence number, starting at 0 */
   int iRow,               /* The row number for pStmt */
-  int *pbCorrupt          /* IN/OUT: Flag indicating a corrupt database file */
+  int *pbCorrupt,         /* IN/OUT: Flag indicating a corrupt database file */
+  int eVerbosity          /* How much debugging output */
 );
 
 /*
@@ -950,8 +952,9 @@ static int runDbSql(sqlite3 *db, const char *zSql, unsigned int *pBtsFlags){
       if( (*pBtsFlags)==BTS_SELECT && g.doInvariantChecks ){
         int iCnt = 0;
         for(iCnt=0; iCnt<99999; iCnt++){
-          rc = fuzz_invariant(db, pStmt, iCnt, nRow, &bCorrupt);
+          rc = fuzz_invariant(db, pStmt, iCnt, nRow, &bCorrupt, eVerbosity);
           if( rc==SQLITE_DONE ) break;
+          g.nInvariant++;
           if( eVerbosity>0 ){
             if( rc==SQLITE_OK ){
               printf("invariant-check: ok\n");
@@ -2340,6 +2343,9 @@ int main(int argc, char **argv){
 
   if( !quietFlag && !bScript ){
     sqlite3_int64 iElapse = timeOfDay() - iBegin;
+    if( g.nInvariant ){
+      printf("fuzzcheck: %u query invariants checked\n", g.nInvariant);
+    }
     printf("fuzzcheck: 0 errors out of %d tests in %d.%03d seconds\n"
            "SQLite %s %s\n",
            nTest, (int)(iElapse/1000), (int)(iElapse%1000),

diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index d58d60e4064bcc1ab0a1eae7e7ef61e110788506..a48e637b00abc9573756694f7783e5655a540898 100644 (file)
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -63,7 +63,8 @@ int fuzz_invariant(
   sqlite3_stmt *pStmt,    /* Test statement stopped on an SQLITE_ROW */
   int iCnt,               /* Invariant sequence number, starting at 0 */
   int iRow,               /* The row number for pStmt */
-  int *pbCorrupt          /* IN/OUT: Flag indicating a corrupt database file */
+  int *pbCorrupt,         /* IN/OUT: Flag indicating a corrupt database file */
+  int eVerbosity          /* How much debugging output */
 ){
   char *zTest;
   sqlite3_stmt *pTestStmt = 0;
@@ -75,15 +76,25 @@ int fuzz_invariant(
   zTest = fuzz_invariant_sql(pStmt, iCnt);
   if( zTest==0 ) return SQLITE_DONE;
   rc = sqlite3_prepare_v2(db, zTest, -1, &pTestStmt, 0);
-  sqlite3_free(zTest);
   if( rc ){
+    if( eVerbosity ){
+      printf("invariant compile failed: %s\n%s\n",
+             sqlite3_errmsg(db), zTest);
+    }
+    sqlite3_free(zTest);
     sqlite3_finalize(pTestStmt);
     return rc;
   }
+  sqlite3_free(zTest);
   nCol = sqlite3_column_count(pStmt);
   for(i=0; i<nCol; i++){
     sqlite3_bind_value(pTestStmt, i+1, sqlite3_column_value(pStmt,i));
   }
+  if( eVerbosity>=2 ){
+    char *zSql = sqlite3_expanded_sql(pTestStmt);
+    printf("invariant-sql #%d:\n%s\n", iCnt, zSql);
+    sqlite3_free(zSql);
+  }
   while( (rc = sqlite3_step(pTestStmt))==SQLITE_ROW ){
     for(i=0; i<nCol; i++){
       if( !sameValue(sqlite3_column_value(pStmt,i),
@@ -118,6 +129,8 @@ int fuzz_invariant(
     if( rc==SQLITE_DONE ){
       reportInvariantFailed(pStmt, pTestStmt, iRow);
       return SQLITE_INTERNAL;
+    }else if( eVerbosity>0 ){
+      printf("invariant-error ignored due to the use of virtual tables\n");
     }
   }
   sqlite3_finalize(pTestStmt);
@@ -139,8 +152,15 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   sqlite3_stmt *pBase = 0;
   sqlite3 *db = sqlite3_db_handle(pStmt);
   int rc;
+  int nCol = sqlite3_column_count(pStmt);
+  int mxCnt;
 
-  if( iCnt<0 || iCnt>0 ) return 0;
+  if( nCol==1 ){
+    mxCnt = 0;
+  }else{
+    mxCnt = nCol;
+  }
+  if( iCnt<0 || iCnt>mxCnt ) return 0;
   zIn = sqlite3_sql(pStmt);
   if( zIn==0 ) return 0;
   nIn = strlen(zIn);
@@ -164,10 +184,11 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
       ** WHERE clause. */
       continue;
     }
+    if( iCnt>0 && i+1!=iCnt ) continue;
     if( sqlite3_column_type(pStmt, i)==SQLITE_NULL ){
       sqlite3_str_appendf(pTest, " %s \"%w\" ISNULL", zAnd, zColName);
     }else{
-      sqlite3_str_appendf(pTest, " %s \"%w\"=?%d", zAnd, zColName);
+      sqlite3_str_appendf(pTest, " %s \"%w\"=?%d", zAnd, zColName, i+1);
     }
     zAnd = "AND";
   }