Performance improvement to the btree search routine.

FossilOrigin-Name: 65db822f200bafe9abe59b33b17b2c643c17c5e8

diff --git a/manifest b/manifest
index 7f9a970797f3949541ef5bd2c88128e32a6a2b0b..acedbbc7190614752ef545aa4159e51271497496 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovements\son\smemory\scopies\sinside\sof\sbtree\sby\smoving\s2\sbytes\nat\sa\stime\sinstead\sof\sjust\s1\sbyte\sat\sa\stime.
-D 2011-06-03T23:28:33.011
+C Performance\simprovement\sto\sthe\sbtree\ssearch\sroutine.
+D 2011-06-04T01:43:53.858
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -122,7 +122,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 9f214af284fae1e96f12989dcc4d26f247b502fc
+F src/btree.c c19d7b35c8325b302d88d73e834642a7a96ee003
 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
 F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
 F src/build.c 5a428625d21ad409514afb40ad083bee25dd957a
@@ -942,7 +942,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 61aa2031f1c5ae05e31077588a55194a9546262a
-R ee8453a74951d0e43529f6f62862f77e
+P 897f56a158ebe62758c9998e4941ae046c75fb99
+R 84139bde7a129a9544042a4a85d415c4
 U drh
-Z eb5472e3af1761c7727508ef6d936f22
+Z 4316427fea8d5aeb84c01ffb6d821ecd

diff --git a/manifest.uuid b/manifest.uuid
index 246d28ad64ce823f2c28b253e14313d6f3b3487d..e0e3846b645dabb0beb153c1d6c8e7a2a0ba2dfb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-897f56a158ebe62758c9998e4941ae046c75fb99
\ No newline at end of file
+65db822f200bafe9abe59b33b17b2c643c17c5e8
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index ece4602159a5ac9bc2fefe19133d7cb5b95e9605..640d48b45257d06f4a24ed14df29b8426b5a1e78 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4453,7 +4453,7 @@ int sqlite3BtreeMovetoUnpacked(
   }
   assert( pCur->apPage[0]->intKey || pIdxKey );
   for(;;){
-    int lwr, upr;
+    int lwr, upr, idx;
     Pgno chldPg;
     MemPage *pPage = pCur->apPage[pCur->iPage];
     int c;
@@ -4469,14 +4469,14 @@ int sqlite3BtreeMovetoUnpacked(
     lwr = 0;
     upr = pPage->nCell-1;
     if( biasRight ){
-      pCur->aiIdx[pCur->iPage] = (u16)upr;
+      pCur->aiIdx[pCur->iPage] = (u16)(idx = upr);
     }else{
-      pCur->aiIdx[pCur->iPage] = (u16)((upr+lwr)/2);
+      pCur->aiIdx[pCur->iPage] = (u16)(idx = (upr+lwr)/2);
     }
     for(;;){
-      int idx = pCur->aiIdx[pCur->iPage]; /* Index of current cell in pPage */
       u8 *pCell;                          /* Pointer to current cell in pPage */
 
+      assert( idx==pCur->aiIdx[pCur->iPage] );
       pCur->info.nSize = 0;
       pCell = findCell(pPage, idx) + pPage->childPtrSize;
       if( pPage->intKey ){
@@ -4559,7 +4559,7 @@ int sqlite3BtreeMovetoUnpacked(
       if( lwr>upr ){
         break;
       }
-      pCur->aiIdx[pCur->iPage] = (u16)((lwr+upr)/2);
+      pCur->aiIdx[pCur->iPage] = (u16)(idx = (lwr+upr)/2);
     }
     assert( lwr==upr+1 );
     assert( pPage->isInit );