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

Comment out sqlite3BtreeFlags() when not in debug mode. Tweaks to

Browse Source 
database corruption detection logic in freeSpace(). (CVS 6861)

FossilOrigin-Name: 196cbf82290a308e78b13044d0fae993f2d5cb90
This commit is contained in:
drh
2009-07-08 15:14:50 +00:00
parent c9000e60c6
commit 35a25da1b3
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.660 2009/07/08 13:55:29 danielk1977 Exp $
** $Id: btree.c,v 1.661 2009/07/08 15:14:50 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -1068,9 +1068,8 @@ static int defragmentPage(MemPage *pPage){
return SQLITE_CORRUPT_BKPT;
}
#endif
assert( cbrk+size<=usableSize && cbrk>=iCellFirst );
assert( cbrk+size<=usableSize && cbrk>iCellFirst );
testcase( cbrk+size==usableSize );
testcase( cbrk==iCellFirst );
testcase( pc+size==usableSize );
memcpy(&data[cbrk], &temp[pc], size);
put2byte(pAddr, cbrk);
@@ -1215,8 +1214,9 @@ static int freeSpace(MemPage *pPage, int start, int size){
hdr = pPage->hdrOffset;
addr = hdr + 1;
iLast = pPage->pBt->usableSize - 4;
assert( start<=iLast );
while( (pbegin = get2byte(&data[addr]))<start && pbegin>0 ){
if( pbegin>iLast || pbegin<addr+4 ){
if( pbegin<addr+4 ){
return SQLITE_CORRUPT_BKPT;
}
addr = pbegin;
@@ -7044,6 +7044,7 @@ int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){
return rc;
}
#ifndef SQLITE_TEST
/*
** Return the flag byte at the beginning of the page that the cursor
** is currently pointing to.
@@ -7060,6 +7061,7 @@ int sqlite3BtreeFlags(BtCursor *pCur){
assert( pPage->pBt==pCur->pBt );
return pPage->aData[pPage->hdrOffset];
}
#endif
#ifndef SQLITE_OMIT_BTREECOUNT
/*