mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modifications to pager.c to avoid the unsigned/signed warnings. (CVS 5909)

Browse Source 
FossilOrigin-Name: cb6be84dfc5d6546d07359b32fe04555561325de
This commit is contained in:
danielk1977 2008-11-17 04:56:24 +00:00
parent 44cd45c85d
commit d92db531c8
3 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\scompiler\swarnings\sin\spcache1.c\srelated\sto\scomparison\sof\sunsigned\sand\ssigned\s\svalues.\s(CVS\s5908) C Modifications\sto\spager.c\sto\savoid\sthe\sunsigned/signed\swarnings.\s(CVS\s5909)
D 2008-11-15T11:22:45 D 2008-11-17T04:56:24
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2 F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -138,7 +138,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
F src/os_os2.c 63be0987dbeb42e9b08c831863d2a315953b86e1 F src/os_os2.c 63be0987dbeb42e9b08c831863d2a315953b86e1
F src/os_unix.c af390f03ebe339e63911aec2d4ccd1e53fde581e F src/os_unix.c af390f03ebe339e63911aec2d4ccd1e53fde581e
F src/os_win.c b1cd079217818e610d6a62c6c71f1e5366a70efe F src/os_win.c b1cd079217818e610d6a62c6c71f1e5366a70efe
F src/pager.c c3f46fcb60a9049dd2f3039dfcde60fbbb83b41b F src/pager.c d328fcea0bfb3abbc174dba6e6b1ca7c0e1ed7ba
F src/pager.h 4a57b219c0765fe1870238064e3f46e4eb2cf5af F src/pager.h 4a57b219c0765fe1870238064e3f46e4eb2cf5af
F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe
F src/pcache.c 439bcf164f10dd0595cbd63f7472881d46dcbb61 F src/pcache.c 439bcf164f10dd0595cbd63f7472881d46dcbb61
@ -657,7 +657,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 800274b76945a41ca4ea72c455d220103a6b01dc P ce77ea989ea0bf4b44d5b9d0e58d30fd956038d3
R c90dc58e9b27c55002b15105a0ceedc9 R c97987ade6725f63c6dbc34968980cfe
U danielk1977 U danielk1977
Z 42b628886e890a552052bdb2d8cb6dbe Z cde1be3bc330d9514fc94b6ec61dd3ed

2
manifest.uuid
View File

@ -1 +1 @@
ce77ea989ea0bf4b44d5b9d0e58d30fd956038d3 cb6be84dfc5d6546d07359b32fe04555561325de

61
src/pager.c
View File

