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

Enhancements to the previous check-in to make it a little smaller and faster.

Browse Source 
FossilOrigin-Name: 291d9e0c328a7bd0f255b0b7e819ca2c909701a3
This commit is contained in:
drh
2015-06-27 20:55:00 +00:00
parent 28f58dd60e
commit 15a0021b3e
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/btree.c
View File

@@ -1911,8 +1911,9 @@ u32 sqlite3BtreeLastPage(Btree *p){
/*
** Get a page from the pager and initialize it.
**
** If pCur!=0 then the page acquired will be added to that cursor.
** If the fetch fails, this routine must decrement pCur->iPage.
** If pCur!=0 then the page is being fetched as part of a moveToChild()
** call. Do additional sanity checking on the page in this case.
** And if the fetch fails, this routine must decrement pCur->iPage.
**
** The page is fetched as read-write unless pCur is not NULL and is
** a read-only cursor.
@@ -1932,6 +1933,7 @@ static int getAndInitPage(
assert( sqlite3_mutex_held(pBt->mutex) );
assert( pCur==0 || ppPage==&pCur->apPage[pCur->iPage] );
assert( pCur==0 || bReadOnly==pCur->curPagerFlags );
assert( pCur==0 || pCur->iPage>0 );
if( pgno>btreePagecount(pBt) ){
rc = SQLITE_CORRUPT_BKPT;
@@ -1950,9 +1952,9 @@ static int getAndInitPage(
}
}
/* If obtaining a page for a cursor, we must verify that the page is
** compatible with the cursor */
if( pCur && pCur->iPage>0
/* If obtaining a child page for a cursor, we must verify that the page is
** compatible with the root page. */
if( pCur
&& ((*ppPage)->nCell<1 || (*ppPage)->intKey!=pCur->apPage[0]->intKey)
){
rc = SQLITE_CORRUPT_BKPT;
@@ -4775,9 +4777,8 @@ static int moveToRoot(BtCursor *pCur){
return SQLITE_OK;
}else{
assert( pCur->iPage==(-1) );
pCur->iPage = 0;
rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->apPage[0],
pCur, pCur->curPagerFlags);
0, pCur->curPagerFlags);
if( rc!=SQLITE_OK ){
pCur->eState = CURSOR_INVALID;
return rc;