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

Arrange for sqlite3BtreeMovetoUnpacked() to always leave the cursor cell

Browse Source 
parse cache invalidated.  This fixes issues with previous check-ins on this
branch and also runs faster.

FossilOrigin-Name: a74675607fe041e37a58a3ec287131de0e5090c3
This commit is contained in:
drh
2013-11-25 16:23:52 +00:00
parent bb933ef6e7
commit d2022b0118
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C More\soptimizations\sto\ssqlite3BtreeMovetoUnpacked().\s\sBut\sthere\sare\sfailures\nin\sTH3.\s\sCommitting\sthis\sintermediate\sstate\sto\sfacilitate\sbisecting.
D 2013-11-25T15:01:38.218
C Arrange\sfor\ssqlite3BtreeMovetoUnpacked()\sto\salways\sleave\sthe\scursor\scell\nparse\scache\sinvalidated.\s\sThis\sfixes\sissues\swith\sprevious\scheck-ins\son\sthis\nbranch\sand\salso\sruns\sfaster.
D 2013-11-25T16:23:52.282
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 7459c164e26b1dca39d439186a4cf8328e0ffb1f
F src/btree.c 0ce10b29df09e9277448157fafb2a254468f9782
F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9
F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
F src/build.c 07054d45319953e54a89d726e589a423e9c1c590
@@ -1142,7 +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 88680698231b7141401f7166e3aff8dbc6008030
R a02e2482a947ddc5fc2d75dda36e99fc
P f80497be446f84d2000e454e32d717887a7d0cee
R 2fbc978380b3acf1d85deca4d19cdeda
U drh
Z 1dd2b4d4fc066dfd776d99dd8b11e059
Z f2ec119e1c1685944c58208d97a35f8b

2
manifest.uuid
View File

@@ -1 +1 @@
f80497be446f84d2000e454e32d717887a7d0cee
a74675607fe041e37a58a3ec287131de0e5090c3

8
src/btree.c
View File

@@ -4219,7 +4219,7 @@ static const unsigned char *fetchPayload(
assert( cursorHoldsMutex(pCur) );
pPage = pCur->apPage[pCur->iPage];
assert( pCur->aiIdx[pCur->iPage]<pPage->nCell );
if( NEVER(pCur->info.nSize==0) ){
if( pCur->info.nSize==0 ){
btreeParseCell(pCur->apPage[pCur->iPage], pCur->aiIdx[pCur->iPage],
&pCur->info);
}
@@ -4664,7 +4664,7 @@ int sqlite3BtreeMovetoUnpacked(
upr = pPage->nCell-1;
idx = biasRight ? upr : upr/2;
pCur->aiIdx[pCur->iPage] = (u16)idx;
pCur->info.nSize = 0;
// pCur->info.nSize = 0;
if( pPage->intKey ){
for(;;){
i64 nCellKey;
@@ -4781,12 +4781,12 @@ int sqlite3BtreeMovetoUnpacked(
chldPg = get4byte(findCell(pPage, lwr));
}
pCur->aiIdx[pCur->iPage] = (u16)lwr;
pCur->info.nSize = 0;
pCur->validNKey = 0;
rc = moveToChild(pCur, chldPg);
if( rc ) break;
}
moveto_finish:
pCur->info.nSize = 0;
pCur->validNKey = 0;
return rc;
}