@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.503 2008/11/13 14:28:29 danielk1977 Exp $ ** @(#) $Id: pager.c,v 1.504 2008/11/17 04:56:24 danielk1977 Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@ -176,11 +176,12 @@ struct Pager {
u8 journalMode; /* On of the PAGER_JOURNALMODE_* values */ u8 journalMode; /* On of the PAGER_JOURNALMODE_* values */
u8 dbModified; /* True if there are any changes to the Db */ u8 dbModified; /* True if there are any changes to the Db */
u8 changeCountDone; /* Set after incrementing the change-counter */ u8 changeCountDone; /* Set after incrementing the change-counter */
u8 dbSizeValid; /* Set when dbSize is correct */
u32 vfsFlags; /* Flags for sqlite3_vfs.xOpen() */ u32 vfsFlags; /* Flags for sqlite3_vfs.xOpen() */
int errCode; /* One of several kinds of errors */ int errCode; /* One of several kinds of errors */
int dbSize; /* Number of pages in the file */ Pgno dbSize; /* Number of pages in the file */
int origDbSize; /* dbSize before the current change */ Pgno origDbSize; /* dbSize before the current change */
int stmtSize; /* Size of database (in pages) at stmt_begin() */ Pgno stmtSize; /* Size of database (in pages) at stmt_begin() */
int nRec; /* Number of pages written to the journal */ int nRec; /* Number of pages written to the journal */
u32 cksumInit; /* Quasi-random value added to every checksum */ u32 cksumInit; /* Quasi-random value added to every checksum */
int stmtNRec; /* Number of records in stmt subjournal */ int stmtNRec; /* Number of records in stmt subjournal */
@ -295,7 +296,7 @@ static const unsigned char aJournalMagic[] = {
** roll back. See comments for function writeMasterJournal() for details. ** roll back. See comments for function writeMasterJournal() for details.
*/ */
/* #define PAGER_MJ_PGNO(x) (PENDING_BYTE/((x)->pageSize)) */ /* #define PAGER_MJ_PGNO(x) (PENDING_BYTE/((x)->pageSize)) */
#define PAGER_MJ_PGNO(x) ((PENDING_BYTE/((x)->pageSize))+1) #define PAGER_MJ_PGNO(x) ((Pgno)((PENDING_BYTE/((x)->pageSize))+1))
/* /*
** The maximum legal page number is (2^31 - 1). ** The maximum legal page number is (2^31 - 1).
@ -495,7 +496,7 @@ static void checkPage(PgHdr *pPg){
** If no master journal file name is present zMaster[0] is set to 0 and ** If no master journal file name is present zMaster[0] is set to 0 and
** SQLITE_OK returned. ** SQLITE_OK returned.
*/ */
static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, int nMaster){ static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, u32 nMaster){
int rc; int rc;
u32 len; u32 len;
i64 szJ; i64 szJ;
@ -627,8 +628,8 @@ static int zeroJournalHdr(Pager *pPager, int doTruncate){
static int writeJournalHdr(Pager *pPager){ static int writeJournalHdr(Pager *pPager){
int rc = SQLITE_OK; int rc = SQLITE_OK;
char *zHeader = pPager->pTmpSpace; char *zHeader = pPager->pTmpSpace;
int nHeader = pPager->pageSize; u32 nHeader = pPager->pageSize;
int nWrite; u32 nWrite;
if( nHeader>JOURNAL_HDR_SZ(pPager) ){ if( nHeader>JOURNAL_HDR_SZ(pPager) ){
nHeader = JOURNAL_HDR_SZ(pPager); nHeader = JOURNAL_HDR_SZ(pPager);
@ -887,7 +888,7 @@ static void pager_unlock(Pager *pPager){
if( !pPager->exclusiveMode ){ if( !pPager->exclusiveMode ){
int rc = osUnlock(pPager->fd, NO_LOCK); int rc = osUnlock(pPager->fd, NO_LOCK);
if( rc ) pPager->errCode = rc; if( rc ) pPager->errCode = rc;
pPager->dbSize = -1; pPager->dbSizeValid = 0;
IOTRACE(("UNLOCK %p\n", pPager)) IOTRACE(("UNLOCK %p\n", pPager))
/* Always close the journal file when dropping the database lock. /* Always close the journal file when dropping the database lock.
@ -1022,7 +1023,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
pPager->needSync = 0; pPager->needSync = 0;
/* lruListSetFirstSynced(pPager); */ /* lruListSetFirstSynced(pPager); */
if( !MEMDB ){ if( !MEMDB ){
pPager->dbSize = -1; pPager->dbSizeValid = 0;
} }
pPager->dbModified = 0; pPager->dbModified = 0;
@ -1310,7 +1311,7 @@ static void pager_truncate_cache(Pager *pPager);
** so detect this case and write a single zero byte to the end of the new ** so detect this case and write a single zero byte to the end of the new
** file instead. ** file instead.
*/ */
static int pager_truncate(Pager *pPager, int nPage){ static int pager_truncate(Pager *pPager, Pgno nPage){
int rc = SQLITE_OK; int rc = SQLITE_OK;
if( pPager->state>=PAGER_EXCLUSIVE && pPager->fd->pMethods ){ if( pPager->state>=PAGER_EXCLUSIVE && pPager->fd->pMethods ){
i64 currentSize, newSize; i64 currentSize, newSize;
@ -1819,7 +1820,7 @@ int sqlite3PagerOpen(
/* Open the pager file. /* Open the pager file.
*/ */
if( zFilename && zFilename[0] && !memDb ){ if( zFilename && zFilename[0] && !memDb ){
if( nPathname>(pVfs->mxPathname - sizeof("-journal")) ){ if( nPathname>(pVfs->mxPathname - (int)sizeof("-journal")) ){
rc = SQLITE_CANTOPEN; rc = SQLITE_CANTOPEN;
}else{ }else{
int fout = 0; int fout = 0;
@ -1910,7 +1911,7 @@ int sqlite3PagerOpen(
/* pPager->stmtOpen = 0; */ /* pPager->stmtOpen = 0; */
/* pPager->stmtInUse = 0; */ /* pPager->stmtInUse = 0; */
/* pPager->nRef = 0; */ /* pPager->nRef = 0; */
pPager->dbSize = memDb-1; pPager->dbSizeValid = memDb;
pPager->pageSize = szPageDflt; pPager->pageSize = szPageDflt;
/* pPager->stmtSize = 0; */ /* pPager->stmtSize = 0; */
/* pPager->stmtJSize = 0; */ /* pPager->stmtJSize = 0; */
@ -2088,7 +2089,7 @@ int sqlite3PagerPagecount(Pager *pPager, int *pnPage){
rc = pPager->errCode; rc = pPager->errCode;
return rc; return rc;
} }
if( pPager->dbSize>=0 ){ if( pPager->dbSizeValid ){
n = pPager->dbSize; n = pPager->dbSize;
} else { } else {
assert(pPager->fd->pMethods||pPager->tempFile); assert(pPager->fd->pMethods||pPager->tempFile);
@ -2104,6 +2105,7 @@ int sqlite3PagerPagecount(Pager *pPager, int *pnPage){
} }
if( pPager->state!=PAGER_UNLOCK ){ if( pPager->state!=PAGER_UNLOCK ){
pPager->dbSize = n; pPager->dbSize = n;
pPager->dbSizeValid = 1;
} }
} }
if( n==(PENDING_BYTE/pPager->pageSize) ){ if( n==(PENDING_BYTE/pPager->pageSize) ){
@ -2156,7 +2158,7 @@ static int pager_wait_on_lock(Pager *pPager, int locktype){
assert( PAGER_EXCLUSIVE==EXCLUSIVE_LOCK ); assert( PAGER_EXCLUSIVE==EXCLUSIVE_LOCK );
/* If the file is currently unlocked then the size must be unknown */ /* If the file is currently unlocked then the size must be unknown */
assert( pPager->state>=PAGER_SHARED || pPager->dbSize<0 ); assert( pPager->state>=PAGER_SHARED || pPager->dbSizeValid==0 );
if( pPager->state>=locktype ){ if( pPager->state>=locktype ){
rc = SQLITE_OK; rc = SQLITE_OK;
@ -2183,7 +2185,7 @@ int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){
sqlite3PagerPagecount(pPager, 0); sqlite3PagerPagecount(pPager, 0);
if( pPager->errCode ){ if( pPager->errCode ){
rc = pPager->errCode; rc = pPager->errCode;
}else if( nPage<(unsigned)pPager->dbSize ){ }else if( nPage<pPager->dbSize ){
rc = syncJournal(pPager); rc = syncJournal(pPager);
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
/* Get an exclusive lock on the database before truncating. */ /* Get an exclusive lock on the database before truncating. */
@ -2693,6 +2695,7 @@ static int pagerSharedLock(Pager *pPager){
goto failed; goto failed;
} }
assert( pPager->dbSizeValid );
if( pPager->dbSize>0 ){ if( pPager->dbSize>0 ){
IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers))); IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers)));
rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24); rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
@ -3185,7 +3188,7 @@ static int pager_write(PgHdr *pPg){
** the transaction journal if it is not there already. ** the transaction journal if it is not there already.
*/ */
if( !pageInJournal(pPg) && pPager->journalOpen ){ if( !pageInJournal(pPg) && pPager->journalOpen ){
if( (int)pPg->pgno <= pPager->origDbSize ){ if( pPg->pgno<=pPager->origDbSize ){
u32 cksum; u32 cksum;
char *pData2; char *pData2;
@ -3248,11 +3251,11 @@ static int pager_write(PgHdr *pPg){
*/ */
if( pPager->stmtInUse if( pPager->stmtInUse
&& !pageInStatement(pPg) && !pageInStatement(pPg)
&& (int)pPg->pgno<=pPager->stmtSize && pPg->pgno<=pPager->stmtSize
){ ){
i64 offset = pPager->stmtNRec*(4+pPager->pageSize); i64 offset = pPager->stmtNRec*(4+pPager->pageSize);
char *pData2 = CODEC2(pPager, pData, pPg->pgno, 7); char *pData2 = CODEC2(pPager, pData, pPg->pgno, 7);
assert( pageInJournal(pPg) || (int)pPg->pgno>pPager->origDbSize ); assert( pageInJournal(pPg) || pPg->pgno>pPager->origDbSize );
rc = write32bits(pPager->stfd, offset, pPg->pgno); rc = write32bits(pPager->stfd, offset, pPg->pgno);
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
rc = sqlite3OsWrite(pPager->stfd, pData2, pPager->pageSize, offset+4); rc = sqlite3OsWrite(pPager->stfd, pData2, pPager->pageSize, offset+4);
@ -3270,9 +3273,9 @@ static int pager_write(PgHdr *pPg){
/* Update the database size and return. /* Update the database size and return.
*/ */
assert( pPager->state>=PAGER_SHARED ); assert( pPager->state>=PAGER_SHARED );
if( pPager->dbSize<(int)pPg->pgno ){ if( pPager->dbSize<pPg->pgno ){
pPager->dbSize = pPg->pgno; pPager->dbSize = pPg->pgno;
if( pPager->dbSize==PENDING_BYTE/pPager->pageSize ){ if( pPager->dbSize==(PAGER_MJ_PGNO(pPager)-1) ){
pPager->dbSize++; pPager->dbSize++;
} }
} }
@ -3430,7 +3433,7 @@ int sqlite3PagerDontWrite(DbPage *pDbPage){
if( rc==SQLITE_OK && (pPg->flags&PGHDR_DIRTY) && !pPager->stmtInUse ){ if( rc==SQLITE_OK && (pPg->flags&PGHDR_DIRTY) && !pPager->stmtInUse ){
assert( pPager->state>=PAGER_SHARED ); assert( pPager->state>=PAGER_SHARED );
if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){ if( pPager->dbSize==pPg->pgno && pPager->origDbSize<pPager->dbSize ){
/* If this pages is the last page in the file and the file has grown /* If this pages is the last page in the file and the file has grown
** during the current transaction, then do NOT mark the page as clean. ** during the current transaction, then do NOT mark the page as clean.
** When the database file grows, we must make sure that the last page ** When the database file grows, we must make sure that the last page
@ -3479,7 +3482,7 @@ void sqlite3PagerDontRollback(DbPage *pPg){
} }
#ifdef SQLITE_SECURE_DELETE #ifdef SQLITE_SECURE_DELETE
if( (pPg->flags & PGHDR_IN_JOURNAL)!=0 || (int)pPg->pgno>pPager->origDbSize ){ if( (pPg->flags & PGHDR_IN_JOURNAL)!=0 || pPg->pgno>pPager->origDbSize ){
return; return;
} }
#endif #endif
@ -3678,7 +3681,7 @@ int sqlite3PagerCommitPhaseOne(
** file. ** file.
*/ */
Pgno i; Pgno i;
int iSkip = PAGER_MJ_PGNO(pPager); Pgno iSkip = PAGER_MJ_PGNO(pPager);
for( i=nTrunc+1; i<=pPager->origDbSize; i++ ){ for( i=nTrunc+1; i<=pPager->origDbSize; i++ ){
if( !sqlite3BitvecTest(pPager->pInJournal, i) && i!=iSkip ){ if( !sqlite3BitvecTest(pPager->pInJournal, i) && i!=iSkip ){
rc = sqlite3PagerGet(pPager, i, &pPg); rc = sqlite3PagerGet(pPager, i, &pPg);
@ -3808,7 +3811,7 @@ int sqlite3PagerRollback(Pager *pPager){
} }
if( !MEMDB ){ if( !MEMDB ){
pPager->dbSize = -1; pPager->dbSizeValid = 0;
} }
/* If an error occurs during a ROLLBACK, we can no longer trust the pager /* If an error occurs during a ROLLBACK, we can no longer trust the pager
@ -3851,7 +3854,7 @@ int *sqlite3PagerStats(Pager *pPager){
a[0] = sqlite3PcacheRefCount(pPager->pPCache); a[0] = sqlite3PcacheRefCount(pPager->pPCache);
a[1] = sqlite3PcachePagecount(pPager->pPCache); a[1] = sqlite3PcachePagecount(pPager->pPCache);
a[2] = sqlite3PcacheGetCachesize(pPager->pPCache); a[2] = sqlite3PcacheGetCachesize(pPager->pPCache);
a[3] = pPager->dbSize; a[3] = pPager->dbSizeValid ? (int) pPager->dbSize : -1;
a[4] = pPager->state; a[4] = pPager->state;
a[5] = pPager->errCode; a[5] = pPager->errCode;
a[6] = pPager->nHit; a[6] = pPager->nHit;
@ -3877,7 +3880,7 @@ static int pagerStmtBegin(Pager *pPager){
int rc; int rc;
assert( !pPager->stmtInUse ); assert( !pPager->stmtInUse );
assert( pPager->state>=PAGER_SHARED ); assert( pPager->state>=PAGER_SHARED );
assert( pPager->dbSize>=0 ); assert( pPager->dbSizeValid );
PAGERTRACE2("STMT-BEGIN %d\n", PAGERID(pPager)); PAGERTRACE2("STMT-BEGIN %d\n", PAGERID(pPager));
if( !pPager->journalOpen ){ if( !pPager->journalOpen ){
pPager->stmtAutoopen = 1; pPager->stmtAutoopen = 1;
@ -4059,7 +4062,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, int isCommit){
*/ */
if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){ if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
needSyncPgno = pPg->pgno; needSyncPgno = pPg->pgno;
assert( pageInJournal(pPg) || (int)pgno>pPager->origDbSize ); assert( pageInJournal(pPg) || pgno>pPager->origDbSize );
assert( pPg->flags&PGHDR_DIRTY ); assert( pPg->flags&PGHDR_DIRTY );
assert( pPager->needSync ); assert( pPager->needSync );
} }
@ -4108,7 +4111,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, int isCommit){
assert( pPager->needSync ); assert( pPager->needSync );
rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr); rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
if( pPager->pInJournal && (int)needSyncPgno<=pPager->origDbSize ){ if( pPager->pInJournal && needSyncPgno<=pPager->origDbSize ){
sqlite3BitvecClear(pPager->pInJournal, needSyncPgno); sqlite3BitvecClear(pPager->pInJournal, needSyncPgno);
} }
return rc; return rc;