When running ANALYZE, it is not necessary to check the right-most key column

for changes since that column will always change if none of the previous
columns have.

FossilOrigin-Name: 48f40861db4fbd10725a2b8b606d44fe16d5bd27

diff --git a/manifest b/manifest
index 4ac400af64b3e01c741c6c4bb0afc2d17259a22a..f57975f5d310b5e7dd4dbc5d59394501f5a0134c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sOP_ReopenIdx\sopcode\sthat\sworks\slike\sOP_OpenRead\sexcept\sthat\sit\sbecomes\na\sno-op\sif\sthe\scursor\sis\salready\sopen\son\sthe\ssame\sindex.\s\sUpdate\sthe\nOR-optimization\slogic\sto\smake\suse\sof\sOP_ReopenIdx\sin\sorder\sto\savoid\nunnecessary\scursor\sopen\srequests\ssent\sto\sthe\sB-Tree\slayer.
-D 2014-07-22T20:02:19.743
+C When\srunning\sANALYZE,\sit\sis\snot\snecessary\sto\scheck\sthe\sright-most\skey\scolumn\nfor\schanges\ssince\sthat\scolumn\swill\salways\schange\sif\snone\sof\sthe\sprevious\ncolumns\shave.
+D 2014-07-22T22:46:54.689
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -161,7 +161,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c b00900877f766f116f9e16116f1ccacdc21d82f1
-F src/analyze.c 56799121c72753f40d56f3c17c66c3961af6acb7
+F src/analyze.c ab1e44158c25490bfda557f3d690217b2bb509e2
 F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
@@ -1183,7 +1183,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 eed754fe93644f4df082eac0c0a7ffc5c78ccd10
-R 09dedf30e4922c66cabf472458c9ab58
+P 77f412caf0192d3e7fecb377d6d72123d8b64424
+R e38e472b4e4b7503ed49bdb3ca667f5c
 U drh
-Z 96627cd265c0a3b75631b3111ef23fd4
+Z e390ae6bf708e4580525fb01df14fd1e

diff --git a/manifest.uuid b/manifest.uuid
index 6783218a061e86b5eb634d1beaea588141ef9875..691fcc01d630ab3f9b477f2c33ac0afaf14ea628 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-77f412caf0192d3e7fecb377d6d72123d8b64424
\ No newline at end of file
+48f40861db4fbd10725a2b8b606d44fe16d5bd27
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 97305f0dc1462f406ebc41b7fbfbb5bc3da3ed04..c614350ae3cbf2ae2a9f2db6733986eb7de27c40 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1109,7 +1109,7 @@ static void analyzeOneTable(
     **   goto chng_addr_N
     */
     addrNextRow = sqlite3VdbeCurrentAddr(v);
-    for(i=0; i<nCol; i++){
+    for(i=0; i<nCol-1; i++){
       char *pColl = (char*)sqlite3LocateCollSeq(pParse, pIdx->azColl[i]);
       sqlite3VdbeAddOp2(v, OP_Integer, i, regChng);
       sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regTemp);
@@ -1118,7 +1118,7 @@ static void analyzeOneTable(
       sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
       VdbeCoverage(v);
     }
-    sqlite3VdbeAddOp2(v, OP_Integer, nCol, regChng);
+    sqlite3VdbeAddOp2(v, OP_Integer, nCol-1, regChng);
     aGotoChng[nCol] = sqlite3VdbeAddOp0(v, OP_Goto);
 
     /*
@@ -1129,7 +1129,7 @@ static void analyzeOneTable(
     **  ...
     */
     sqlite3VdbeJumpHere(v, addrGotoChng0);
-    for(i=0; i<nCol; i++){
+    for(i=0; i<nCol-1; i++){
       sqlite3VdbeJumpHere(v, aGotoChng[i]);
       sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regPrev+i);
     }