Improvements to query invariants in fuzzcheck.

FossilOrigin-Name: 3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351

diff --git a/manifest b/manifest
index 8e5006703509237784f0bd17e7a234e863a95cc7..2257d3ea10de25d5f201a2ba2217455ea22435c1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\squery\sinvariant\schecking\sin\sfuzzcheck.
-D 2022-06-15T16:26:37.537
+C Improvements\sto\squery\sinvariants\sin\sfuzzcheck.
+D 2022-06-15T20:18:44.107
 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 7adeab621cace8aeccf5e92a7370532aa524d397a2b2f57fefb711cac66c5d15
+F test/fuzzcheck.c 609152902fb51e718554719f44d13677f68c53d98d15fb359fbefdd134be153b
 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 a2e39feba77582fd4b5620b0cb8ac104f509e59a8f3a6adfc343d34946abbc23
+F test/fuzzinvariants.c cd5a4c9b891a5c843e0f97a513c095490e974f1ea51392b13c0a7d77fff8e46d
 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 cd7a44124558ea6a43c89b1cba4402d7bf6a6ccb83be0eeb7dd01b56933bca73
-R 7ab1978afe29575b6a560fe06e42e44a
+P 56c60a35ea457f06db58ec3f694a1ae16fd03e6625da1d7879d63d72bbcb1c62
+R 31cb1a38d873229e67ac58c6da93b5d2
 U drh
-Z 9ee4ed2d9aaf0440a4b83db4634923b1
+Z 1dfdc8c41c0d4bc708c84e77e53555ca
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a65fd280d35b46f11c5b75635f99a335e95b95e5..5e298752d74b03fd289e7901f6d531129f7cad76 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56c60a35ea457f06db58ec3f694a1ae16fd03e6625da1d7879d63d72bbcb1c62
\ No newline at end of file
+3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351
\ No newline at end of file

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index d6397db5fd0bbfd9e7a5dfeeb63c616004969421..d09afe6a0034b83cdd04ee7522a76f49c7cb97da 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -949,12 +949,15 @@ static int runDbSql(sqlite3 *db, const char *zSql, unsigned int *pBtsFlags){
     int nRow = 0;
     while( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
       nRow++;
-      if( (*pBtsFlags)==BTS_SELECT && g.doInvariantChecks ){
+      if( (*pBtsFlags)==BTS_SELECT
+       && g.doInvariantChecks
+       && !sqlite3_stmt_isexplain(pStmt)
+      ){
         int iCnt = 0;
         for(iCnt=0; iCnt<99999; iCnt++){
           rc = fuzz_invariant(db, pStmt, iCnt, nRow, &bCorrupt, eVerbosity);
           if( rc==SQLITE_DONE ) break;
-          g.nInvariant++;
+          if( rc!=SQLITE_ERROR ) g.nInvariant++;
           if( eVerbosity>0 ){
             if( rc==SQLITE_OK ){
               printf("invariant-check: ok\n");

diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index a48e637b00abc9573756694f7783e5655a540898..f93722ced297140d982f67737e24616e12520523 100644 (file)
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -154,7 +154,15 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   int rc;
   int nCol = sqlite3_column_count(pStmt);
   int mxCnt;
+  int bDistinct = 0;
+  int bOrderBy = 0;
 
+  switch( iCnt % 4 ){
+    case 1:  bDistinct = 1;              break;
+    case 2:  bOrderBy = 1;               break;
+    case 3:  bDistinct = bOrderBy = 1;   break;
+  }
+  iCnt /= 4;
   if( nCol==1 ){
     mxCnt = 0;
   }else{
@@ -167,7 +175,8 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   while( nIn>0 && (isspace(zIn[nIn-1]) || zIn[nIn-1]==';') ) nIn--;
   if( strchr(zIn, '?') ) return 0;
   pTest = sqlite3_str_new(0);
-  sqlite3_str_appendf(pTest, "SELECT * FROM (%.*s)", (int)nIn, zIn);
+  sqlite3_str_appendf(pTest, "SELECT %s* FROM (%.*s)",
+                      bDistinct ? "DISTINCT " : "", (int)nIn, zIn);
   rc = sqlite3_prepare_v2(db, sqlite3_str_value(pTest), -1, &pBase, 0);
   if( rc ){
     sqlite3_finalize(pBase);
@@ -193,6 +202,9 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
     zAnd = "AND";
   }
   if( pBase!=pStmt ) sqlite3_finalize(pBase);
+  if( bOrderBy ){
+    sqlite3_str_appendf(pTest, " ORDER BY 1");
+  }
   return sqlite3_str_finish(pTest);
 }