Small performance optimization in sqlite3VdbeHalt().

FossilOrigin-Name: 9e1ecf438cb01d3d76950bcce1b3e4df29bedbb8176c8cede27e66f8e53e2098

diff --git a/manifest b/manifest
index 825703ff6ecc7ae2481652651952b3f0c67e3f5c..efe83c32466a25467e831a0110ad0ea3800f3fce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sthe\scount(*)\soptimization\sto\sbe\smisapplied\sin\ssome\scases\swhere\san\saggregate\ssub-query\suses\sa\scount()\sexpression\sthat\sis\saggregated\sagainst\sthe\souter\squery.
-D 2021-11-15T14:11:23.319
+C Small\sperformance\soptimization\sin\ssqlite3VdbeHalt().
+D 2021-11-15T18:50:02.793
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/vdbe.c bd1cd776d9eb9cc94aa91d10b5ef9f1f88749bc4f88bdf76133c7fff579de79d
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 31fbabdc1ed61d9695337dfe5269ea94e1cf615c17f5cafeaa1bb01066820bab
 F src/vdbeapi.c 22c79072ae7d8a01e9bcae8ba16e918d60d202eaa9553b5fda38f99f7464d99a
-F src/vdbeaux.c e1b2b66bf6444ec1c108ea5200157a83b48470cd00a8c5f7760d07793cdeffd9
+F src/vdbeaux.c 1a405561e5d181ec16f6e3e00ccc75bb6b134e408f11975bf19d7b39adf1ea7e
 F src/vdbeblob.c 29c4118f7ee615cdee829e8401f6ead1b96b95d545b4de0042f6de39c962c652
 F src/vdbemem.c a3d91dc9bb9ef725db77e4e9de7e1acef43192c9f8406c307665d503e3c2837c
 F src/vdbesort.c 513b481c8bab4a6578c92194a60cf3bc3b48736e4a53f8d2d7918121c5b594e7
@@ -1932,7 +1932,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 c7776369bcd0dbeb418b14d5dc681a81ee426234cc3f4f79a3c899d7892e1560
-R 89129d825b239a2fc17c1c7959a81b46
-U dan
-Z e4b6089fb1e945dc9b3ae4589bd1374c
+P e30917278c0ec750b1756ddc5e32d65c55464531d6ef64d2e72a412dfe634f58
+R 8f9f088ac95915690504584acdead8cf
+U drh
+Z 4d0d9cdd2d0e0ce70ad4e3a4aadf572b

diff --git a/manifest.uuid b/manifest.uuid
index 16ec50c5a66a87264dae81a2b853479c8573b70a..5a9b74a6502c7db8ffe9935460a9ed8979d5aba7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e30917278c0ec750b1756ddc5e32d65c55464531d6ef64d2e72a412dfe634f58
\ No newline at end of file
+9e1ecf438cb01d3d76950bcce1b3e4df29bedbb8176c8cede27e66f8e53e2098
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 1de6a9924527aae1ffe279278da805b291cae34b..4005b1eb164125fd0216052b3325f8d9e13e06f0 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3056,9 +3056,15 @@ int sqlite3VdbeHalt(Vdbe *p){
     sqlite3VdbeEnter(p);
 
     /* Check for one of the special errors */
-    mrc = p->rc & 0xff;
-    isSpecialError = mrc==SQLITE_NOMEM || mrc==SQLITE_IOERR
-                     || mrc==SQLITE_INTERRUPT || mrc==SQLITE_FULL;
+    if( p->rc ){
+      mrc = p->rc & 0xff;
+      isSpecialError = mrc==SQLITE_NOMEM
+                    || mrc==SQLITE_IOERR
+                    || mrc==SQLITE_INTERRUPT
+                    || mrc==SQLITE_FULL;
+    }else{
+      mrc = isSpecialError = 0;
+    }
     if( isSpecialError ){
       /* If the query was read-only and the error code is SQLITE_INTERRUPT, 
       ** no rollback is necessary. Otherwise, at least a savepoint