Small size reduction and performance improvement in the OP_Column opcode.

FossilOrigin-Name: 0d7730611be974162d9a064a041957d04d55b6d3

diff --git a/manifest b/manifest
index ed2ee43fc4a49c4b4f4fb6b7cb50f2db1ebe89c1..1b36c9380b32423df482ddb085550aff6643e699 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"scrub"\sutility\sprogram\sthat\ssimultaneously\sbacks-up\sa\slive\sdatabase\nand\serases\sall\sdeleted\scontent.
-D 2016-05-18T21:03:27.980
+C Small\ssize\sreduction\sand\sperformance\simprovement\sin\sthe\sOP_Column\sopcode.
+D 2016-05-19T11:12:43.914
 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 4bad04212736526845fda9ca674afafb10078b2b
+F src/vdbe.c d9701a72283b84a3a48b285846a9789ae541a1fd
 F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
 F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
@@ -1489,8 +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 915416d15f43c4e1d3afa8121bb6fa09f9f67e30 ab1c5ce50f139070d7a322f43132a93c8af2ed68
-R d7177fcfb6d0afbc5b91ed78ec9dbdb9
-T +closed ab1c5ce50f139070d7a322f43132a93c8af2ed68
+P c981ab2a4771f8c5e95e2e85e37a02a4bd0e36ee
+R b1335b5684d992944fc28b0ddd0864fa
 U drh
-Z c9dd9bd914e72b28b0a6b209c46c7aec
+Z 965b22aefdb31f818dd701e1987d5b24

diff --git a/manifest.uuid b/manifest.uuid
index a5036d52e948cddaf126141c3fe4a66abdfd04c8..c2be5cd870998ec1103581e93e4e86000e6a8a05 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c981ab2a4771f8c5e95e2e85e37a02a4bd0e36ee
\ No newline at end of file
+0d7730611be974162d9a064a041957d04d55b6d3
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index dc8201595b71c87a054f352166004eb68f221b52..ed12df9ac69b214049f3a9f9b2a95901b0fb0af4 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2403,6 +2403,7 @@ case OP_Column: {
 
   /* If the cursor cache is stale, bring it up-to-date */
   rc = sqlite3VdbeCursorMoveto(&pC, &p2);
+  if( rc ) goto abort_due_to_error;
 
   assert( pOp->p3>0 && pOp->p3<=(p->nMem+1 - p->nCursor) );
   pDest = &aMem[pOp->p3];
@@ -2416,7 +2417,6 @@ case OP_Column: {
   assert( pC->eCurType!=CURTYPE_SORTER );
   pCrsr = pC->uc.pCursor;
 
-  if( rc ) goto abort_due_to_error;
   if( pC->cacheStatus!=p->cacheCtr ){
     if( pC->nullRow ){
       if( pC->eCurType==CURTYPE_PSEUDO ){