Minor simplification of the cursor allocation logic for update.

FossilOrigin-Name: fdf71be65835e7e8915d16dd64114de35c4754ef5b94a2af6cac88a94817fb75

diff --git a/manifest b/manifest
index 333a1c93ac557ea18791c54aacb8359cb240a658..118a462105c3124a10e3f658c961a425523650d9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\shandling\sof\s"PRAGMA\scount_changes=ON"\swith\sUPSERT.\s\sAlso\simproved\nthe\simplementation\sof\scount_changes\sin\sother\splaces,\swithout\schanging\sthe\nbehavior.
-D 2018-04-19T23:52:39.113
+C Minor\ssimplification\sof\sthe\scursor\sallocation\slogic\sfor\supdate.
+D 2018-04-20T00:40:19.244
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -557,7 +557,7 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 5b0c661a85f783d35b9883830736eeb63be4aefc4f6b7d9cd081d48782c041e2
 F src/treeview.c 14d5d1254702ec96876aa52642cb31548612384134970409fae333b25b39d6bb
 F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
-F src/update.c cc691c8b63b22be9e00d6fa2d1c5d561a5cee871f4ed5c456762398c6c991d05
+F src/update.c 74ba1a99a5f0c852dff23f4519d7c1623c0b34562343e183ec0fd0656304eb7d
 F src/upsert.c ee5c9e44fac181e86a561c2d315c28f4c0f94e9d3283544bd39aa0e201b0c61c
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
@@ -1724,7 +1724,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 e657c1d60f5fca9464e9bcab24bc328855bec9986e0a029877f639355da4b201
-R 7cdcf758f67dbc731422788f5f4662ec
+P c6f71115eb933c2aee295bc31e5139112463c28e15a3b3ea242fd9bac168aed9
+R 07cdec54847d408d1664bb947679d0b8
 U drh
-Z 0ab3e82b91f879d52dd2122af2ad30bf
+Z ddabed43abbf787bd70f75ea21871bd3

diff --git a/manifest.uuid b/manifest.uuid
index 0a2e1812744da4aa800ee449f0153fc146f71d75..fabedbd8b18e272328daaf16ece72f16185ffe63 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c6f71115eb933c2aee295bc31e5139112463c28e15a3b3ea242fd9bac168aed9
\ No newline at end of file
+fdf71be65835e7e8915d16dd64114de35c4754ef5b94a2af6cac88a94817fb75
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index c817153e8e8e9901b04f1f181383050c20f3ffc4..dd08b166878f7fecb5acb985b126c5d94af47426 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -201,16 +201,17 @@ void sqlite3Update(
   ** need to occur right after the database cursor.  So go ahead and
   ** allocate enough space, just in case.
   */
-  pTabList->a[0].iCursor = iBaseCur = iDataCur = pParse->nTab++;
+  iBaseCur = iDataCur = pParse->nTab++;
   iIdxCur = iDataCur+1;
   pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
+  testcase( pPk!=0 && pPk!=pTab->pIndex );
   for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){
-    if( IsPrimaryKeyIndex(pIdx) && pPk!=0 ){
+    if( pPk==pIdx ){
       iDataCur = pParse->nTab;
-      pTabList->a[0].iCursor = iDataCur;
     }
     pParse->nTab++;
   }
+  pTabList->a[0].iCursor = iDataCur;
 
   /* Allocate space for aXRef[], aRegIdx[], and aToOpen[].  
   ** Initialize aXRef[] and aToOpen[] to their default values.