Optimization marks in vdbe.c. No logic changes.

FossilOrigin-Name: cf2737415aff7de7e133da174b645324c99d5758

diff --git a/manifest b/manifest
index d978122ed4bc2918778b618929cfa7945b770461..32ce760d513032c0c16bd2eca24ae05549e59b9d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovement\sin\sthe\sOP_Column\sopcode.
-D 2016-05-19T16:58:42.935
+C Optimization\smarks\sin\svdbe.c.\s\sNo\slogic\schanges.
+D 2016-05-19T17:51:19.307
 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
@@ -444,7 +444,7 @@ F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
-F src/vdbe.c ee42e2b8f77c4bf6cf9b29be7b2235b0fc6aeca6
+F src/vdbe.c d71b935d2b21bef874680c34329adedc3b021101
 F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
 F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
@@ -1489,7 +1489,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1f577e1f08159aeaaf19a7020d9004dd6103d57b
-R e89ba2854e43a6ca2d4e88d579ae2259
+P 4737cadc414c5f6d256fcceacb19d80d66a8c8e7
+R 9f8362ea36557124657ddc486fb3880d
 U drh
-Z 6f1f0837aba6646cc9cdae7372a9992d
+Z f893c9ab14ca925d78367a321ac969dc

diff --git a/manifest.uuid b/manifest.uuid
index b52d532ceba38767dabb2bac3f06b9ecfd715645..72112d1271972d7e35b13a6656a356b7958e43ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4737cadc414c5f6d256fcceacb19d80d66a8c8e7
\ No newline at end of file
+cf2737415aff7de7e133da174b645324c99d5758
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index eecefade249756d7040ef57b2749476cd34e4b12..6d96f85548e3a35e5920e43de2158fcdd2cac66a 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2417,7 +2417,7 @@ case OP_Column: {
   assert( pC->eCurType!=CURTYPE_SORTER );
   pCrsr = pC->uc.pCursor;
 
-  if( pC->cacheStatus!=p->cacheCtr ){
+  if( pC->cacheStatus!=p->cacheCtr ){                /*OPTIMIZATION-IF-FALSE*/
     if( pC->nullRow ){
       if( pC->eCurType==CURTYPE_PSEUDO ){
         assert( pC->uc.pseudoTableReg>0 );
@@ -2464,7 +2464,7 @@ case OP_Column: {
     aOffset[0] = offset;
 
 
-    if( avail<offset ){
+    if( avail<offset ){      /*OPTIMIZATION-IF-FALSE*/
       /* pC->aRow does not have to hold the entire row, but it does at least
       ** need to cover the header of the record.  If pC->aRow does not contain
       ** the complete header, then set it to zero, forcing the header to be