Performance optimization in the sqlite3VdbeHalt() routine.

FossilOrigin-Name: 9564d72a0820dbcb38f905fcd42ed4c858ea8fb5f648b189ceb65380a14a785b

diff --git a/manifest b/manifest
index 244b07b907bb7c08cad5499e041e7b2eb46fae36..6383d48064a9ec62e630469162fd3355b3cf7e34 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sand\ssize\sreduction\sin\sthe\sOP_Halt\sopcode.
-D 2022-04-03T20:39:48.118
+C Performance\soptimization\sin\sthe\ssqlite3VdbeHalt()\sroutine.
+D 2022-04-03T22:35:13.221
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,11 +624,11 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c 1d839d17db758a6c3a06cc2018880395f9b0f11ff81945d55cf90c4ae6c901c3
+F src/vdbe.c b34327e7ea940885db12df0ae7f751b53106a4eb7047c9a2bfb7efe26e39fc62
 F src/vdbe.h a1d0e3b934e835e73edd146f2e7c4eadb711b5c9875c18159a57483fd78e550e
 F src/vdbeInt.h 5f3d0abcf30c2b7a6672ad4386f18be0fca9c9b2cefe18f85a2e3df74f2613bf
 F src/vdbeapi.c 5c498998c99667f16cac2519f2fa439fe46acf99a332b0caa73637fc2ab35c22
-F src/vdbeaux.c 7769be4cff457f8d52732c7b1c7772100dace9cb8aff070c74cd6b956a1a94e2
+F src/vdbeaux.c 17ab5a927e22c0f8454e15b6fc03ca5be72e04fb1f455ce7fb10dc52d2153955
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 062cd58c54f887dc2eeb865686251c17237f791f0e6394e9c6f7a6f3c1a7e206
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -1945,8 +1945,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6e20e1c46d17ac6aba21e02b57649af51cfa415d83d0c001b30677d2fd1f1dc1
-R d64478804f8f45705fcb95b743cf8c6f
+P 21948e6e1ccd2ce128742415d21759604ecb8902226ec4707dbd75585450f208
+R 4745fb554ab36f43731027bbab700d2d
 U drh
-Z 82c6988106584643e5a2e0ab2496c5d2
+Z 869d9bdd409ceb08c178610bb5fbeb99
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 50c5b7148b710a833da92750796dc4dbdbb69c25..eea4d469a29472388092a35b59f6b539a7a246db 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-21948e6e1ccd2ce128742415d21759604ecb8902226ec4707dbd75585450f208
\ No newline at end of file
+9564d72a0820dbcb38f905fcd42ed4c858ea8fb5f648b189ceb65380a14a785b
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index a4177ae2ea05d957ad0ef5851b3364fd42f4320a..3f7dd44478b28cbc80d7af13e5dc343afa38056a 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3649,7 +3649,10 @@ case OP_Savepoint: {
     }
   }
   if( rc ) goto abort_due_to_error;
-
+  if( p->eVdbeState==VDBE_HALT_STATE ){
+    rc = SQLITE_DONE;
+    goto vdbe_return;
+  }
   break;
 }
 
@@ -8602,7 +8605,7 @@ abort_due_to_error:
   testcase( sqlite3GlobalConfig.xLog!=0 );
   sqlite3_log(rc, "statement aborts at %d: [%s] %s", 
                    (int)(pOp - aOp), p->zSql, p->zErrMsg);
-  sqlite3VdbeHalt(p);
+  if( p->eVdbeState==VDBE_RUN_STATE ) sqlite3VdbeHalt(p);
   if( rc==SQLITE_IOERR_NOMEM ) sqlite3OomFault(db);
   if( rc==SQLITE_CORRUPT && db->autoCommit==0 ){
     db->flags |= SQLITE_CorruptRdOnly;

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index a1908edf352e686105b2400d58b75c3b1a5a0849..6e6e240cd543c516a6b2aad6267e1110ee591836 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3044,9 +3044,7 @@ int sqlite3VdbeHalt(Vdbe *p){
   ** one, or the complete transaction if there is no statement transaction.
   */
 
-  if( p->eVdbeState!=VDBE_RUN_STATE ){
-    return SQLITE_OK;
-  }
+  assert( p->eVdbeState==VDBE_RUN_STATE );
   if( db->mallocFailed ){
     p->rc = SQLITE_NOMEM_BKPT;
   }
@@ -3306,7 +3304,7 @@ int sqlite3VdbeReset(Vdbe *p){
   ** error, then it might not have been halted properly.  So halt
   ** it now.
   */
-  sqlite3VdbeHalt(p);
+  if( p->eVdbeState==VDBE_RUN_STATE ) sqlite3VdbeHalt(p);
 
   /* If the VDBE has been run even partially, then transfer the error code
   ** and error message from the VDBE into the main database structure.  But