Add a test to show that the change on this branch is effective.

FossilOrigin-Name: fc619be057975b8be6d0958024c5d436edbdf084

diff --git a/manifest b/manifest
index 2b01d7bbcc679f3ebe9bab6e1dd5e51dca12d73f..7ac24e15266c6496126a821a9555073ce64d1529 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sleaking\sIndex.aiRowEst\smemory\sif\san\sOOM\scauses\sa\srollback\swhich\sdeletes\nthe\sindex\sbefore\sthe\saiRowEst\sdeletion\scode\sin\ssqlite3AnalysisLoad()\sroutine\nhas\sa\schance\sto\srun.\s\sSince\sthe\saiRowEst\snow\smight\sbe\sdeleted\sfrom\sfreeIndex()\nwhich\sdoes\snot\salways\shave\sa\sdb\spointer,\smake\ssure\sthe\saiRowEst\smemory\sis\nnot\sheld\sin\slookaside.
-D 2014-10-04T00:07:44.206
+C Add\sa\stest\sto\sshow\sthat\sthe\schange\son\sthis\sbranch\sis\seffective.
+D 2014-10-04T10:22:01.856
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -326,6 +326,7 @@ F test/analyze9.test 72795c8113604b5dcd47a1498a61d6d7fb5d041a
 F test/analyzeA.test 3335697f6700c7052295cfd0067fc5b2aacddf9a
 F test/analyzeB.test 8bf35ee0a548aea831bf56762cb8e7fdb1db083d
 F test/analyzeC.test 555a6cc388b9818b6eda6df816f01ce0a75d3a93
+F test/analyzeD.test 08f9d0bee4e118a66fff3a32d02dbe0ee0a2b594
 F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
 F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
 F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
@@ -1201,7 +1202,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f9c053b23ece877a7fdbe82204a10592f2d24a2d
-R f53222c51c5cd542b15f6fc746109d5c
-U drh
-Z 12ba20164b8e53ca4d39b40be557570a
+P efd87ba142723ba131fcc985db6eb45c5a3c637b
+R 4172251d18757975548e0803ec5466b1
+U dan
+Z d36e743f41577a93de7b943cc5387e20

diff --git a/manifest.uuid b/manifest.uuid
index e923963045e9479e14cc02de60c99767783319bc..cfe82771928b6849237c4d051ccb163e22f721bf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-efd87ba142723ba131fcc985db6eb45c5a3c637b
\ No newline at end of file
+fc619be057975b8be6d0958024c5d436edbdf084
\ No newline at end of file

diff --git a/test/analyzeD.test b/test/analyzeD.test
new file mode 100644 (file)
index 0000000..4d46be6
--- /dev/null
+++ b/test/analyzeD.test
@@ -0,0 +1,117 @@
+# 2005 July 22
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# 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
+set ::testprefix analyzeD
+
+ifcapable {!stat4} {
+  finish_test
+  return
+}
+
+
+# Set up a table with the following properties:
+#
+#    * Contains 1000 rows.
+#    * Column a contains even integers between 0 and 18, inclusive (so that
+#      a=? for any such integer matches 100 rows).
+#    * Column b contains integers between 0 and 9, inclusive.
+#    * Column c contains integers between 0 and 199, inclusive (so that
+#      for any such integer, c=? matches 5 rows).
+#    * Then add 7 rows with a new value for "a" - 3001. The stat4 table will
+#      not contain any samples with a=3001.
+#
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a, b, c);
+}
+do_test 1.1 {
+  for {set i 1} {$i < 1000} {incr i} {
+    set c [expr $i % 200]
+    execsql { INSERT INTO t1(a, b, c) VALUES( 2*($i/100), $i%10, $c ) }
+  }
+
+  execsql {
+    INSERT INTO t1 VALUES(3001, 3001, 3001);
+    INSERT INTO t1 VALUES(3001, 3001, 3002);
+    INSERT INTO t1 VALUES(3001, 3001, 3003);
+    INSERT INTO t1 VALUES(3001, 3001, 3004);
+    INSERT INTO t1 VALUES(3001, 3001, 3005);
+    INSERT INTO t1 VALUES(3001, 3001, 3006);
+    INSERT INTO t1 VALUES(3001, 3001, 3007);
+
+    CREATE INDEX t1_ab ON t1(a, b);
+    CREATE INDEX t1_c ON t1(c);
+
+    ANALYZE;
+  }
+} {}
+
+# With full ANALYZE data, SQLite sees that c=150 (5 rows) is better than
+# a=3001 (7 rows).
+#
+do_eqp_test 1.2 {
+  SELECT * FROM t1 WHERE a=3001 AND c=150;
+} {
+  0 0 0 {SEARCH TABLE t1 USING INDEX t1_c (c=?)}
+}
+
+do_test 1.3 {
+  execsql { DELETE FROM sqlite_stat1 }
+  db close
+  sqlite3 db test.db
+} {}
+
+# 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)
+# chooses it over the c=150 index (5 rows). Even with stat1 data, things
+# worked this way before commit [e6f7f97dbc].
+#
+do_eqp_test 1.4 {
+  SELECT * FROM t1 WHERE a=3001 AND c=150;
+} {
+  0 0 0 {SEARCH TABLE t1 USING INDEX t1_ab (a=?)}
+}
+
+do_test 1.5 {
+  execsql { 
+    UPDATE t1 SET a=13 WHERE a = 3001;
+    ANALYZE;
+  }
+} {}
+
+do_eqp_test 1.6 {
+  SELECT * FROM t1 WHERE a=13 AND c=150;
+} {
+  0 0 0 {SEARCH TABLE t1 USING INDEX t1_c (c=?)}
+}
+
+do_test 1.7 {
+  execsql { DELETE FROM sqlite_stat1 }
+  db close
+  sqlite3 db test.db
+} {}
+
+# Same test as 1.4, except this time the 7 rows that match the a=? condition 
+# do not feature larger values than all rows in the stat4 table. So SQLite
+# gets this right, even without stat1 data.
+do_eqp_test 1.8 {
+  SELECT * FROM t1 WHERE a=13 AND c=150;
+} {
+  0 0 0 {SEARCH TABLE t1 USING INDEX t1_c (c=?)}
+}
+
+finish_test
+