From: drh <>
Date: Wed, 15 Jun 2022 10:37:16 +0000 (+0000)
Subject: Improvements to query invariant testing.  Almost working now.
X-Git-Tag: version-3.39.0~33^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a913f9b992e689a62f3a3e73fe652af50bc3ab92;p=thirdparty%2Fsqlite.git

Improvements to query invariant testing.  Almost working now.

FossilOrigin-Name: e039820418d64fb57cb1a8f9f21186284e6c76255a53445c5d7aef6cca89bfc4
---

diff --git a/manifest b/manifest
index a4d83cb6ad..59fba4ddf6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\senhance\sfuzzcheck\sto\sdo\ssome\ssimple\sinvariant\stesting\son\squeries.\nThis\sis\san\sincremental\scheck-in\sfor\sa\swork-in-progress.
-D 2022-06-14T19:12:25.257
+C Improvements\sto\squery\sinvariant\stesting.\s\sAlmost\sworking\snow.
+D 2022-06-15T10:37:16.279
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -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 37b1f99fe4a6335983651b6b97a250dacf03b9ef81a189e2b52aeeace88ab1b1
+F test/fuzzinvariants.c f8c304b8640afbf58536b0825f7fe5749af731f1bb72347ee7cee26e7181ab40
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1977,11 +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 b1be2259e2e08ec22a88bc9a18b3ab4d83246ad4c635c05cdf80d3eff84df06a
-R d9a53a2b707897d91318ee68037f4638
-T *branch * query-invariant-tests
-T *sym-query-invariant-tests *
-T -sym-trunk *
+P ce2d780163b3a28486904860a1815acc4169c09b971cfd199bb58d1e9a57b000
+R f40be5688ab6b140e179b3752fba449f
 U drh
-Z 709cfc900b1da90b6bf9416298b653df
+Z dac2d9a9551a2253d7acf57f43e8f388
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0b38499e49..fc4f095581 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ce2d780163b3a28486904860a1815acc4169c09b971cfd199bb58d1e9a57b000
\ No newline at end of file
+e039820418d64fb57cb1a8f9f21186284e6c76255a53445c5d7aef6cca89bfc4
\ No newline at end of file
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index 246a773043..d58d60e406 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -111,8 +111,14 @@ int fuzz_invariant(
       return SQLITE_CORRUPT;
     }
     sqlite3_finalize(pCk);
-    reportInvariantFailed(pStmt, pTestStmt, iRow);
-    return SQLITE_INTERNAL;
+    rc = sqlite3_prepare_v2(db, 
+            "SELECT 1 FROM bytecode(?1) WHERE opcode='VOpen'", -1, &pCk, 0);
+    if( rc==SQLITE_OK ) rc = sqlite3_step(pCk);
+    sqlite3_finalize(pCk);
+    if( rc==SQLITE_DONE ){
+      reportInvariantFailed(pStmt, pTestStmt, iRow);
+      return SQLITE_INTERNAL;
+    }
   }
   sqlite3_finalize(pTestStmt);
   return SQLITE_OK;
@@ -148,12 +154,20 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
     pBase = pStmt;
   }
   for(i=0; i<sqlite3_column_count(pStmt); i++){
+    const char *zColName = sqlite3_column_name(pBase,i);
+    const char *zSuffix = strchr(zColName, ':');
+    if( zSuffix 
+     && isdigit(zSuffix[1])
+     && (zSuffix[1]>'3' || isdigit(zSuffix[2]))
+    ){
+      /* This is a randomized column name and so cannot be used in the
+      ** WHERE clause. */
+      continue;
+    }
     if( sqlite3_column_type(pStmt, i)==SQLITE_NULL ){
-      sqlite3_str_appendf(pTest, " %s \"%w\" ISNULL", zAnd,
-                          sqlite3_column_name(pBase,i));
+      sqlite3_str_appendf(pTest, " %s \"%w\" ISNULL", zAnd, zColName);
     }else{
-      sqlite3_str_appendf(pTest, " %s \"%s\"=?%d", zAnd,
-                          sqlite3_column_name(pBase, i), i+1);
+      sqlite3_str_appendf(pTest, " %s \"%w\"=?%d", zAnd, zColName);
     }
     zAnd = "AND";
   }