Remove relevant elements from the sqlite_stat2 table when doing a DROP

INDEX or DROP TABLE.

FossilOrigin-Name: 3c8f97ae527e380bf2583c7cf8ceac9509f29bfe

diff --git a/manifest b/manifest
index 6ca37535c3ade413cfd9007e20658fc17548515b..c7387e594622b01ea2af12f8a54b0c6cdd8f2efc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\swinopen-retry-logic\sbranch\sinto\strunk.\s\sThe\sbiggest\schange\shere\nis\sto\stest\sscripts,\swhich\sshould\snow\suse\ssuch\sas\scopy_file\sand\ndelete_file\sfrom\stester.tcl\srather\sthan\sthe\sraw\sfile\scommands\sof\sTCL.
-D 2011-08-03T22:06:39.312
+C Remove\srelevant\selements\sfrom\sthe\ssqlite_stat2\stable\swhen\sdoing\sa\sDROP\nINDEX\sor\sDROP\sTABLE.
+D 2011-08-07T01:31:52.877
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -127,7 +127,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 8c46f0ab69ad9549c75a3a91fed87abdaa743e2f
 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
 F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
-F src/build.c 5e614e586d9f8a81c16c80b545b9e1747f96c1bb
+F src/build.c 19a8957a442d922a0d6ed1a5dd67b63202fc3260
 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
@@ -260,7 +260,7 @@ F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
 F test/alter3.test 49c9d9fba2b8fcdce2dedeca97bbf1f369cc548d
 F test/alter4.test b2debc14d8cbe4c1d12ccd6a41eef88a8c1f15d5
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
-F test/analyze.test c8cb89e8736336f1f0646c8123e6028a14c7b55e
+F test/analyze.test 68b43c1f9cd6ffc3bbb30d27a23712b38c413eca
 F test/analyze2.test 8f2b1534d43f5547ce9a6b736c021d4192c75be3
 F test/analyze3.test d61f55d8b472fc6e713160b1e577f7a68e63f38b
 F test/analyze4.test 757b37875cf9bb528d46f74497bc789c88365045
@@ -955,7 +955,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P a2135ad13049c170b33315a949b1544e6a136183 4cb17881d9676fa3359394391b9ba53f08e5809a
-R 69e73a0d833d24111d142317de3be42c
+P b90c28be3840169651022ef36cd7cf416bc22305
+R 73598e00e938e090a06d21036269e1f1
 U drh
-Z e1999267404d37fe86d90d3e80b00531
+Z 41423adf91510090095a57365c2e79b2

diff --git a/manifest.uuid b/manifest.uuid
index c95e7309932e76e8b171968cad4d63451fa44058..5575d8da98c1a0524e416cac687d9e397a522678 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b90c28be3840169651022ef36cd7cf416bc22305
\ No newline at end of file
+3c8f97ae527e380bf2583c7cf8ceac9509f29bfe
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 455b35b56ef1ad8790a3e04e82b9b8cbdca95e0b..f609ed83798832e96c29cbc7197692c914c6d539 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -1980,6 +1980,29 @@ static void destroyTable(Parse *pParse, Table *pTab){
 #endif
 }
 
+/*
+** Remove entries from the sqlite_stat1 and sqlite_stat2 tables
+** after a DROP INDEX or DROP TABLE command.
+*/
+static void sqlite3ClearStatTables(
+  Parse *pParse,         /* The parsing context */
+  int iDb,               /* The database number */
+  const char *zType,     /* "idx" or "tbl" */
+  const char *zName      /* Name of index or table */
+){
+  static const char *azStatTab[] = { "sqlite_stat1", "sqlite_stat2" };
+  int i;
+  const char *zDbName = pParse->db->aDb[iDb].zName;
+  for(i=0; i<ArraySize(azStatTab); i++){
+    if( sqlite3FindTable(pParse->db, azStatTab[i], zDbName) ){
+      sqlite3NestedParse(pParse,
+        "DELETE FROM %Q.%s WHERE %s=%Q",
+        zDbName, azStatTab[i], zType, zName
+      );
+    }
+  }
+}
+
 /*
 ** This routine is called to do the work of a DROP TABLE statement.
 ** pName is the name of the table to be dropped.
@@ -2119,14 +2142,7 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){
     sqlite3NestedParse(pParse, 
         "DELETE FROM %Q.%s WHERE tbl_name=%Q and type!='trigger'",
         pDb->zName, SCHEMA_TABLE(iDb), pTab->zName);
-
-    /* Drop any statistics from the sqlite_stat1 table, if it exists */
-    if( sqlite3FindTable(db, "sqlite_stat1", db->aDb[iDb].zName) ){
-      sqlite3NestedParse(pParse,
-        "DELETE FROM %Q.sqlite_stat1 WHERE tbl=%Q", pDb->zName, pTab->zName
-      );
-    }
-
+    sqlite3ClearStatTables(pParse, iDb, "tbl", pTab->zName);
     if( !isView && !IsVirtual(pTab) ){
       destroyTable(pParse, pTab);
     }
