The new optimizer now passes all regression tests. (CVS 2566)

FossilOrigin-Name: a21212843359fb9fdbd60799ae50ad3566f4399a

diff --git a/manifest b/manifest
index 7103ccf19b1915bb4f9a484ffcc93f402fba4438..89e1dd69b3abca96c5784ee74a64a14130d94029 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\swork\son\sthe\snew\soptimizer.\s\sFewer\stests\sfail\snow.\s(CVS\s2565)
-D 2005-07-27T20:41:44
+C The\snew\soptimizer\snow\spasses\sall\sregression\stests.\s(CVS\s2566)
+D 2005-07-28T16:51:51
 F Makefile.in 22ea9c0fe748f591712d8fe3c6d972c6c173a165
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -33,7 +33,7 @@ F src/attach.c 3615dbe960cbee4aa5ea300b8a213dad36527b0f
 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
 F src/btree.c ec55bd70052cdd0958f3a0e79ad58d93561acb20
 F src/btree.h 41a71ce027db9ddee72cb43df2316bbe3a1d92af
-F src/build.c 4b6f9e61159733f86cd1589f4c10834ba856d280
+F src/build.c e50f2f4c7b40e097a045a2b4a849ac0eff1a1c49
 F src/callback.c 0910b611e0c158f107ee3ff86f8a371654971e2b
 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
 F src/delete.c be1fc25c9e109cd8cbab42a43ee696263da7c04b
@@ -85,7 +85,7 @@ F src/vdbeapi.c 7f392f0792d1258c958083d7de9eae7c3530c9a6
 F src/vdbeaux.c 3732a86566a6be4da4c606e9334baf3fd98667af
 F src/vdbefifo.c b8805850afe13b43f1de78d58088cb5d66f88e1e
 F src/vdbemem.c da8e8d6f29dd1323f782f000d7cd120027c9ff03
-F src/where.c 7757b1731d74364bc56d7da7cb9cfe8c9db1c019
+F src/where.c efed9d45672ea5fc550072272d86e28a2649c256
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 9d6837a3d946b73df692b7cef2a7644d2e2f6bc6
@@ -224,7 +224,7 @@ F test/vacuum.test 5d4857ae2afc9c20d0edb8acc58bdc8d630126a9
 F test/vacuum2.test 5d77e98c458bcdbeecc6327de5107179ba1aa095
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 3c79232a2ee45918c62a0cf90411525899404a76
-F test/where.test 996cd12c8545aaf28c7eaf06190e9f1c2a2dc74c
+F test/where.test b6ab0f64adc5fbb4259f284b19da6cd9aeadc711
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/lemon.c c88936c67f6411608db8fa4254d254f509fa40f6
 F tool/lempar.c f0c30abcae762a7d1eb37cd88b2232ab8dd625fb
@@ -287,7 +287,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 86ce56ccea8297b1fba2b9ee53b5f1a3f228662f
-R 4972a6e268e2ac2613a7a3e2ab4d4526
+P ee3a08e353f563c36e904479393fcb56f96ee975
+R 0f7ba5ada7ced4acb01d1d193cdec9c1
 U drh
-Z 231d7effe54ec2e53a7f03147246d17a
+Z 28da42b8f7133daabbc46de020ba7352

diff --git a/manifest.uuid b/manifest.uuid
index ac57d3de046383ea6689ab56bc738c5c544f3e2a..9e111afca2b325fc6d97df9d9bbd92c3ff050ea8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee3a08e353f563c36e904479393fcb56f96ee975
\ No newline at end of file
+a21212843359fb9fdbd60799ae50ad3566f4399a
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 10d21655ca85a80a601f19026bee689d95f67483..8c89971274f83bd538700ebfe9d72dc05bb8fafd 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.337 2005/07/27 20:41:44 drh Exp $
+** $Id: build.c,v 1.338 2005/07/28 16:51:51 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2410,24 +2410,8 @@ void sqlite3DefaultRowEst(Index *pIdx){
   int i;
   assert( a!=0 );
   a[0] = 1000000;
-  switch( pIdx->nColumn ){
-    case 1: {
-      a[1] = 20;
-      break;
-    }
-    case 2: {
-      a[1] = 350;
-      a[2] = 20;
-      break;
-    }
-    default: {
-      a[1] = 1250;
-      a[2] = 350;
-      a[3] = 20;
-      for(i=pIdx->nColumn; i>=4; i--){
-        a[i] = 10;
-      }
-    }
+  for(i=pIdx->nColumn; i>=1; i--){
+    a[i] = 10;
   }
   if( pIdx->onError!=OE_None ){
     a[pIdx->nColumn] = 1;

diff --git a/src/where.c b/src/where.c
index 28380844fd2dd95f40adeb712cad962119923045..58bf1d475d03d465a4a95a967ba9fa3af5be853f 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.153 2005/07/27 20:41:44 drh Exp $
+** $Id: where.c,v 1.154 2005/07/28 16:51:51 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -713,7 +713,7 @@ static double bestIndex(
       ** that value so make a wild guess. */
       lowestCost = 200.0;
     }
-    TRACE(("... rowid IN cost: %g\n", lowestCost));
+    TRACE(("... rowid IN cost: %.9g\n", lowestCost));
   }
 
   /* Estimate the cost of a table scan.  If we do not know how many
@@ -721,7 +721,7 @@ static double bestIndex(
   */
   pProbe = pSrc->pTab->pIndex;
   cost = pProbe ? pProbe->aiRowEst[0] : 1000000.0;
-  TRACE(("... table scan base cost: %g\n", cost));
+  TRACE(("... table scan base cost: %.9g\n", cost));
   flags = WHERE_ROWID_RANGE;
 
   /* Check for constraints on a range of rowids in a table scan.
@@ -736,7 +736,7 @@ static double bestIndex(
       flags |= WHERE_BTM_LIMIT;
       cost *= 0.333;  /* Guess that rowid>EXPR eliminates two-thirds of rows */
     }
-    TRACE(("... rowid range reduces cost to %g\n", cost));
+    TRACE(("... rowid range reduces cost to %.9g\n", cost));
   }else{
     flags = 0;
   }
