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

Fix some incorrect asserts() in the pager - problems brought to light by

Browse Source 
the new soft-heap-limit testing apparatus of check-in (4202). (CVS 4207)

FossilOrigin-Name: 51f3e01b7486f23b67bdfb6bb19fc5297b2c8cec
This commit is contained in:
drh
2007-08-10 23:56:35 +00:00
parent fdd30b0e46
commit 34f5621ff1
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
** @(#) $Id: pager.c,v 1.353 2007/08/10 23:54:16 drh Exp $
** @(#) $Id: pager.c,v 1.354 2007/08/10 23:56:36 drh Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -562,7 +562,11 @@ static int write32bits(OsFile *fd, u32 val){
*/
static int pager_error(Pager *pPager, int rc){
int rc2 = rc & 0xff;
assert( pPager->errCode==SQLITE_FULL || pPager->errCode==SQLITE_OK );
assert(
pPager->errCode==SQLITE_FULL ||
pPager->errCode==SQLITE_OK ||
(pPager->errCode & 0xff)==SQLITE_IOERR
);
if(
rc2==SQLITE_FULL ||
rc2==SQLITE_IOERR ||
@@ -2755,7 +2759,7 @@ int sqlite3PagerReleaseMemory(int nReq){
pTmp->pNextAll = pPg->pNextAll;
}
nReleased += sqliteAllocSize(pPg);
IOTRACE(("PGFREE %p %d\n", pPager, pPg->pgno));
IOTRACE(("PGFREE %p %d *\n", pPager, pPg->pgno));
PAGER_INCR(sqlite3_pager_pgfree_count);
sqliteFree(pPg);
}
@@ -2767,7 +2771,11 @@ int sqlite3PagerReleaseMemory(int nReq){
** The error will be returned to the user (or users, in the case
** of a shared pager cache) of the pager for which the error occured.
*/
assert( (rc&0xff)==SQLITE_IOERR || rc==SQLITE_FULL );
assert(
(rc&0xff)==SQLITE_IOERR ||
rc==SQLITE_FULL ||
rc==SQLITE_BUSY
);
assert( pPager->state>=PAGER_RESERVED );
pager_error(pPager, rc);
}