Small performance optimization and code size reduction in moveToRoot().

FossilOrigin-Name: cdcde00b2d68eeb35c472fdfd4c4508551f6722054394b43cc97eaf01ad7181d

diff --git a/manifest b/manifest
index 539740affccf96d7450891eb72354c49634be6d0..e0d882381622e4e7c8360b21d896ab1a9a546e6b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sNEVER()\son\san\sunreachable\sbranch\sin\sthe\sBloom\sfilter\spull-down\slogic.
-D 2021-12-13T18:53:10.371
+C Small\sperformance\soptimization\sand\scode\ssize\sreduction\sin\smoveToRoot().
+D 2021-12-13T19:59:55.504
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,7 +492,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 81feddbcc60d524518a7afc713b6dab0ad7caadb7370433f117c8c557dcdc889
+F src/btree.c 06abea6fbd9e28f86c8fcb2edfd3fb3afde388750a4f7f5fa425935a789c1f5c
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
 F src/build.c 107e1ecc98ca8965c2e08fc283a06067a1d829b1a82531a6f0a0e0fa60e7b0c1
@@ -1934,7 +1934,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 027626521c02be06ef61e8229bde49d20cb3f1cb600c4cb127c5f139b9de8858
-R 057e2625c45c96442011c44c84a35821
+P 471070462593faba865d8d05ee89161b340145351e2fa0bfbaa766d974e932d6
+R 31496f1551d29819dc300c6e9471d345
 U drh
-Z 1a75a7377d82483ef4328f4adf9ae9ae
+Z 3da685334c6fbdb2df60cd96248cd338

diff --git a/manifest.uuid b/manifest.uuid
index 801ce1024e5b3309d5f07361e421190eebe90d7c..259c297ce1837abc5d22c9ca0ced7f15eec77c97 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-471070462593faba865d8d05ee89161b340145351e2fa0bfbaa766d974e932d6
\ No newline at end of file
+cdcde00b2d68eeb35c472fdfd4c4508551f6722054394b43cc97eaf01ad7181d
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 5060140731a884b81e472efd15d2cf6b325674b7..6ffc6b6a1a611281ef4073906deca291c779a6c1 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5274,7 +5274,7 @@ static int moveToRoot(BtCursor *pCur){
       while( --pCur->iPage ){
         releasePageNotNull(pCur->apPage[pCur->iPage]);
       }
-      pCur->pPage = pCur->apPage[0];
+      pRoot = pCur->pPage = pCur->apPage[0];
       goto skip_init;
     }
   }else if( pCur->pgnoRoot==0 ){
@@ -5321,7 +5321,6 @@ skip_init:
   pCur->info.nSize = 0;
   pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidNKey|BTCF_ValidOvfl);
 
-  pRoot = pCur->pPage;
   if( pRoot->nCell>0 ){
     pCur->eState = CURSOR_VALID;
   }else if( !pRoot->leaf ){