database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Uses shifts rather than division for arithmetic on the cell indices, since

Browse Source 
those indices are always non-negative.

FossilOrigin-Name: 5bf2a3feeb2c83671bf3edeb20a549239e6873bf
This commit is contained in:
drh
2013-11-25 17:38:26 +00:00
parent 17566ee243
commit ebf10b1fb4
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Optimize\sthe\sskipping\sof\sthe\spayload\ssize\sfield\swhen\sdoing\sa\sbinary\ssearch\nfor\sa\srowid. C Uses\sshifts\srather\sthan\sdivision\sfor\sarithmetic\son\sthe\scell\sindices,\ssince\nthose\sindices\sare\salways\snon-negative.
D 2013-11-25T16:52:59.279 D 2013-11-25T17:38:26.358
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 1809a7caa2504233bdddd12f5018422421789537 F src/backup.c 1809a7caa2504233bdddd12f5018422421789537
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c fc03d3fd338fa66f27160155068a7be3d96c7f8d F src/btree.c f98e6ceada5953859d13848cb3139d248e0ad2e6
F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9 F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9
F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0 F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
F src/build.c 07054d45319953e54a89d726e589a423e9c1c590 F src/build.c 07054d45319953e54a89d726e589a423e9c1c590
@@ -280,7 +280,7 @@ F src/update.c c05a0ee658f1a149e0960dfd110f3b8bd846bcb0
F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918 F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
F src/vdbe.c 4d637218b7ffcc76fdcf461c71d277e7a4250e74 F src/vdbe.c 23d0cfba65b6dadf39a0805d0fba266e8146d678
F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644 F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644
F src/vdbeInt.h 05fbda0e061dbc4aaa2709a8cccf3515c245b263 F src/vdbeInt.h 05fbda0e061dbc4aaa2709a8cccf3515c245b263
F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
@@ -1142,7 +1142,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P a74675607fe041e37a58a3ec287131de0e5090c3 P 55e5bfa231dd52a7cf9ec982967da4963867b9e5
R d1af21a766586cae5be9dafc0442ac2b R 03a0908b80603703a94d0f74a79b1f34
U drh U drh
Z a809a2735916d723ee7af54e8adbc7b8 Z 8e81fe7c02afd074478ec63871f47a2f

2
manifest.uuid
View File

@@ -1 +1 @@
55e5bfa231dd52a7cf9ec982967da4963867b9e5 5bf2a3feeb2c83671bf3edeb20a549239e6873bf

20
src/btree.c
View File

@@ -4662,7 +4662,8 @@ int sqlite3BtreeMovetoUnpacked(
assert( pPage->intKey==(pIdxKey==0) ); assert( pPage->intKey==(pIdxKey==0) );
lwr = 0; lwr = 0;
upr = pPage->nCell-1; upr = pPage->nCell-1;
idx = biasRight ? upr : upr/2; assert( biasRight==0 || biasRight==1 );
idx = upr>>(1-biasRight); /* idx = biasRight ? upr : (lwr+upr)/2; */
pCur->aiIdx[pCur->iPage] = (u16)idx; pCur->aiIdx[pCur->iPage] = (u16)idx;
if( pPage->intKey ){ if( pPage->intKey ){
for(;;){ for(;;){
@@ -4685,15 +4686,15 @@ int sqlite3BtreeMovetoUnpacked(
pCur->aiIdx[pCur->iPage] = (u16)idx; pCur->aiIdx[pCur->iPage] = (u16)idx;
if( !pPage->leaf ){ if( !pPage->leaf ){
lwr = idx; lwr = idx;
c = 0; goto moveto_next_layer;
break;
}else{ }else{
*pRes = 0; *pRes = 0;
rc = SQLITE_OK; rc = SQLITE_OK;
goto moveto_finish; goto moveto_finish;
} }
} }
idx = (lwr+upr)/2; assert( lwr+upr>=0 );
idx = (lwr+upr)>>1; /* idx = (lwr+upr)/2; */
} }
}else{ }else{
for(;;){ for(;;){
@@ -4759,10 +4760,9 @@ int sqlite3BtreeMovetoUnpacked(
pCur->aiIdx[pCur->iPage] = (u16)idx; pCur->aiIdx[pCur->iPage] = (u16)idx;
goto moveto_finish; goto moveto_finish;
} }
if( lwr>upr ){ if( lwr>upr ) break;
break; assert( lwr+upr>=0 );
} idx = (lwr+upr)>>1; /* idx = (lwr+upr)/2 */
idx = (lwr+upr)/2;
} }
} }
assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) ); assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) );
@@ -4773,7 +4773,9 @@ int sqlite3BtreeMovetoUnpacked(
*pRes = c; *pRes = c;
rc = SQLITE_OK; rc = SQLITE_OK;
goto moveto_finish; goto moveto_finish;
}else if( lwr>=pPage->nCell ){ }
moveto_next_layer:
if( lwr>=pPage->nCell ){
chldPg = get4byte(&pPage->aData[pPage->hdrOffset+8]); chldPg = get4byte(&pPage->aData[pPage->hdrOffset+8]);
}else{ }else{
chldPg = get4byte(findCell(pPage, lwr)); chldPg = get4byte(findCell(pPage, lwr));

2
src/vdbe.c
View File

@@ -4075,7 +4075,7 @@ case OP_InsertInt: {
sqlite3BtreeSetCachedRowid(pC->pCursor, 0); sqlite3BtreeSetCachedRowid(pC->pCursor, 0);
rc = sqlite3BtreeInsert(pC->pCursor, 0, iKey, rc = sqlite3BtreeInsert(pC->pCursor, 0, iKey,
pData->z, pData->n, nZero, pData->z, pData->n, nZero,
pOp->p5 & OPFLAG_APPEND, seekResult (pOp->p5 & OPFLAG_APPEND)!=0, seekResult
); );
pC->rowidIsValid = 0; pC->rowidIsValid = 0;
pC->deferredMoveto = 0; pC->deferredMoveto = 0;