More improvements to sqlite3BtreeMovetoUnpacked() performance.

FossilOrigin-Name: 88680698231b7141401f7166e3aff8dbc6008030

diff --git a/manifest b/manifest
index 4b817f5f32938f4e509236b9b279964f637ab98c..d384b8ea6f4d4818cace666441eca9217f065b63 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovements\sin\ssqlite3BtreeMovetoUnpacked().
-D 2013-11-25T02:38:55.810
+C More\simprovements\sto\ssqlite3BtreeMovetoUnpacked()\sperformance.
+D 2013-11-25T14:10:15.692
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 1809a7caa2504233bdddd12f5018422421789537
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c b0fd869c044bbf29640b9e53c43d8846a929d7f4
+F src/btree.c c300cb68948a03f0049addddd9e36f28551e78ae
 F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9
 F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
 F src/build.c 07054d45319953e54a89d726e589a423e9c1c590
@@ -1142,10 +1142,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 8f3c767a30c552548ead104ca125f182ce4849ad
-R c168ba651eff475cfa32f75aa61b62eb
-T *branch * btree-optimization
-T *sym-btree-optimization *
-T -sym-trunk *
+P d0fb7acea7cbfe6f2d84782a28bb51675a06576f
+R 29c1330ebdfb45d969bc6dbf6661ccf0
 U drh
-Z f59a524da90eada9da104b9026589d30
+Z d111eff6e7e1e09087be24d32976d9d6

diff --git a/manifest.uuid b/manifest.uuid
index 0597b2d1cd30a1fb812139562dae064f673b0b04..8226805b12d1f28f7d15a5a7544bc3a8bbc0c224 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0fb7acea7cbfe6f2d84782a28bb51675a06576f
\ No newline at end of file
+88680698231b7141401f7166e3aff8dbc6008030
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a21b72a0daff0411f0b37d96b31472c1eb66106a..dd397d6d0eefe787b4f9f446aa7327ad2e1b5d68 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4662,14 +4662,10 @@ int sqlite3BtreeMovetoUnpacked(
     assert( pPage->intKey==(pIdxKey==0) );
     lwr = 0;
     upr = pPage->nCell-1;
-    if( biasRight ){
-      pCur->aiIdx[pCur->iPage] = (u16)(idx = upr);
-    }else{
-      pCur->aiIdx[pCur->iPage] = (u16)(idx = (upr+lwr)/2);
-    }
+    idx = biasRight ? upr : (upr+lwr)/2;
+    pCur->aiIdx[pCur->iPage] = (u16)idx;
     pCur->info.nSize = 0;
     if( pPage->intKey ){
-      assert( idx==pCur->aiIdx[pCur->iPage] );
       for(;;){
         i64 nCellKey;
         pCell = findCell(pPage, idx) + pPage->childPtrSize;
@@ -4681,6 +4677,7 @@ int sqlite3BtreeMovetoUnpacked(
         if( nCellKey==intKey ){
           pCur->validNKey = 1;
           pCur->info.nKey = nCellKey;
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
           if( !pPage->leaf ){
             lwr = idx;
             break;
@@ -4690,20 +4687,21 @@ int sqlite3BtreeMovetoUnpacked(
             goto moveto_finish;
           }
         }else if( nCellKey<intKey ){
-          c = -1;
           lwr = idx+1;
         }else{
           assert( nCellKey>intKey );
-          c = +1;
           upr = idx-1;
         }
-        if( lwr>upr ) break;
-        pCur->aiIdx[pCur->iPage] = (u16)(idx = (lwr+upr)/2);
+        if( lwr>upr ){
+          c = nCellKey<intKey ? -1 : +1;
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
+          break;
+        }
+        idx = (lwr+upr)/2;
       }
     }else{
       for(;;){
         int nCell;
-        assert( idx==pCur->aiIdx[pCur->iPage] );
         pCell = findCell(pPage, idx) + pPage->childPtrSize;
 
         /* The maximum supported page-size is 65536 bytes. This means that
@@ -4745,6 +4743,7 @@ int sqlite3BtreeMovetoUnpacked(
             rc = SQLITE_NOMEM;
             goto moveto_finish;
           }
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
           rc = accessPayload(pCur, 0, nCell, (unsigned char*)pCellKey, 0);
           if( rc ){
             sqlite3_free(pCellKey);
@@ -4756,6 +4755,7 @@ int sqlite3BtreeMovetoUnpacked(
         if( c==0 ){
           *pRes = 0;
           rc = SQLITE_OK;
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
           goto moveto_finish;
         }
         if( c<0 ){
@@ -4763,8 +4763,11 @@ int sqlite3BtreeMovetoUnpacked(
         }else{
           upr = idx-1;
         }
-        if( lwr>upr ) break;
-        pCur->aiIdx[pCur->iPage] = (u16)(idx = (lwr+upr)/2);
+        if( lwr>upr ){
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
+          break;
+        }
+        idx = (lwr+upr)/2;
       }
     }
     assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) );