Speed up OP_Column by eliminating some double handling. (CVS 5490)

FossilOrigin-Name: 9ebee8401b68a2bcd49dc750ac394258d554b499

diff --git a/manifest b/manifest
index db8d84e71d3a57087f687bee6d416595af298785..95dfc2a063e6ecb8d2f679c54e4543e53dead9a6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Re-used\sprepared\sstatement\sfrom\sfts3\scursor.\s\sPreviously,\seach\scall\sto\nfulltextFilter()\sfinalized\sany\sexisting\sprepared\sstatement\sand\nprepared\sa\snew\sone.\s\sIn\sthe\scase\swhere\sidxNum\shas\snot\schanged,\ssimply\nreseting\sthe\sstatement\ssuffices.\s\sThis\sprovides\san\sorder\sof\smagnitude\nspeedup\sin\sincoming\sjoins\sagainst\sdocid.\s(CVS\s5489)
-D 2008-07-29T01:13:02
+C Speed\sup\sOP_Column\sby\seliminating\ssome\sdouble\shandling.\s(CVS\s5490)
+D 2008-07-29T10:18:57
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -183,7 +183,7 @@ F src/update.c 79b77a3cc8ed5f8903a7f37055fcedd69388dcae
 F src/utf.c 8d52f620a7153d90b058502124fe51d821fcdf57
 F src/util.c afe659ccc05d1f8af9e8631dabfec3ee3a7144af
 F src/vacuum.c ef342828002debc97514617af3424aea8ef8522c
-F src/vdbe.c 40b188e5bed3d942596471fb5cb526a6516ebcec
+F src/vdbe.c 78171c3fbaff3f8880012ef5eda9f862fdca936c
 F src/vdbe.h c46155c221418bea29ee3a749d5950fcf85a70e2
 F src/vdbeInt.h 1672cc137eb1d693090a17ded6682927fc851ca9
 F src/vdbeapi.c 25dd01c8b12978c14ec30e9a50666b23da767b27
@@ -612,7 +612,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e48f9697e9fea339e150ddc32940760027dd07d9
-R 680fb3be123f951c8c77ef4a340cd813
-U shess
-Z b0abfd8b0f9f50c33d751a3bf926e781
+P a08a5f2b1256b8a93beca5a359ccfc28d403efa3
+R a7499bda8c41a215bbe4914ecbc38de9
+U danielk1977
+Z 456c2aa59ad21c3fb5c40ca8af561e84

diff --git a/manifest.uuid b/manifest.uuid
index ffd7b409b30de7e9b3ec4b74d6fd34ca2ce6c022..071936556a35b8cc7fadbbee21f62dd8772e4849 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a08a5f2b1256b8a93beca5a359ccfc28d403efa3
\ No newline at end of file
+9ebee8401b68a2bcd49dc750ac394258d554b499
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index cab2cde5ff2f159ba86da03121b54224ab0e97cf..3ba3e1daac0746017229db666530f08bd7c2874d 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.766 2008/07/28 19:34:54 drh Exp $
+** $Id: vdbe.c,v 1.767 2008/07/29 10:18:57 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2155,17 +2155,8 @@ case OP_Column: {
   if( aOffset[p2] ){
     assert( rc==SQLITE_OK );
     if( zRec ){
-      if( pDest->flags&MEM_Dyn ){
-        sqlite3VdbeSerialGet((u8 *)&zRec[aOffset[p2]], aType[p2], &sMem);
-        sMem.db = db; 
-        rc = sqlite3VdbeMemCopy(pDest, &sMem);
-        assert( !(sMem.flags&MEM_Dyn) );
-        if( rc!=SQLITE_OK ){
-          goto op_column_out;
-        }
-      }else{
-        sqlite3VdbeSerialGet((u8 *)&zRec[aOffset[p2]], aType[p2], pDest);
-      }
+      sqlite3VdbeMemReleaseExternal(pDest);
+      sqlite3VdbeSerialGet((u8 *)&zRec[aOffset[p2]], aType[p2], pDest);
     }else{
       len = sqlite3VdbeSerialTypeLen(aType[p2]);
       sqlite3VdbeMemMove(&sMem, pDest);