From: drh <drh@noemail.net>
Date: Wed, 11 Mar 2020 02:04:15 +0000 (+0000)
Subject: This variant to the fix for ticket [e0c2ad1aa8a9c691] uses fewer CPU cycles.
X-Git-Tag: version-3.32.0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d5cea6b61c30dd839a32e253bf7ae241b5662f4;p=thirdparty%2Fsqlite.git

This variant to the fix for ticket [e0c2ad1aa8a9c691] uses fewer CPU cycles.

FossilOrigin-Name: fb5a8a9edd0a4f979d6c30278d4ddc73c651f56ae989b4e5983fca36887c5ceb
---

diff --git a/manifest b/manifest
index 06cd979aa0..9ee146f83d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhanced\sdetection\slogic\sfor\spreventing\sthe\suse\sof\sstatic\sschema\sexpressions\nby\scode\sgenerating\sroutines.
-D 2020-03-10T19:24:38.960
+C This\svariant\sto\sthe\sfix\sfor\sticket\s[e0c2ad1aa8a9c691]\suses\sfewer\sCPU\scycles.
+D 2020-03-11T02:04:15.678
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F src/date.c 6c408fdd2e9ddf6e8431aba76315a2d061bea2cec8fbb75e25d7c1ba08274712
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 0f55297469d4244ab7df395849e1af98eb5e95816af7c661e7d2d8402dea23da
 F src/delete.c 11000121c4281c0bce4e41db29addfaea0038eaa127ece02557c9207bc3e541d
-F src/expr.c 117997508b41b1d02b4c376bdca16da04e813c0f36d0811e3ea13d1c786f53f4
+F src/expr.c cddb6c7ccdb856338c189c8cc15bd95dd60e596e4bb5a1c8ba86726b49857581
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c 108577cebe8a50c86d849a93b99493a54e348dd0b846f00d13b52ca973d5baf4
@@ -1860,7 +1860,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 f45f5de000834da5b23cdcf12c3f0e3073287756afe06bdb77b95fb65b250258
-R f078265eb0d8f8487aa3c2a1c341660a
+P 5f60b527b938c0778e8f725c635ce0dc5ed7a4e01fd6252aa2cdb64da2f625bc
+R 37bce3d92e4cf86464a6bfb5a7dc2299
 U drh
-Z 1d0ba7c8bbe7247314d90dba25e45a8e
+Z 0b4099ba8ff5f2f0e887def300e748c2
diff --git a/manifest.uuid b/manifest.uuid
index c22469d699..0b01cdc6f0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f60b527b938c0778e8f725c635ce0dc5ed7a4e01fd6252aa2cdb64da2f625bc
\ No newline at end of file
+fb5a8a9edd0a4f979d6c30278d4ddc73c651f56ae989b4e5983fca36887c5ceb
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 03d58df32e..cf52c5c754 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3805,8 +3805,13 @@ expr_code_doover:
         Table *pTab = pCol->pTab;
         sqlite3VdbeAddOp3(v, OP_Column, pAggInfo->sortingIdxPTab,
                               pCol->iSorterColumn, target);
-        if( ALWAYS(pTab) && pCol->iColumn>=0 ){
-          sqlite3ColumnDefault(v, pTab, pCol->iColumn, target);
+        if( pCol->iColumn<0 ){
+          VdbeComment((v,"%s.rowid",pTab->zName));
+        }else{
+          VdbeComment((v,"%s.%s",pTab->zName,pTab->aCol[pCol->iColumn].zName));
+          if( pTab->aCol[pCol->iColumn].affinity==SQLITE_AFF_REAL ){
+            sqlite3VdbeAddOp1(v, OP_RealAffinity, target);
+          }
         }
         return target;
       }