From: drh <>
Date: Mon, 17 May 2021 11:19:32 +0000 (+0000)
Subject: Performance improvement in sqlite3TableLock().
X-Git-Tag: version-3.36.0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9430506df07923d22a4bd03973ff5671e76dfed4;p=thirdparty%2Fsqlite.git

Performance improvement in sqlite3TableLock().

FossilOrigin-Name: 0d77e371c47107f67550e9bedfd26808fcfd84c7473f94b6053f75f0e3463c73
---

diff --git a/manifest b/manifest
index 9686536309..f2033092a8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sin\sthe\smemory\sallocation\sof\sallocateCursor.
-D 2021-05-15T19:36:36.998
+C Performance\simprovement\sin\ssqlite3TableLock().
+D 2021-05-17T11:19:32.196
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c f74511a1476175a734221d38e33638b6fc4c6c94c819bbfa8419824703b967da
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
-F src/build.c a7866beda66a7c8971e013674c7f659d19977d9ad51e11032479b1f754d1ef21
+F src/build.c 4e13b92f77d3f6dc1285c3636a2ba7c6af5cbb793e52075a762fbcebcd36e968
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
@@ -1913,7 +1913,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 c4e02619a4dc8b07f658e7c88011991a086eb1e760d920b9024a11437daaabfd
-R 4816762a1807c6d973c9502508606581
+P 9d16323d14370b737399eb52b69b70cc614f78fb8a1e93f21a348c34a30dd456
+R 49f4093e56e27024e4b9b5507fcc332a
 U drh
-Z c8321cc153d7e5ab49215db310f82cea
+Z 08c2b8c4a4858391c43042a8ccf90e53
diff --git a/manifest.uuid b/manifest.uuid
index 02adfeaf0e..5188a5a193 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d16323d14370b737399eb52b69b70cc614f78fb8a1e93f21a348c34a30dd456
\ No newline at end of file
+0d77e371c47107f67550e9bedfd26808fcfd84c7473f94b6053f75f0e3463c73
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 6339a97849..25954b4d44 100644
--- a/src/build.c
+++ b/src/build.c
@@ -46,7 +46,7 @@ struct TableLock {
 ** code to make the lock occur is generated by a later call to
 ** codeTableLocks() which occurs during sqlite3FinishCoding().
 */
-void sqlite3TableLock(
+static SQLITE_NOINLINE void lockTable(
   Parse *pParse,     /* Parsing context */
   int iDb,           /* Index of the database containing the table to lock */
   Pgno iTab,         /* Root page number of the table to be locked */
@@ -59,8 +59,6 @@ void sqlite3TableLock(
   TableLock *p;
   assert( iDb>=0 );
 
-  if( iDb==1 ) return;
-  if( !sqlite3BtreeSharable(pParse->db->aDb[iDb].pBt) ) return;
   pToplevel = sqlite3ParseToplevel(pParse);
   for(i=0; i<pToplevel->nTableLock; i++){
     p = &pToplevel->aTableLock[i];
@@ -84,6 +82,17 @@ void sqlite3TableLock(
     sqlite3OomFault(pToplevel->db);
   }
 }
+void sqlite3TableLock(
+  Parse *pParse,     /* Parsing context */
+  int iDb,           /* Index of the database containing the table to lock */
+  Pgno iTab,         /* Root page number of the table to be locked */
+  u8 isWriteLock,    /* True for a write lock */
+  const char *zName  /* Name of the table to be locked */
+){
+  if( iDb==1 ) return;
+  if( !sqlite3BtreeSharable(pParse->db->aDb[iDb].pBt) ) return;
+  lockTable(pParse, iDb, iTab, isWriteLock, zName);
+}
 
 /*
 ** Code an OP_TableLock instruction for each table locked by the