In the OP_MakeRecord opcode, factor out affinity changes into separate loop,

for a slight performance advantage.

FossilOrigin-Name: 1c6ee9b85f61e5cdb5d9b7815cddf526dc78aaa7

diff --git a/manifest b/manifest
index 1bdefb7a11b0d4aeca19ddba2afa87d540c83d64..28544906b39bcd466a5430806be123bdf5441022 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sand\simprove\sthe\sperformance\sof\sthe\ssqlite3VdbeMemGrow()\sroutine.
-D 2013-12-10T19:49:00.802
+C In\sthe\sOP_MakeRecord\sopcode,\sfactor\sout\saffinity\schanges\sinto\sseparate\sloop,\nfor\sa\sslight\sperformance\sadvantage.
+D 2013-12-10T20:53:01.865
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -280,7 +280,7 @@ F src/update.c d1c2477dcf14d90999d1935af4efb4806553250b
 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
 F src/util.c 76ed0519296e3f62e97e57dab1999e34184c8e49
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
-F src/vdbe.c 4bfb1fe75a0ad08646e9b82670691c62699bc5ee
+F src/vdbe.c c5b17309048f28ff79e0b65aeb72d365a3a415a1
 F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644
 F src/vdbeInt.h 7e38eef8f4bd7141e1638b0eacaebf9bc41b26bc
 F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
@@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 7277a769694787e0332d1a4efc02041834661e2a
-R 3ef0e61f6611b17b108322b8d504b195
+P 48ecf18774ba9572d86696c60d87007a619d9f53
+R 8c35d8f315102eab592f6f641be2ff5b
 U drh
-Z 641e108686357e5c2dc6bc5a433b2dd9
+Z ddd4b5e4f3e2f25b93fe4a6cd498d64a

diff --git a/manifest.uuid b/manifest.uuid
index fd407773013b0f89568055373750512b0bd5f6c7..6ce25cfed9b6d2aaeef9c57661e8447559eb5550 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48ecf18774ba9572d86696c60d87007a619d9f53
\ No newline at end of file
+1c6ee9b85f61e5cdb5d9b7815cddf526dc78aaa7
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index a0a69e8a5caabd46b51b9108302acd71c521065f..37851802ce864e4a585226163332c68cdad57fe6 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2595,16 +2595,22 @@ case OP_MakeRecord: {
   pOut = &aMem[pOp->p3];
   memAboutToChange(p, pOut);
 
+  /* Apply the requested affinity to all inputs
+  */
+  assert( pData0<=pLast );
+  if( zAffinity ){
+    pRec = pData0;
+    do{
+      applyAffinity(pRec, *(zAffinity++), encoding);
+    }while( (++pRec)<=pLast );
+  }
+
   /* Loop through the elements that will make up the record to figure
   ** out how much space is required for the new record.
   */
-  assert( pData0<=pLast );
   pRec = pLast;
   do{
     assert( memIsValid(pRec) );
-    if( zAffinity ){
-      applyAffinity(pRec, zAffinity[pRec-pData0], encoding);
-    }
     serial_type = sqlite3VdbeSerialType(pRec, file_format);
     len = sqlite3VdbeSerialTypeLen(serial_type);
     if( pRec->flags & MEM_Zero ){