@@ -2949,15 +2965,9 @@ void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists){
     sqlite3BeginWriteOperation(pParse, 1, iDb);
     sqlite3NestedParse(pParse,
        "DELETE FROM %Q.%s WHERE name=%Q AND type='index'",
-       db->aDb[iDb].zName, SCHEMA_TABLE(iDb),
-       pIndex->zName
+       db->aDb[iDb].zName, SCHEMA_TABLE(iDb), pIndex->zName
     );
-    if( sqlite3FindTable(db, "sqlite_stat1", db->aDb[iDb].zName) ){
-      sqlite3NestedParse(pParse,
-        "DELETE FROM %Q.sqlite_stat1 WHERE idx=%Q",
-        db->aDb[iDb].zName, pIndex->zName
-      );
-    }
+    sqlite3ClearStatTables(pParse, iDb, "idx", pIndex->zName);
     sqlite3ChangeCookie(pParse, iDb);
     destroyRootPage(pParse, pIndex->tnum, iDb);
     sqlite3VdbeAddOp4(v, OP_DropIndex, iDb, 0, 0, pIndex->zName, 0);

diff --git a/test/analyze.test b/test/analyze.test
index 766cd50d1fce0da503b19ec4ced0e1a854e4bb8a..6bb8cc363ce487b79607f7b51d8a3e9fce171956 100644 (file)
--- a/test/analyze.test
+++ b/test/analyze.test
@@ -287,6 +287,64 @@ do_test analyze-4.3 {
   }
 } {}
 
+# Verify that DROP TABLE and DROP INDEX remove entries from the 
+# sqlite_stat1 and sqlite_stat2 tables.
+#
+do_test analyze-5.0 {
+  execsql {
+    DELETE FROM t3;
+    DELETE FROM t4;
+    INSERT INTO t3 VALUES(1,2,3,4);
+    INSERT INTO t3 VALUES(5,6,7,8);
+    INSERT INTO t3 SELECT a+8, b+8, c+8, d+8 FROM t3;
+    INSERT INTO t3 SELECT a+16, b+16, c+16, d+16 FROM t3;
+    INSERT INTO t3 SELECT a+32, b+32, c+32, d+32 FROM t3;
+    INSERT INTO t3 SELECT a+64, b+64, c+64, d+64 FROM t3;
+    INSERT INTO t4 SELECT a, b, c FROM t3;
+    ANALYZE;
+    SELECT DISTINCT idx FROM sqlite_stat1 ORDER BY 1;
+    SELECT DISTINCT tbl FROM sqlite_stat1 ORDER BY 1;
+  }
+} {t3i1 t3i2 t3i3 t4i1 t4i2 t3 t4}
+ifcapable stat2 {
+  do_test analyze-5.1 {
+    execsql {
+      SELECT DISTINCT idx FROM sqlite_stat2 ORDER BY 1;
+      SELECT DISTINCT tbl FROM sqlite_stat2 ORDER BY 1;
+    }
+  } {t3i1 t3i2 t3i3 t4i1 t4i2 t3 t4}
+}
+do_test analyze-5.2 {
+  execsql {
+    DROP INDEX t3i2;
+    SELECT DISTINCT idx FROM sqlite_stat1 ORDER BY 1;
+    SELECT DISTINCT tbl FROM sqlite_stat1 ORDER BY 1;
+  }
+} {t3i1 t3i3 t4i1 t4i2 t3 t4}
+ifcapable stat2 {
+  do_test analyze-5.3 {
+    execsql {
+      SELECT DISTINCT idx FROM sqlite_stat2 ORDER BY 1;
+      SELECT DISTINCT tbl FROM sqlite_stat2 ORDER BY 1;
+    }
+  } {t3i1 t3i3 t4i1 t4i2 t3 t4}
+}
+do_test analyze-5.4 {
+  execsql {
+    DROP TABLE t3;
+    SELECT DISTINCT idx FROM sqlite_stat1 ORDER BY 1;
+    SELECT DISTINCT tbl FROM sqlite_stat1 ORDER BY 1;
+  }
+} {t4i1 t4i2 t4}
+ifcapable stat2 {
+  do_test analyze-5.5 {
+    execsql {
+      SELECT DISTINCT idx FROM sqlite_stat2 ORDER BY 1;
+      SELECT DISTINCT tbl FROM sqlite_stat2 ORDER BY 1;
+    }
+  } {t4i1 t4i2 t4}
+}
+
 # This test corrupts the database file so it must be the last test
 # in the series.
 #