Correctly display P4_ADVANCE values on opcode traces. Mark an always-taken

branch in OP_Column as such.

FossilOrigin-Name: 087dc96086fe4e45da93ab6a0d5dda34c932ce97

diff --git a/manifest b/manifest
index 21e42fba5a823ab231e1f6e035aa7e11bf1202da..804c5773873ae219d0ef93a5d9f76d52646f8213 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimental\schanges\sto\simprove\sthe\sperformance\sof\sOP_Next.
-D 2011-08-27T18:48:57.573
+C Correctly\sdisplay\sP4_ADVANCE\svalues\son\sopcode\straces.\s\sMark\san\salways-taken\nbranch\sin\sOP_Column\sas\ssuch.
+D 2011-08-28T00:19:26.614
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -238,11 +238,11 @@ F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
 F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
 F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
 F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
-F src/vdbe.c d63854aef07d036987f768dae7ca5c852881ce28
+F src/vdbe.c 47713d4005ad7256b0b5c9744dded58d14f652ad
 F src/vdbe.h c1eeedacab6bcf1e7c2cf8203ba9763a616f9a86
 F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096
 F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
-F src/vdbeaux.c dd5d10ae523bbc6ed55ac73daa28a9ea1f2fa42a
+F src/vdbeaux.c de1e4cab060a45df9ebee68dd63543d14559f0e7
 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
 F src/vdbesort.c 8a61a6d731cbe612217edf9eece6197f37c9489e
@@ -961,10 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 5454d0fe227b7c1f0e7715b6c08f97019628fc4c
-R 06eac31c16dc3f7f5b4649f86c063bf4
-T *branch * experimental
-T *sym-experimental *
-T -sym-trunk *
-U dan
-Z 50e65d7380a3dc463f2c091e8241574b
+P 1a249845251199c00817893add300a1a654b4df9
+R d6f033bc6e8a438086fa5960ee9d7157
+U drh
+Z 47cc80ebc2025318e796ba82fe696b90

diff --git a/manifest.uuid b/manifest.uuid
index ae93ed9c60973e3b6c981465a8688730ba911a30..0860b8faf26ecb0e5ee4af28d2e68ccbfd5e7681 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a249845251199c00817893add300a1a654b4df9
\ No newline at end of file
+087dc96086fe4e45da93ab6a0d5dda34c932ce97
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 133dc54b925893710a6b323e46b907241e8e6944..bfc3cbd531506a5fdba16e817bd1e238e2230400 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2173,7 +2173,7 @@ case OP_Column: {
       rc = sqlite3BtreeDataSize(pCrsr, &payloadSize);
       assert( rc==SQLITE_OK );   /* DataSize() cannot fail */
     }
-  }else if( pC->pseudoTableReg>0 ){
+  }else if( ALWAYS(pC->pseudoTableReg>0) ){
     pReg = &aMem[pC->pseudoTableReg];
     assert( pReg->flags & MEM_Blob );
     assert( memIsValid(pReg) );

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index a1e6a276f38ad7b035768a1e22100f5bee8332a8..053d89f3b5f270a3cef75281eb23286f0b67ae32 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -945,6 +945,10 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
       sqlite3_snprintf(nTemp, zTemp, "program");
       break;
     }
+    case P4_ADVANCE: {
+      zTemp[0] = 0;
+      break;
+    }
     default: {
       zP4 = pOp->p4.z;
       if( zP4==0 ){