Store the total number of rows as part of the ANALYZE statistics. (CVS 2563)

FossilOrigin-Name: 868279c78e056d27b2d1bea81127fe689b2ce478

diff --git a/manifest b/manifest
index 194373ad8b6f2f8c7bd0fdc824736d94c8fa2ac5..7a6f83a16edc6db463ed45b4996d5594141530ad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sresults\sof\sANALYZE\sare\snow\sloaded\sinto\sinternal\sdata\sstructures\swhere\nthey\scan\sbe\sused.\s\sBut\sthey\sare\snot\sactually\sused\syet.\s(CVS\s2562)
-D 2005-07-23T03:18:40
+C Store\sthe\stotal\snumber\sof\srows\sas\spart\sof\sthe\sANALYZE\sstatistics.\s(CVS\s2563)
+D 2005-07-23T14:52:12
 F Makefile.in 22ea9c0fe748f591712d8fe3c6d972c6c173a165
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -28,12 +28,12 @@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.def c413e514217736884254739a105c8c942fdf0c2f
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/alter.c 03041f2464e22532601254f87cb49997fa21dcdf
-F src/analyze.c 443c3449af103145873b6f64d5677df87e5edfdd
+F src/analyze.c a0d88c2278f0cabadfd3dfdb464f38cc63b9897c
 F src/attach.c 3615dbe960cbee4aa5ea300b8a213dad36527b0f
 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
 F src/btree.c ec55bd70052cdd0958f3a0e79ad58d93561acb20
 F src/btree.h 41a71ce027db9ddee72cb43df2316bbe3a1d92af
-F src/build.c 6aec7f0cee28f235aa08bcbeba33e4f68851b681
+F src/build.c 59a3ffe94df2c58f223a66644ea7ffd8eba28bc7
 F src/callback.c 0910b611e0c158f107ee3ff86f8a371654971e2b
 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
 F src/delete.c be1fc25c9e109cd8cbab42a43ee696263da7c04b
@@ -91,7 +91,7 @@ F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 9d6837a3d946b73df692b7cef2a7644d2e2f6bc6
 F test/alter2.test 60ba0a7057dc71ad630a1cc7c487104346849d50
 F test/alter3.test d4eecd8dbd008d0e66f1c201fa6dc2edca853c38
-F test/analyze.test a34554a015e9fdc478ae1660188feb0de4e43c2e
+F test/analyze.test ac50d2a24118ce5f0f9b50cc563a1a1498a948c4
 F test/attach.test f320e98bcca68d100cab7666a0c9a93ac5f236bd
 F test/attach2.test 3396c012a39ddf7ba6b528d80bd79554168aa115
 F test/attach3.test 63013383adc4380af69779f34f4af19bd49f7cbe
@@ -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 bd7583a5d63412785a9c5de54d25b509da241605
-R fa0725a452365a6cc3e3b5a32a1f47a7
+P 1996bacfb97180965304e2a6d6784b6ecbbf8575
+R ce8b845e83c2fe78f71fc8660f861c81
 U drh
-Z 614161da507000f7e7ba00462a0c3cc8
+Z fe452359cfb2b9a0187816cb97118aaf

diff --git a/manifest.uuid b/manifest.uuid
index b1edcfa6452980339719cde01250b4e0fc6a028b..d3984aeb8ffbabccddbb8935261d449f0a7a5ace 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1996bacfb97180965304e2a6d6784b6ecbbf8575
\ No newline at end of file
+868279c78e056d27b2d1bea81127fe689b2ce478
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index dfe1150e435dea72a0c095169bdf077ecc5b07d0..9a6d99e5f3caee601ab847b2b710d9dc3a71a68a 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code associated with the ANALYZE command.
 **
