Get the optfuzz program working.

FossilOrigin-Name: 21346bbce9fd161e8a2037834a6e8eb443a901109ddb3a52c1b7a29000ffeac8

3 files changed, 65 insertions, 29 deletions

diff --git a/manifest b/manifest
index c8b5d5545..44e5d461d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\soptfuzz.c\sprogram\sfor\sverifying\sthe\squery\splanner\susing\sa\sfuzzer.\nThis\sis\san\sinitial\scode\scheck-in.
-D 2018-03-21T19:25:59.092
+C Get\sthe\soptfuzz\sprogram\sworking.
+D 2018-03-21T20:21:29.680
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1110,9 +1110,9 @@ F test/numcast.test 5d126f7f581432e86a90d1e35cac625164aec4a1
 F test/numindex1.test 20a5450d4b056e48cd5db30e659f13347a099823
 F test/offset1.test f06b83657bcf26f9ce805e67450e189e282143b2
 F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
-F test/optfuzz-db01.c a0c256905c8ac79f9a5de2f374a3d9f757bef0dca2a238dc7c10cc8a38031834 w test/testdb01.c
-F test/optfuzz-db01.txt 21f6bdeadc701cf11528276e2a55c70bfcb846ba42df327f979bd9e7b6ce7041 w test/testdb01.txt
-F test/optfuzz.c b5f8c4d1af09e98592331d8598d58d7088bdad085703a37cf6b3a12f3b1a3ae8
+F test/optfuzz-db01.c a0c256905c8ac79f9a5de2f374a3d9f757bef0dca2a238dc7c10cc8a38031834
+F test/optfuzz-db01.txt 21f6bdeadc701cf11528276e2a55c70bfcb846ba42df327f979bd9e7b6ce7041
+F test/optfuzz.c dc11a3cc93afe00d1db2c9de01dbe362d58e21e8c3567b6df2e075de8f956bbd
 F test/orderby1.test 4d22a7c75f6a83fc1f188cc7bb5192285fdf2552
 F test/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
 F test/orderby3.test 8619d06a3debdcd80a27c0fdea5c40b468854b99
@@ -1715,7 +1715,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 4661ac81c9589b06a07df8b7931fbd0a7f9a4e9ba1448192b70701dc85a29bd2
-R 4dcfbf1bcde15e35f7fd5f585699a49d
+P 3fb21251b0c9c731513e8fb137867c2710a77d99411c99348d3ac45d3babffd7
+R 5d431b6a6c3a3244c6c0494b0f1ea1d5
 U drh