@@ -751,7 +751,7 @@ static double bestIndex(
       }
     }else{
       cost += cost*estLog(cost);
-      TRACE(("... sorting increases cost to %g\n", cost));
+      TRACE(("... sorting increases cost to %.9g\n", cost));
     }
   }
   if( cost<lowestCost ){
@@ -787,7 +787,7 @@ static double bestIndex(
     }
     cost = pProbe->aiRowEst[i] * inMultiplier * estLog(inMultiplier);
     nEq = i;
-    TRACE(("...... nEq=%d inMult=%g cost=%g\n", nEq, inMultiplier, cost));
+    TRACE(("...... nEq=%d inMult=%.9g cost=%.9g\n", nEq, inMultiplier, cost));
 
     /* Look for range constraints
     */
@@ -804,7 +804,7 @@ static double bestIndex(
           flags |= WHERE_BTM_LIMIT;
           cost *= 0.333;
         }
-        TRACE(("...... range reduces cost to %g\n", cost));
+        TRACE(("...... range reduces cost to %.9g\n", cost));
       }
     }
 
@@ -822,7 +822,7 @@ static double bestIndex(
         }
       }else{
         cost += cost*estLog(cost);
-        TRACE(("...... orderby reduces cost to %g\n", cost));
+        TRACE(("...... orderby increases cost to %.9g\n", cost));
       }
     }
 
@@ -842,7 +842,7 @@ static double bestIndex(
       if( m==0 ){
         flags |= WHERE_IDX_ONLY;
         cost *= 0.5;
-        TRACE(("...... idx-only reduces cost to %g\n", cost));
+        TRACE(("...... idx-only reduces cost to %.9g\n", cost));
       }
     }
 
@@ -862,7 +862,7 @@ static double bestIndex(
   /* Report the best result
   */
   *ppIndex = bestIdx;
-  TRACE(("best index is %s, cost=%g, flags=%x, nEq=%d\n",
+  TRACE(("best index is %s, cost=%.9g, flags=%x, nEq=%d\n",
         bestIdx ? bestIdx->zName : "(none)", lowestCost, bestFlags, bestNEq));
   *pFlags = bestFlags;
   *pnEq = bestNEq;

diff --git a/test/where.test b/test/where.test
index 459b2c4c684006b66da7159b6b124d4e74693abc..f5fb8126e1b43b5ccb42ef7116e62d342bd4c434 100644 (file)
--- a/test/where.test
+++ b/test/where.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the use of indices in WHERE clases.
 #
-# $Id: where.test,v 1.31 2005/07/21 03:48:20 drh Exp $
+# $Id: where.test,v 1.32 2005/07/28 16:51:51 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -398,7 +398,7 @@ ifcapable subquery {
     count {
       SELECT * FROM t1 WHERE x=6 AND y IN (6400,8100) ORDER BY 1;
     }
-  } {79 6 6400 89 6 8100 74}
+  } {79 6 6400 89 6 8100 7}
   do_test where-5.13 {
     count {
       SELECT * FROM t1 WHERE x IN (1,7) AND y NOT IN (6400,8100) ORDER BY 1;
@@ -408,7 +408,12 @@ ifcapable subquery {
     count {
       SELECT * FROM t1 WHERE x IN (1,7) AND y IN (9,10) ORDER BY 1;
     }
-  } {2 1 9 7}
+  } {2 1 9 9}
+  do_test where-5.15 {
+    count {
+      SELECT * FROM t1 WHERE x IN (1,7) AND y IN (9,16) ORDER BY 1;
+    }
+  } {2 1 9 3 1 16 11}
 }
 
 # This procedure executes the SQL.  Then it checks to see if the OP_Sort
@@ -467,7 +472,7 @@ do_test where-6.7 {
   cksort {
     SELECT * FROM t3 WHERE b>0 ORDER BY a LIMIT 3
   }
-} {1 100 4 2 99 9 3 98 16 sort}
+} {1 100 4 2 99 9 3 98 16 nosort}
 ifcapable subquery {
   do_test where-6.8 {
     cksort {