Small performance and size optimization for btreeUnlockIfUnused().

FossilOrigin-Name: 13c746f85d254475b10c3dd58555acd3bbead0ce

diff --git a/manifest b/manifest
index 01e1d67d9f9a450fc6c8e51018fdf82493f7c7b7..c64e305a7f38bfa538c39dc22d7df4d8e9cb2bc0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\sparameters\sin\sa\sDEFAULT\sclause\sof\sa\sCREATE\sTABLE\sstatement.\nTicket\s[78c0c8c3c9f7c1].
-D 2014-09-24T13:20:22.559
+C Small\sperformance\sand\ssize\soptimization\sfor\sbtreeUnlockIfUnused().
+D 2014-09-24T18:31:07.339
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -172,7 +172,7 @@ F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
-F src/btree.c 183d62b37358f95d2ffac796f8491591a3456362
+F src/btree.c ee77b1d3a346dd0d581e3d729524243c68ba5b96
 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
 F src/btreeInt.h 9db0d303b203d18871dc9a1d78a3e1ae4d62c1ef
 F src/build.c bde83dd5cf812e310a7e5ad2846790a14745bef4
@@ -1200,7 +1200,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f21d217583c205dc17f98bb4877fd4ed98cefcb1
-R 0c35c4c692384a20d9dc945800977dcf
+P 1ad2bc1ed4c4ac81ac67a9660761f0eeb47c7fef
+R d6b9d6f16b042c47207345c5727aac20
 U drh
-Z ea463bda0fe2fcb1086a67d4498e377c
+Z 51a889840b720ee888395fd53da3c843

diff --git a/manifest.uuid b/manifest.uuid
index 61739fa20af146e6cbc2a3ccca0a5518f17db0e9..838ae9d867edee7c4d9b51c3124d09d517b18687 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1ad2bc1ed4c4ac81ac67a9660761f0eeb47c7fef
\ No newline at end of file
+13c746f85d254475b10c3dd58555acd3bbead0ce
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 9af99dd8adf97fdab13531450849c9f6eac4afdc..d8bf076e85f2f6e27600d747118492d9dcd11692 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -2627,11 +2627,11 @@ static void unlockBtreeIfUnused(BtShared *pBt){
   assert( sqlite3_mutex_held(pBt->mutex) );
   assert( countValidCursors(pBt,0)==0 || pBt->inTransaction>TRANS_NONE );
   if( pBt->inTransaction==TRANS_NONE && pBt->pPage1!=0 ){
-    assert( pBt->pPage1->aData );
+    MemPage *pPage1 = pBt->pPage1;
+    assert( pPage1->aData );
     assert( sqlite3PagerRefcount(pBt->pPager)==1 );
-    assert( pBt->pPage1->aData );
-    releasePage(pBt->pPage1);
     pBt->pPage1 = 0;
+    releasePage(pPage1);
   }
 }