Improved debugging output with wheretrace. Fix some typos in test script

comments.

FossilOrigin-Name: 13a37fd487ce7d4f98a12f7a67a9c05dadc66557

diff --git a/manifest b/manifest
index 3cdd9396b7b78d5a090218e3b70ef86a3e281adb..e8fac4d6a2b374eb2aef0f78e075a29b3902af36 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Better\sestimatedCost\sin\sthe\sxBestIndex\smethod\sof\sthe\sgenerate_series\svtab.
-D 2016-03-01T02:11:50.810
+C Improved\sdebugging\soutput\swith\swheretrace.\s\sFix\ssome\stypos\sin\stest\sscript\ncomments.
+D 2016-03-01T22:41:27.874
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4f319afb7c049d40aff7af6e8c4e7cc2ba18e079
@@ -428,7 +428,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
-F src/where.c 32051597188dc632bafb32d50a9c3a04fb97ce39
+F src/where.c 6282e53fcc612a8918262f1432d6fd7fbc24af40
 F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
 F src/wherecode.c 39c1ef4598bedf1d66249334c74efd23ddd182ac
 F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
@@ -451,11 +451,11 @@ F test/analyze5.test 765c4e284aa69ca172772aa940946f55629bc8c4
 F test/analyze6.test f1c552ce39cca4ec922a7e4e0e5d0203d6b3281f
 F test/analyze7.test bb1409afc9e8629e414387ef048b8e0e3e0bdc4f
 F test/analyze8.test c05a461d0a6b05991106467d0c47480f2e709c82
-F test/analyze9.test 88c1f2aa20b614236f03e1cc38c3619e7e8a38b4
+F test/analyze9.test b817b8e798315fc65b820a5463f73ad5f48ed8dd
 F test/analyzeA.test 3335697f6700c7052295cfd0067fc5b2aacddf9a
 F test/analyzeB.test a4c1c3048f6d9e090eb76e83eecb18bcf6d31a70
 F test/analyzeC.test 555a6cc388b9818b6eda6df816f01ce0a75d3a93
-F test/analyzeD.test f3d77cd0fefe2849d784897d52df13beee19271d
+F test/analyzeD.test 42af58de25a6436502e43006e9e59e2d71bcb0cf
 F test/analyzeE.test 8684e8ac5722fb97c251887ad97e5d496a98af1d
 F test/analyzeF.test 5d1fe1024ba2dfea3c18bede8c1ccef8aba1ab34
 F test/analyzer1.test 498e2ff4b62740c2751c3a2f8b744fe26689fae9
@@ -1451,7 +1451,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 c9a30e117f2c6c9ef0cc0c6ca5227d2961715b8f
-R 78072d3e9e5d5130b27dfb7458df9d26
+P f2c16094a536e7ef62444d0fe38cbee2a4999426
+R 8bf9dc83caf7a5f48b09e10ce3dd712c
 U drh
-Z 00eb8a065721ce5867f81f8e93fd77c0
+Z cbae5a3ad8eb0cbd1b6534802cfd9e9b

diff --git a/manifest.uuid b/manifest.uuid
index ead2aaed5ef1d73655d554a43cebc4e64b8183bd..1fa5c8f4d5911a70c85d8b13065a6667f6dbd12a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2c16094a536e7ef62444d0fe38cbee2a4999426
\ No newline at end of file
+13a37fd487ce7d4f98a12f7a67a9c05dadc66557
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 71d3cb01ef583aea591d5872a0a4e349113f4b77..e2a482cf905b71af832bd7c25392471461884946 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1561,7 +1561,8 @@ static int whereEqualScanEst(
   pBuilder->nRecValid = nEq;
 
   whereKeyStats(pParse, p, pRec, 0, a);
-  WHERETRACE(0x10,("equality scan regions: %d\n", (int)a[1]));
+  WHERETRACE(0x10,("equality scan regions %s(%d): %d\n",
+                   p->zName, nEq-1, (int)a[1]));
   *pnRow = a[1];
   
   return rc;

diff --git a/test/analyze9.test b/test/analyze9.test
index e24f3dd49d28c55f9a5b60ee935137a7cb4d1554..918577bd19c1b78af1e3c89224acf402367457cd 100644 (file)
--- a/test/analyze9.test
+++ b/test/analyze9.test
@@ -1180,7 +1180,7 @@ do_execsql_test 26.1.3 {
 #
 # There should be no other samples that start with (x=10000). So it knows 
 # that (x=10000 AND y<50) must match somewhere between 0 and 99 rows, but
-# know more than that. Guessing less than 20 is therefore unreasonable.
+# no more than that. Guessing less than 20 is therefore unreasonable.
 #
 # At one point though, due to a problem in whereKeyStats(), the planner was
 # estimating that (x=10000 AND y<50) would match only 2 rows.

diff --git a/test/analyzeD.test b/test/analyzeD.test
index 7ef1094f824ae7280070167aaa8e6a65c60c5d13..4588aaeebc48e53fad1a4830c4b4a74d5b00bc5c 100644 (file)
--- a/test/analyzeD.test
+++ b/test/analyzeD.test
@@ -1,4 +1,4 @@
-# 2005 July 22
+# 2014-10-04
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
@@ -11,7 +11,6 @@
 # This file implements regression tests for SQLite library.
 # This file implements tests for the ANALYZE command.
 #
-# $Id: analyze.test,v 1.9 2008/08/11 18:44:58 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -75,7 +74,7 @@ do_test 1.3 {
 } {}
 
 # Without stat1, because 3001 is larger than all samples in the stat4
-# table, SQLite things that a=3001 matches just 1 row. So it (incorrectly)
+# table, SQLite thinks that a=3001 matches just 1 row. So it (incorrectly)
 # chooses it over the c=150 index (5 rows). Even with stat1 data, things
 # worked this way before commit [e6f7f97dbc].
 #