-** @(#) $Id: analyze.c,v 1.4 2005/07/23 03:18:40 drh Exp $
+** @(#) $Id: analyze.c,v 1.5 2005/07/23 14:52:12 drh Exp $
 */
 #ifndef SQLITE_OMIT_ANALYZE
 #include "sqliteInt.h"
@@ -163,10 +163,12 @@ static void analyzeOneTable(
     ** The result is a single row of the sqlite_stmt1 table.  The first
     ** two columns are the names of the table and index.  The third column
     ** is a string composed of a list of integer statistics about the
-    ** index.  There is one integer in the list for each column of the table.
-    ** This integer is a guess of how many rows of the table the index will
-    ** select.  If D is the count of distinct values and K is the total
-    ** number of rows, then the integer is computed as:
+    ** index.  The first integer in the list is the total number of entires
+    ** in the index.  There is one additional integer in the list for each
+    ** column of the table.  This additional integer is a guess of how many
+    ** rows of the table the index will select.  If D is the count of distinct
+    ** values and K is the total number of rows, then the integer is computed
+    ** as:
     **
     **        I = (K+D-1)/D
     **
@@ -179,6 +181,8 @@ static void analyzeOneTable(
     sqlite3VdbeAddOp(v, OP_NewRowid, iStatCur, 0);
     sqlite3VdbeOp3(v, OP_String8, 0, 0, pTab->zName, 0);
     sqlite3VdbeOp3(v, OP_String8, 0, 0, pIdx->zName, 0);
+    sqlite3VdbeAddOp(v, OP_MemLoad, iMem, 0);
+    sqlite3VdbeOp3(v, OP_String8, 0, 0, " ", 0);
     for(i=0; i<nCol; i++){
       sqlite3VdbeAddOp(v, OP_MemLoad, iMem, 0);
       sqlite3VdbeAddOp(v, OP_MemLoad, iMem+i+1, 0);
@@ -187,15 +191,9 @@ static void analyzeOneTable(
       sqlite3VdbeAddOp(v, OP_MemLoad, iMem+i+1, 0);
       sqlite3VdbeAddOp(v, OP_Divide, 0, 0);
       if( i==nCol-1 ){
-        if( i>0 ){
-          sqlite3VdbeAddOp(v, OP_Concat, nCol*2-3, 0);
-        }
+        sqlite3VdbeAddOp(v, OP_Concat, nCol*2-1, 0);
       }else{
-        if( i==0 ){
-          sqlite3VdbeOp3(v, OP_String8, 0, 0, " ", 0);
-        }else{
-          sqlite3VdbeAddOp(v, OP_Dup, 1, 0);
-        }
+        sqlite3VdbeAddOp(v, OP_Dup, 1, 0);
       }
     }
     sqlite3VdbeOp3(v, OP_MakeRecord, 3, 0, "ttt", 0);
@@ -343,7 +341,7 @@ static int analysisLoader(void *pData, int argc, char **argv, char **azNotUsed){
     return 0;
   }
   z = argv[1];
-  for(i=0; *z && i<pIndex->nColumn; i++){
+  for(i=0; *z && i<=pIndex->nColumn; i++){
     v = 0;
     while( (c=z[0])>='0' && c<='9' ){
       v = v*10 + c - '0';
@@ -367,8 +365,8 @@ void sqlite3AnalysisLoad(sqlite3 *db, int iDb){
   for(i=sqliteHashFirst(&db->aDb[iDb].idxHash); i; i=sqliteHashNext(i)){
     Index *pIdx = sqliteHashData(i);
     int j;
-    for(j=pIdx->nColumn-1; j>=0; j--){
-      pIdx->aiRowEst[j] = 100;
+    for(j=0; j<=pIdx->nColumn; j++){
+      pIdx->aiRowEst[j] = j<100 ? 1000*(100-j) : 100;
     }
   }
 

diff --git a/src/build.c b/src/build.c
index 02a5cdd5127c8d542d0b2f60183b39235c0a495e..a44897d782d45e8fe2e436e62c508fccfb11b987 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.334 2005/07/23 03:18:40 drh Exp $
+** $Id: build.c,v 1.335 2005/07/23 14:52:12 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2179,12 +2179,12 @@ void sqlite3CreateIndex(
   /* 
   ** Allocate the index structure. 
   */
-  pIndex = sqliteMalloc( sizeof(Index) + strlen(zName) + 1 +
+  pIndex = sqliteMalloc( sizeof(Index) + strlen(zName) + 1 + sizeof(int) +
                         (sizeof(int)*2 + sizeof(CollSeq*))*pList->nExpr );
   if( sqlite3_malloc_failed ) goto exit_create_index;
   pIndex->aiColumn = (int*)&pIndex->keyInfo.aColl[pList->nExpr];
   pIndex->aiRowEst = &pIndex->aiColumn[pList->nExpr];
-  pIndex->zName = (char*)&pIndex->aiRowEst[pList->nExpr];
+  pIndex->zName = (char*)&pIndex->aiRowEst[pList->nExpr+1];
   strcpy(pIndex->zName, zName);
   pIndex->pTable = pTab;
   pIndex->nColumn = pList->nExpr;

diff --git a/test/analyze.test b/test/analyze.test
index a9f0118346669da7aff0960d172c85d0cc675d90..d3ac194492c4d723eb2f445422a0025dd817b34e 100644 (file)
--- a/test/analyze.test
+++ b/test/analyze.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.
 # This file implements tests for the ANALYZE command.
 #
-# $Id: analyze.test,v 1.1 2005/07/23 02:17:03 drh Exp $
+# $Id: analyze.test,v 1.2 2005/07/23 14:52:12 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -127,7 +127,7 @@ do_test analyze-3.1 {
     ANALYZE main.t1;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 2 t1i2 1 t1i3 {2 1}}
+} {t1i1 {2 2} t1i2 {2 1} t1i3 {2 2 1}}
 do_test analyze-3.2 {
   execsql {
     INSERT INTO t1 VALUES(1,4);
@@ -135,14 +135,14 @@ do_test analyze-3.2 {
     ANALYZE t1;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 4 t1i2 1 t1i3 {4 1}}
+} {t1i1 {4 4} t1i2 {4 1} t1i3 {4 4 1}}
 do_test analyze-3.3 {
   execsql {
     INSERT INTO t1 VALUES(2,5);
     ANALYZE main;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 3 t1i2 2 t1i3 {3 1}}
+} {t1i1 {5 3} t1i2 {5 2} t1i3 {5 3 1}}
 do_test analyze-3.4 {
   execsql {
     CREATE TABLE t2 AS SELECT * FROM t1;
@@ -152,27 +152,27 @@ do_test analyze-3.4 {
     ANALYZE;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 3 t1i2 2 t1i3 {3 1} t2i1 3 t2i2 2 t2i3 {3 1}}
+} {t1i1 {5 3} t1i2 {5 2} t1i3 {5 3 1} t2i1 {5 3} t2i2 {5 2} t2i3 {5 3 1}}
 do_test analyze-3.5 {
   execsql {
     DROP INDEX t2i3;
     ANALYZE t1;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 3 t1i2 2 t1i3 {3 1} t2i1 3 t2i2 2 t2i3 {3 1}}
+} {t1i1 {5 3} t1i2 {5 2} t1i3 {5 3 1} t2i1 {5 3} t2i2 {5 2} t2i3 {5 3 1}}
 do_test analyze-3.6 {
   execsql {
     ANALYZE t2;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 3 t1i2 2 t1i3 {3 1} t2i1 3 t2i2 2}
+} {t1i1 {5 3} t1i2 {5 2} t1i3 {5 3 1} t2i1 {5 3} t2i2 {5 2}}
 do_test analyze-3.7 {
   execsql {
     DROP INDEX t2i2;
     ANALYZE t2;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t1i1 3 t1i2 2 t1i3 {3 1}}
+} {t1i1 {5 3} t1i2 {5 2} t1i3 {5 3 1}}
 do_test analyze-3.8 {
   execsql {
     CREATE TABLE t3 AS SELECT a, b, rowid AS c, 'hi' AS d FROM t1;
@@ -184,7 +184,7 @@ do_test analyze-3.8 {
     ANALYZE;
     SELECT idx, stat FROM sqlite_stat1 ORDER BY idx;
   }
-} {t3i1 3 t3i2 {3 1 1 1} t3i3 {5 2 1 1}}
+} {t3i1 {5 3} t3i2 {5 3 1 1 1} t3i3 {5 5 2 1 1}}
 
 
 finish_test