Avoid unnecessary calls to sqlite3ExprCacheAffinityChange() when generating

OP_MakeRecord opcodes that do not change any register affinities.

FossilOrigin-Name: e211c579b2f092e3283edd5fb9add7c5183bac35

diff --git a/manifest b/manifest
index 1197cac4d9c058309c33cbbd0f5708543d851875..74f95efa42e10519d927136690539b522dd65753 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sfts5\sproblem\scausing\sa\scrash\sin\sphrase\squeries\swhere\sthe\sfirst\stoken\sof\nthe\sphrase\smatches\sone\sor\smore\srows\sbut\ssome\sother\stoken\swithin\sthe\sphrase\nmatches\szero.
-D 2016-11-14T08:19:37.487
+C Avoid\sunnecessary\scalls\sto\ssqlite3ExprCacheAffinityChange()\swhen\sgenerating\nOP_MakeRecord\sopcodes\sthat\sdo\snot\schange\sany\sregister\saffinities.
+D 2016-11-14T15:28:56.925
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@ -349,7 +349,7 @@ F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 0db6364a6a64e521281d6f443b1669a5a16bdbd6
+F src/insert.c d47f9b4f6b7137b886525f735628fed4ff181ea2
 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
 F src/main.c 694ac90557abdaa62151a6090670e107b0f2c2ab
@@ -1532,7 +1532,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 7b76be4117f4e57091b03fafcf42d17bce81160d
-R d4b78ee7bcfd8ac12430ee90cda2abbd
-U dan
-Z 698063c6adfdd3558a22de16ea6a2897
+P e78f6f3bbf4781850960fe6741f7cba480f2c27d
+R 3fa0a5681db4ad4cdeeecb208061d048
+U drh
+Z 63d0e6fa2d7d17a48902a7d1e28254c8

diff --git a/manifest.uuid b/manifest.uuid
index 0e13fa652016df97d4f7300a1eff193730109d1e..3c3f4d160e56d02653738075dc0da79f9a8a9d84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e78f6f3bbf4781850960fe6741f7cba480f2c27d
\ No newline at end of file
+e211c579b2f092e3283edd5fb9add7c5183bac35
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 59bc99b5235fb2283f983812f706970664a7b282..151c7d746b6d8615784672202e7e90bacea09cce 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -1535,7 +1535,6 @@ void sqlite3GenerateConstraintChecks(
     }
     sqlite3VdbeAddOp3(v, OP_MakeRecord, regIdx, pIdx->nColumn, aRegIdx[ix]);
     VdbeComment((v, "for %s", pIdx->zName));
-    sqlite3ExprCacheAffinityChange(pParse, regIdx, pIdx->nColumn);
 
     /* In an UPDATE operation, if this index is the PRIMARY KEY index 
     ** of a WITHOUT ROWID table and there has been no change the
@@ -1717,8 +1716,10 @@ void sqlite3CompleteInsertion(
   regData = regNewData + 1;
   regRec = sqlite3GetTempReg(pParse);
   sqlite3VdbeAddOp3(v, OP_MakeRecord, regData, pTab->nCol, regRec);
-  if( !bAffinityDone ) sqlite3TableAffinity(v, pTab, 0);
-  sqlite3ExprCacheAffinityChange(pParse, regData, pTab->nCol);
+  if( !bAffinityDone ){
+    sqlite3TableAffinity(v, pTab, 0);
+    sqlite3ExprCacheAffinityChange(pParse, regData, pTab->nCol);
+  }
   if( pParse->nested ){
     pik_flags = 0;
   }else{