-Z af967147daedd09b6c6ab5f21381279c
+Z 646af13398a9d2c2d0f4f3bb80ed216e
diff --git a/manifest.uuid b/manifest.uuid
index 455d723d9..c2d8e693f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3fb21251b0c9c731513e8fb137867c2710a77d99411c99348d3ac45d3babffd7
\ No newline at end of file
+21346bbce9fd161e8a2037834a6e8eb443a901109ddb3a52c1b7a29000ffeac8
\ No newline at end of file
diff --git a/test/optfuzz.c b/test/optfuzz.c
index 83b90ad2e..efb71a299 100644
--- a/test/optfuzz.c
+++ b/test/optfuzz.c
@@ -83,7 +83,10 @@ static int optfuzz_exec(
   sqlite3 *dbRun,             /* The database on which the SQL executes */
   const char *zSql,           /* The SQL to be executed */
   sqlite3 *dbOut,             /* Store results in this database */
-  const char *zOutTab         /* Store results in this table of dbOut */
+  const char *zOutTab,        /* Store results in this table of dbOut */
+  int *pnStmt,                /* Write the number of statements here */
+  int *pnRow,                 /* Write the number of rows here */
+  int bTrace                  /* Print query results if true */
 ){
   int rc = SQLITE_OK;         /* Return code */
   const char *zLeftover;      /* Tail of unprocessed SQL */
@@ -94,19 +97,25 @@ static int optfuzz_exec(
   char zLine[4000];           /* Complete row value */
 
   run_sql(dbOut, "BEGIN");
-  run_sql(dbOut, "CREATE TABLE IF NOT EXISTS staging(x TEXT);");
-  run_sql(dbOut, "CREATE TABLE IF NOT EXISTS \"w\"(x TEXT);", zOutTab);
+  run_sql(dbOut, "CREATE TABLE IF NOT EXISTS staging(x TEXT)");
+  run_sql(dbOut, "CREATE TABLE IF NOT EXISTS \"%w\"(x TEXT)", zOutTab);
   pIns = prepare_sql(dbOut, "INSERT INTO staging(x) VALUES(?1)");
-  while( rc==SQLITE_OK && zSql[0] ){
+  *pnRow = *pnStmt = 0;
+  while( rc==SQLITE_OK && zSql && zSql[0] ){
+    zLeftover = 0;
     rc = sqlite3_prepare_v2(dbRun, zSql, -1, &pStmt, &zLeftover);
+    zSql = zLeftover;
     assert( rc==SQLITE_OK || pStmt==0 );
-    if( rc!=SQLITE_OK ) break;
+    if( rc!=SQLITE_OK ){
+      printf("Error with [%s]\n%s\n", zSql, sqlite3_errmsg(dbRun));
+      break;
+    }
     if( !pStmt ) continue;
+    (*pnStmt)++;
     nCol = sqlite3_column_count(pStmt);
     run_sql(dbOut, "DELETE FROM staging;");
-    while( 1 ){
+    while( sqlite3_step(pStmt)==SQLITE_ROW ){
       int i, j;
-      rc = sqlite3_step(pStmt);
       for(i=j=0; i<nCol && j<sizeof(zLine)-50; i++){
         int eType = sqlite3_column_type(pStmt, i);
         if( eType==SQLITE_NULL ){
@@ -128,24 +137,27 @@ static int optfuzz_exec(
         printf("Excessively long output line: %d bytes\n" ,j);
         exit(1);
       }
+      if( bTrace ){
+        printf("%s\n", zLine);
+      }
+      (*pnRow)++;
       sqlite3_bind_text(pIns, 1, zLine, j, SQLITE_TRANSIENT);
       rc = sqlite3_step(pIns);
       assert( rc==SQLITE_DONE );
-      sqlite3_reset(pIns);
+      rc = sqlite3_reset(pIns);
     }
     run_sql(dbOut,
       "INSERT INTO \"%w\"(x) VALUES('### %q ###')",
-      sqlite3_sql(pStmt)
+      zOutTab, sqlite3_sql(pStmt)
     );
     run_sql(dbOut, 
       "INSERT INTO \"%w\"(x) SELECT group_concat(x,char(10))"
-      "  FROM staging ORDER BY x",
+      "  FROM (SELECT x FROM staging ORDER BY x)",
       zOutTab
     );
     run_sql(dbOut, "COMMIT");
     sqlite3_finalize(pStmt);
     pStmt = 0;
-    zSql = zLeftover;
   }
   sqlite3_finalize(pStmt);
   sqlite3_finalize(pIns);
@@ -194,15 +206,23 @@ int main(int argc, char **argv){
   char **azIn = 0;           /* Names of input files */
   sqlite3 *dbOut = 0;        /* Database to hold results */
   sqlite3 *dbRun = 0;        /* Database used for tests */
+  int bTrace = 0;            /* Show query results */
+  int nRow, nStmt;           /* Number of rows and statements */
   int i, rc;
 
   for(i=1; i<argc; i++){
     const char *z = argv[i];
     if( z[0]=='-' && z[1]=='-' ) z++;
     if( strcmp(z,"-help")==0 ){
-      printf("Usage: %s FILENAME ...\n", argv[0]);
+      printf("Usage: %s [OPTIONS] FILENAME ...\n", argv[0]);
+      printf("Options:\n");
+      printf("  --help               Show his message\n");
+      printf("  --output-trace       Show each line of SQL output\n");
       return 0;
     }
+    else if( strcmp(z,"-output-trace")==0 ){
+      bTrace = 1;
+    }
     else if( z[0]=='-' ){
       printf("unknown option \"%s\".  Use --help for details\n", argv[i]);
       return 1;
@@ -226,25 +246,41 @@ int main(int argc, char **argv){
     char *zSql = readFile(azIn[i], 0);
     sqlite3_stmt *pCk;
     sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, dbRun, 0);
-    rc = optfuzz_exec(dbRun, zSql, dbOut, "opt");
-    if( rc==SQLITE_OK ){
+    if( bTrace ) printf("%s: Optimized\n", azIn[i]);
+    rc = optfuzz_exec(dbRun, zSql, dbOut, "opt", &nStmt, &nRow, bTrace);
+    if( rc ){
+      printf("%s: optimized run failed: %s\n",
+            azIn[i], sqlite3_errmsg(dbRun));
+    }else{
       sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, dbRun, 0xffff);
-      rc = optfuzz_exec(dbRun, zSql, dbOut, "noopt");
+      if( bTrace ) printf("%s: Non-optimized\n", azIn[i]);
+      rc = optfuzz_exec(dbRun, zSql, dbOut, "noopt", &nStmt, &nRow, bTrace);
       if( rc ){
-        printf("Non-optimized run failed.  Error: %s\n", sqlite3_errmsg(dbRun));
+        printf("%s: non-optimized run failed: %s\n",
+              azIn[i], sqlite3_errmsg(dbRun));
         exit(1);
       }
       pCk = prepare_sql(dbOut,
-           "SELECT (SELECT group_concat(x) FROM opt)=="
-           "       (SELECT group_concat(x) FROM noopt)");
+           "SELECT (SELECT group_concat(x,char(10)) FROM opt)=="
+           "       (SELECT group_concat(x,char(10)) FROM noopt)");
       rc = sqlite3_step(pCk);
       if( rc!=SQLITE_ROW ){
-        printf("Comparison failed. %s\n", sqlite3_errmsg(dbOut));
+        printf("%s: comparison failed\n", sqlite3_errmsg(dbOut));
         exit(1);
       }
       if( !sqlite3_column_int(pCk, 0) ){
-        printf("Opt/no-opt outputs differ for %s\n", azIn[i]);
+        printf("%s: opt/no-opt outputs differ\n", azIn[i]);
+        pCk = prepare_sql(dbOut,
+           "SELECT group_concat(x,char(10)) FROM opt "
+           "UNION ALL "
+           "SELECT group_concat(x,char(10)) FROM noopt");
+        sqlite3_step(pCk);
+        printf("opt:\n%s\n", sqlite3_column_text(pCk,0));
+        sqlite3_step(pCk);
+        printf("noopt:\n%s\n", sqlite3_column_text(pCk,0));
         exit(1);
+      }else{
+        printf("%s: %d stmts %d rows ok\n", azIn[i], nStmt, nRow);
       }
       sqlite3_finalize(pCk);
     }