xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

more

This commit is contained in:
Hongze Cheng 2022-02-21 09:11:34 +00:00
parent 7184778c28
commit a581d9b356
6 changed files with 441 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/libs/tdb/src/sqlite/btree.c
View File

@ -391,7 +391,7 @@ static int setSharedCacheTableLock(Btree *p, Pgno iTable, u8 eLock){
if( !pLock ){ if( !pLock ){
pLock = (BtLock *)sqlite3MallocZero(sizeof(BtLock)); pLock = (BtLock *)sqlite3MallocZero(sizeof(BtLock));
if( !pLock ){ if( !pLock ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
pLock->iTable = iTable; pLock->iTable = iTable;
pLock->pBtree = p; pLock->pBtree = p;
@ -606,7 +606,7 @@ static int btreeSetHasContent(BtShared *pBt, Pgno pgno){
assert( pgno<=pBt->nPage ); assert( pgno<=pBt->nPage );
pBt->pHasContent = sqlite3BitvecCreate(pBt->nPage); pBt->pHasContent = sqlite3BitvecCreate(pBt->nPage);
if( !pBt->pHasContent ){ if( !pBt->pHasContent ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
} }
} }
if( rc==SQLITE_OK && pgno<=sqlite3BitvecSize(pBt->pHasContent) ){ if( rc==SQLITE_OK && pgno<=sqlite3BitvecSize(pBt->pHasContent) ){
@ -691,7 +691,7 @@ static int saveCursorKey(BtCursor *pCur){
sqlite3_free(pKey); sqlite3_free(pKey);
} }
}else{ }else{
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
} }
} }
assert( !pCur->curIntKey || !pCur->pKey ); assert( !pCur->curIntKey || !pCur->pKey );
@ -823,7 +823,7 @@ static int btreeMoveto(
KeyInfo *pKeyInfo = pCur->pKeyInfo; KeyInfo *pKeyInfo = pCur->pKeyInfo;
assert( nKey==(i64)(int)nKey ); assert( nKey==(i64)(int)nKey );
pIdxKey = sqlite3VdbeAllocUnpackedRecord(pKeyInfo); pIdxKey = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
if( pIdxKey==0 ) return SQLITE_NOMEM_BKPT; if( pIdxKey==0 ) return SQLITE_NOMEM;
sqlite3VdbeRecordUnpack(pKeyInfo, (int)nKey, pKey, pIdxKey); sqlite3VdbeRecordUnpack(pKeyInfo, (int)nKey, pKey, pIdxKey);
if( pIdxKey->nField==0 || pIdxKey->nField>pKeyInfo->nAllField ){ if( pIdxKey->nField==0 || pIdxKey->nField>pKeyInfo->nAllField ){
rc = SQLITE_CORRUPT_BKPT; rc = SQLITE_CORRUPT_BKPT;
@ -2404,7 +2404,7 @@ int sqlite3BtreeOpen(
} }
p = sqlite3MallocZero(sizeof(Btree)); p = sqlite3MallocZero(sizeof(Btree));
if( !p ){ if( !p ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
p->inTrans = TRANS_NONE; p->inTrans = TRANS_NONE;
p->db = db; p->db = db;
@ -2428,7 +2428,7 @@ int sqlite3BtreeOpen(
p->sharable = 1; p->sharable = 1;
if( !zFullPathname ){ if( !zFullPathname ){
sqlite3_free(p); sqlite3_free(p);
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
if( isMemdb ){ if( isMemdb ){
memcpy(zFullPathname, zFilename, nFilename); memcpy(zFullPathname, zFilename, nFilename);
@ -2500,7 +2500,7 @@ int sqlite3BtreeOpen(
pBt = sqlite3MallocZero( sizeof(*pBt) ); pBt = sqlite3MallocZero( sizeof(*pBt) );
if( pBt==0 ){ if( pBt==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto btree_open_out; goto btree_open_out;
} }
rc = sqlite3PagerOpen(pVfs, &pBt->pPager, zFilename, rc = sqlite3PagerOpen(pVfs, &pBt->pPager, zFilename,
@ -2571,7 +2571,7 @@ int sqlite3BtreeOpen(
if( SQLITE_THREADSAFE && sqlite3GlobalConfig.bCoreMutex ){ if( SQLITE_THREADSAFE && sqlite3GlobalConfig.bCoreMutex ){
pBt->mutex = sqlite3MutexAlloc(SQLITE_MUTEX_FAST); pBt->mutex = sqlite3MutexAlloc(SQLITE_MUTEX_FAST);
if( pBt->mutex==0 ){ if( pBt->mutex==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto btree_open_out; goto btree_open_out;
} }
} }
@ -4459,7 +4459,7 @@ static int btreeCursor(
if( wrFlag ){ if( wrFlag ){
allocateTempSpace(pBt); allocateTempSpace(pBt);
if( pBt->pTmpSpace==0 ) return SQLITE_NOMEM_BKPT; if( pBt->pTmpSpace==0 ) return SQLITE_NOMEM;
} }
if( iTable<=1 ){ if( iTable<=1 ){
if( iTable<1 ){ if( iTable<1 ){
@ -4919,7 +4919,7 @@ static int accessPayload(
pCur->aOverflow, nOvfl*2*sizeof(Pgno) pCur->aOverflow, nOvfl*2*sizeof(Pgno)
); );
if( aNew==0 ){ if( aNew==0 ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
}else{ }else{
pCur->aOverflow = aNew; pCur->aOverflow = aNew;
} }
@ -5746,7 +5746,7 @@ int sqlite3BtreeIndexMoveto(
} }
pCellKey = sqlite3Malloc( nCell+nOverrun ); pCellKey = sqlite3Malloc( nCell+nOverrun );
if( pCellKey==0 ){ if( pCellKey==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto moveto_index_finish; goto moveto_index_finish;
} }
pCur->ix = (u16)idx; pCur->ix = (u16)idx;
@ -7721,7 +7721,7 @@ static int balance_nonroot(
assert( pParent->nOverflow==0 || pParent->aiOvfl[0]==iParentIdx ); assert( pParent->nOverflow==0 || pParent->aiOvfl[0]==iParentIdx );
if( !aOvflSpace ){ if( !aOvflSpace ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
assert( pParent->nFree>=0 ); assert( pParent->nFree>=0 );
@ -7827,7 +7827,7 @@ static int balance_nonroot(
assert( szScratch<=7*(int)pBt->pageSize ); assert( szScratch<=7*(int)pBt->pageSize );
b.apCell = sqlite3StackAllocRaw(0, szScratch ); b.apCell = sqlite3StackAllocRaw(0, szScratch );
if( b.apCell==0 ){ if( b.apCell==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto balance_cleanup; goto balance_cleanup;
} }
b.szCell = (u16*)&b.apCell[nMaxCells]; b.szCell = (u16*)&b.apCell[nMaxCells];

24
source/libs/tdb/src/sqlite/pager.c
View File

@ -2499,7 +2499,7 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
*/ */
pSuper = (sqlite3_file *)sqlite3MallocZero(pVfs->szOsFile * 2); pSuper = (sqlite3_file *)sqlite3MallocZero(pVfs->szOsFile * 2);
if( !pSuper ){ if( !pSuper ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
pJournal = 0; pJournal = 0;
}else{ }else{
const int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_SUPER_JOURNAL); const int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_SUPER_JOURNAL);
@ -2518,7 +2518,7 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
nSuperPtr = pVfs->mxPathname+1; nSuperPtr = pVfs->mxPathname+1;
zFree = sqlite3Malloc(4 + nSuperJournal + nSuperPtr + 2); zFree = sqlite3Malloc(4 + nSuperJournal + nSuperPtr + 2);
if( !zFree ){ if( !zFree ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto delsuper_out; goto delsuper_out;
} }
zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0; zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0;
@ -3358,7 +3358,7 @@ static int pagerPlaybackSavepoint(Pager *pPager, PagerSavepoint *pSavepoint){
if( pSavepoint ){ if( pSavepoint ){
pDone = sqlite3BitvecCreate(pSavepoint->nOrig); pDone = sqlite3BitvecCreate(pSavepoint->nOrig);
if( !pDone ){ if( !pDone ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
} }
@ -3725,7 +3725,7 @@ int sqlite3PagerSetPagesize(Pager *pPager, u32 *pPageSize, int nReserve){
* cell header parser will never run off the end of the allocation */ * cell header parser will never run off the end of the allocation */
pNew = (char *)sqlite3PageMalloc(pageSize+8); pNew = (char *)sqlite3PageMalloc(pageSize+8);
if( !pNew ){ if( !pNew ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
}else{ }else{
memset(pNew+pageSize, 0, 8); memset(pNew+pageSize, 0, 8);
} }
@ -4009,7 +4009,7 @@ static int pagerAcquireMapPage(
*ppPage = p = (PgHdr *)sqlite3MallocZero(sizeof(PgHdr) + pPager->nExtra); *ppPage = p = (PgHdr *)sqlite3MallocZero(sizeof(PgHdr) + pPager->nExtra);
if( p==0 ){ if( p==0 ){
sqlite3OsUnfetch(pPager->fd, (i64)(pgno-1) * pPager->pageSize, pData); sqlite3OsUnfetch(pPager->fd, (i64)(pgno-1) * pPager->pageSize, pData);
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
p->pExtra = (void *)&p[1]; p->pExtra = (void *)&p[1];
p->flags = PGHDR_MMAP; p->flags = PGHDR_MMAP;
@ -4695,7 +4695,7 @@ int sqlite3PagerOpen(
memDb = 1; memDb = 1;
if( zFilename && zFilename[0] ){ if( zFilename && zFilename[0] ){
zPathname = sqlite3DbStrDup(0, zFilename); zPathname = sqlite3DbStrDup(0, zFilename);
if( zPathname==0 ) return SQLITE_NOMEM_BKPT; if( zPathname==0 ) return SQLITE_NOMEM;
nPathname = sqlite3Strlen30(zPathname); nPathname = sqlite3Strlen30(zPathname);
zFilename = 0; zFilename = 0;
} }
@ -4711,7 +4711,7 @@ int sqlite3PagerOpen(
nPathname = pVfs->mxPathname+1; nPathname = pVfs->mxPathname+1;
zPathname = sqlite3DbMallocRaw(0, nPathname*2); zPathname = sqlite3DbMallocRaw(0, nPathname*2);
if( zPathname==0 ){ if( zPathname==0 ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
zPathname[0] = 0; /* Make sure initialized even if FullPathname() fails */ zPathname[0] = 0; /* Make sure initialized even if FullPathname() fails */
rc = sqlite3OsFullPathname(pVfs, zFilename, nPathname, zPathname); rc = sqlite3OsFullPathname(pVfs, zFilename, nPathname, zPathname);
@ -4810,7 +4810,7 @@ int sqlite3PagerOpen(
assert( EIGHT_BYTE_ALIGNMENT(SQLITE_INT_TO_PTR(journalFileSize)) ); assert( EIGHT_BYTE_ALIGNMENT(SQLITE_INT_TO_PTR(journalFileSize)) );
if( !pPtr ){ if( !pPtr ){
sqlite3DbFree(0, zPathname); sqlite3DbFree(0, zPathname);
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
pPager = (Pager*)pPtr; pPtr += ROUND8(sizeof(*pPager)); pPager = (Pager*)pPtr; pPtr += ROUND8(sizeof(*pPager));
pPager->pPCache = (PCache*)pPtr; pPtr += ROUND8(pcacheSize); pPager->pPCache = (PCache*)pPtr; pPtr += ROUND8(pcacheSize);
@ -5490,7 +5490,7 @@ static int getPageNormal(
rc = sqlite3PcacheFetchStress(pPager->pPCache, pgno, &pBase); rc = sqlite3PcacheFetchStress(pPager->pPCache, pgno, &pBase);
if( rc!=SQLITE_OK ) goto pager_acquire_err; if( rc!=SQLITE_OK ) goto pager_acquire_err;
if( pBase==0 ){ if( pBase==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto pager_acquire_err; goto pager_acquire_err;
} }
} }
@ -5760,7 +5760,7 @@ static int pager_open_journal(Pager *pPager){
if( !pagerUseWal(pPager) && pPager->journalMode!=PAGER_JOURNALMODE_OFF ){ if( !pagerUseWal(pPager) && pPager->journalMode!=PAGER_JOURNALMODE_OFF ){
pPager->pInJournal = sqlite3BitvecCreate(pPager->dbSize); pPager->pInJournal = sqlite3BitvecCreate(pPager->dbSize);
if( pPager->pInJournal==0 ){ if( pPager->pInJournal==0 ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
/* Open the journal file if it is not already open. */ /* Open the journal file if it is not already open. */
@ -6841,7 +6841,7 @@ static SQLITE_NOINLINE int pagerOpenSavepoint(Pager *pPager, int nSavepoint){
pPager->aSavepoint, sizeof(PagerSavepoint)*nSavepoint pPager->aSavepoint, sizeof(PagerSavepoint)*nSavepoint
); );
if( !aNew ){ if( !aNew ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
memset(&aNew[nCurrent], 0, (nSavepoint-nCurrent) * sizeof(PagerSavepoint)); memset(&aNew[nCurrent], 0, (nSavepoint-nCurrent) * sizeof(PagerSavepoint));
pPager->aSavepoint = aNew; pPager->aSavepoint = aNew;
@ -6858,7 +6858,7 @@ static SQLITE_NOINLINE int pagerOpenSavepoint(Pager *pPager, int nSavepoint){
aNew[ii].pInSavepoint = sqlite3BitvecCreate(pPager->dbSize); aNew[ii].pInSavepoint = sqlite3BitvecCreate(pPager->dbSize);
aNew[ii].bTruncateOnRelease = 1; aNew[ii].bTruncateOnRelease = 1;
if( !aNew[ii].pInSavepoint ){ if( !aNew[ii].pInSavepoint ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
if( pagerUseWal(pPager) ){ if( pagerUseWal(pPager) ){
sqlite3WalSavepoint(pPager->pWal, aNew[ii].aWalData); sqlite3WalSavepoint(pPager->pWal, aNew[ii].aWalData);

529
source/libs/tdb/src/sqlite/pcache.c
View File

@ -48,8 +48,8 @@ struct PCache {
int szExtra; /* Size of extra space for each page */ int szExtra; /* Size of extra space for each page */
u8 bPurgeable; /* True if pages are on backing store */ u8 bPurgeable; /* True if pages are on backing store */
u8 eCreate; /* eCreate value for for xFetch() */ u8 eCreate; /* eCreate value for for xFetch() */
int (*xStress)(void*,PgHdr*); /* Call to try make a page clean */ int (*xStress)(void *, PgHdr *); /* Call to try make a page clean */
void *pStress; /* Argument to xStress */ void * pStress; /* Argument to xStress */
sqlite3_pcache *pCache; /* Pluggable cache module */ sqlite3_pcache *pCache; /* Pluggable cache module */
}; };
@ -63,84 +63,86 @@ struct PCache {
** is displayed for many operations, resulting in a lot of output. ** is displayed for many operations, resulting in a lot of output.
*/ */
#if defined(SQLITE_DEBUG) && 0 #if defined(SQLITE_DEBUG) && 0
int sqlite3PcacheTrace = 2; /* 0: off 1: simple 2: cache dumps */ int sqlite3PcacheTrace = 2; /* 0: off 1: simple 2: cache dumps */
int sqlite3PcacheMxDump = 9999; /* Max cache entries for pcacheDump() */ int sqlite3PcacheMxDump = 9999; /* Max cache entries for pcacheDump() */
# define pcacheTrace(X) if(sqlite3PcacheTrace){sqlite3DebugPrintf X;} #define pcacheTrace(X) \
void pcacheDump(PCache *pCache){ if (sqlite3PcacheTrace) { \
sqlite3DebugPrintf X; \
}
void pcacheDump(PCache *pCache) {
int N; int N;
int i, j; int i, j;
sqlite3_pcache_page *pLower; sqlite3_pcache_page *pLower;
PgHdr *pPg; PgHdr * pPg;
unsigned char *a; unsigned char * a;
if( sqlite3PcacheTrace<2 ) return; if (sqlite3PcacheTrace < 2) return;
if( pCache->pCache==0 ) return; if (pCache->pCache == 0) return;
N = sqlite3PcachePagecount(pCache); N = sqlite3PcachePagecount(pCache);
if( N>sqlite3PcacheMxDump ) N = sqlite3PcacheMxDump; if (N > sqlite3PcacheMxDump) N = sqlite3PcacheMxDump;
for(i=1; i<=N; i++){ for (i = 1; i <= N; i++) {
pLower = pcache2.xFetch(pCache->pCache, i, 0); pLower = pcache2.xFetch(pCache->pCache, i, 0);
if( pLower==0 ) continue; if (pLower == 0) continue;
pPg = (PgHdr*)pLower->pExtra; pPg = (PgHdr *)pLower->pExtra;
printf("%3d: nRef %2d flgs %02x data ", i, pPg->nRef, pPg->flags); printf("%3d: nRef %2d flgs %02x data ", i, pPg->nRef, pPg->flags);
a = (unsigned char *)pLower->pBuf; a = (unsigned char *)pLower->pBuf;
for(j=0; j<12; j++) printf("%02x", a[j]); for (j = 0; j < 12; j++) printf("%02x", a[j]);
printf("\n"); printf("\n");
if( pPg->pPage==0 ){ if (pPg->pPage == 0) {
pcache2.xUnpin(pCache->pCache, pLower, 0); pcache2.xUnpin(pCache->pCache, pLower, 0);
} }
} }
} }
#else #else
# define pcacheTrace(X) #define pcacheTrace(X)
# define pcacheDump(X) #define pcacheDump(X)
#endif #endif
/* // /*
** Check invariants on a PgHdr entry. Return true if everything is OK. // ** Check invariants on a PgHdr entry. Return true if everything is OK.
** Return false if any invariant is violated. // ** Return false if any invariant is violated.
** // **
** This routine is for use inside of assert() statements only. For // ** This routine is for use inside of assert() statements only. For
** example: // ** example:
** // **
** assert( sqlite3PcachePageSanity(pPg) ); // ** assert( sqlite3PcachePageSanity(pPg) );
*/ // */
#ifdef SQLITE_DEBUG // #ifdef SQLITE_DEBUG
int sqlite3PcachePageSanity(PgHdr *pPg){ // int sqlite3PcachePageSanity(PgHdr *pPg) {
PCache *pCache; // PCache *pCache;
assert( pPg!=0 ); // assert(pPg != 0);
assert( pPg->pgno>0 || pPg->pPager==0 ); /* Page number is 1 or more */ // assert(pPg->pgno > 0 || pPg->pPager == 0); /* Page number is 1 or more */
pCache = pPg->pCache; // pCache = pPg->pCache;
assert( pCache!=0 ); /* Every page has an associated PCache */ // assert(pCache != 0); /* Every page has an associated PCache */
if( pPg->flags & PGHDR_CLEAN ){ // if (pPg->flags & PGHDR_CLEAN) {
assert( (pPg->flags & PGHDR_DIRTY)==0 );/* Cannot be both CLEAN and DIRTY */ // assert((pPg->flags & PGHDR_DIRTY) == 0); /* Cannot be both CLEAN and DIRTY */
assert( pCache->pDirty!=pPg ); /* CLEAN pages not on dirty list */ // assert(pCache->pDirty != pPg); /* CLEAN pages not on dirty list */
assert( pCache->pDirtyTail!=pPg ); // assert(pCache->pDirtyTail != pPg);
} // }
/* WRITEABLE pages must also be DIRTY */ // /* WRITEABLE pages must also be DIRTY */
if( pPg->flags & PGHDR_WRITEABLE ){ // if (pPg->flags & PGHDR_WRITEABLE) {
assert( pPg->flags & PGHDR_DIRTY ); /* WRITEABLE implies DIRTY */ // assert(pPg->flags & PGHDR_DIRTY); /* WRITEABLE implies DIRTY */
} // }
/* NEED_SYNC can be set independently of WRITEABLE. This can happen, // /* NEED_SYNC can be set independently of WRITEABLE. This can happen,
** for example, when using the sqlite3PagerDontWrite() optimization: // ** for example, when using the sqlite3PagerDontWrite() optimization:
** (1) Page X is journalled, and gets WRITEABLE and NEED_SEEK. // ** (1) Page X is journalled, and gets WRITEABLE and NEED_SEEK.
** (2) Page X moved to freelist, WRITEABLE is cleared // ** (2) Page X moved to freelist, WRITEABLE is cleared
** (3) Page X reused, WRITEABLE is set again // ** (3) Page X reused, WRITEABLE is set again
** If NEED_SYNC had been cleared in step 2, then it would not be reset // ** If NEED_SYNC had been cleared in step 2, then it would not be reset
** in step 3, and page might be written into the database without first // ** in step 3, and page might be written into the database without first
** syncing the rollback journal, which might cause corruption on a power // ** syncing the rollback journal, which might cause corruption on a power
** loss. // ** loss.
** // **
** Another example is when the database page size is smaller than the // ** Another example is when the database page size is smaller than the
** disk sector size. When any page of a sector is journalled, all pages // ** disk sector size. When any page of a sector is journalled, all pages
** in that sector are marked NEED_SYNC even if they are still CLEAN, just // ** in that sector are marked NEED_SYNC even if they are still CLEAN, just
** in case they are later modified, since all pages in the same sector // ** in case they are later modified, since all pages in the same sector
** must be journalled and synced before any of those pages can be safely // ** must be journalled and synced before any of those pages can be safely
** written. // ** written.
*/ // */
return 1; // return 1;
} // }
#endif /* SQLITE_DEBUG */ // #endif /* SQLITE_DEBUG */
/********************************** Linked List Management ********************/ /********************************** Linked List Management ********************/
@ -155,53 +157,51 @@ int sqlite3PcachePageSanity(PgHdr *pPg){
** remove pPage from the dirty list. The 0x02 means add pPage back to ** remove pPage from the dirty list. The 0x02 means add pPage back to
** the dirty list. Doing both moves pPage to the front of the dirty list. ** the dirty list. Doing both moves pPage to the front of the dirty list.
*/ */
static void pcacheManageDirtyList(PgHdr *pPage, u8 addRemove){ static void pcacheManageDirtyList(PgHdr *pPage, u8 addRemove) {
PCache *p = pPage->pCache; PCache *p = pPage->pCache;
pcacheTrace(("%p.DIRTYLIST.%s %d\n", p, pcacheTrace(("%p.DIRTYLIST.%s %d\n", p, addRemove == 1 ? "REMOVE" : addRemove == 2 ? "ADD" : "FRONT", pPage->pgno));
addRemove==1 ? "REMOVE" : addRemove==2 ? "ADD" : "FRONT", if (addRemove & PCACHE_DIRTYLIST_REMOVE) {
pPage->pgno)); assert(pPage->pDirtyNext || pPage == p->pDirtyTail);
if( addRemove & PCACHE_DIRTYLIST_REMOVE ){ assert(pPage->pDirtyPrev || pPage == p->pDirty);
assert( pPage->pDirtyNext || pPage==p->pDirtyTail );
assert( pPage->pDirtyPrev || pPage==p->pDirty );
/* Update the PCache1.pSynced variable if necessary. */ /* Update the PCache1.pSynced variable if necessary. */
if( p->pSynced==pPage ){ if (p->pSynced == pPage) {
p->pSynced = pPage->pDirtyPrev; p->pSynced = pPage->pDirtyPrev;
} }
if( pPage->pDirtyNext ){ if (pPage->pDirtyNext) {
pPage->pDirtyNext->pDirtyPrev = pPage->pDirtyPrev; pPage->pDirtyNext->pDirtyPrev = pPage->pDirtyPrev;
}else{ } else {
assert( pPage==p->pDirtyTail ); assert(pPage == p->pDirtyTail);
p->pDirtyTail = pPage->pDirtyPrev; p->pDirtyTail = pPage->pDirtyPrev;
} }
if( pPage->pDirtyPrev ){ if (pPage->pDirtyPrev) {
pPage->pDirtyPrev->pDirtyNext = pPage->pDirtyNext; pPage->pDirtyPrev->pDirtyNext = pPage->pDirtyNext;
}else{ } else {
/* If there are now no dirty pages in the cache, set eCreate to 2. /* If there are now no dirty pages in the cache, set eCreate to 2.
** This is an optimization that allows sqlite3PcacheFetch() to skip ** This is an optimization that allows sqlite3PcacheFetch() to skip
** searching for a dirty page to eject from the cache when it might ** searching for a dirty page to eject from the cache when it might
** otherwise have to. */ ** otherwise have to. */
assert( pPage==p->pDirty ); assert(pPage == p->pDirty);
p->pDirty = pPage->pDirtyNext; p->pDirty = pPage->pDirtyNext;
assert( p->bPurgeable || p->eCreate==2 ); assert(p->bPurgeable || p->eCreate == 2);
if( p->pDirty==0 ){ /*OPTIMIZATION-IF-TRUE*/ if (p->pDirty == 0) { /*OPTIMIZATION-IF-TRUE*/
assert( p->bPurgeable==0 || p->eCreate==1 ); assert(p->bPurgeable == 0 || p->eCreate == 1);
p->eCreate = 2; p->eCreate = 2;
} }
} }
} }
if( addRemove & PCACHE_DIRTYLIST_ADD ){ if (addRemove & PCACHE_DIRTYLIST_ADD) {
pPage->pDirtyPrev = 0; pPage->pDirtyPrev = 0;
pPage->pDirtyNext = p->pDirty; pPage->pDirtyNext = p->pDirty;
if( pPage->pDirtyNext ){ if (pPage->pDirtyNext) {
assert( pPage->pDirtyNext->pDirtyPrev==0 ); assert(pPage->pDirtyNext->pDirtyPrev == 0);
pPage->pDirtyNext->pDirtyPrev = pPage; pPage->pDirtyNext->pDirtyPrev = pPage;
}else{ } else {
p->pDirtyTail = pPage; p->pDirtyTail = pPage;
if( p->bPurgeable ){ if (p->bPurgeable) {
assert( p->eCreate==2 ); assert(p->eCreate == 2);
p->eCreate = 1; p->eCreate = 1;
} }
} }
@ -212,9 +212,8 @@ static void pcacheManageDirtyList(PgHdr *pPage, u8 addRemove){
** optimization, as if pSynced points to a page with the NEED_SYNC ** optimization, as if pSynced points to a page with the NEED_SYNC
** flag set sqlite3PcacheFetchStress() searches through all newer ** flag set sqlite3PcacheFetchStress() searches through all newer
** entries of the dirty-list for a page with NEED_SYNC clear anyway. */ ** entries of the dirty-list for a page with NEED_SYNC clear anyway. */
if( !p->pSynced if (!p->pSynced && 0 == (pPage->flags & PGHDR_NEED_SYNC) /*OPTIMIZATION-IF-FALSE*/
&& 0==(pPage->flags&PGHDR_NEED_SYNC) /*OPTIMIZATION-IF-FALSE*/ ) {
){
p->pSynced = pPage; p->pSynced = pPage;
} }
} }
@ -225,8 +224,8 @@ static void pcacheManageDirtyList(PgHdr *pPage, u8 addRemove){
** Wrapper around the pluggable caches xUnpin method. If the cache is ** Wrapper around the pluggable caches xUnpin method. If the cache is
** being used for an in-memory database, this function is a no-op. ** being used for an in-memory database, this function is a no-op.
*/ */
static void pcacheUnpin(PgHdr *p){ static void pcacheUnpin(PgHdr *p) {
if( p->pCache->bPurgeable ){ if (p->pCache->bPurgeable) {
pcacheTrace(("%p.UNPIN %d\n", p->pCache, p->pgno)); pcacheTrace(("%p.UNPIN %d\n", p->pCache, p->pgno));
pcache2.xUnpin(p->pCache->pCache, p->pPage, 0); pcache2.xUnpin(p->pCache->pCache, p->pPage, 0);
pcacheDump(p->pCache); pcacheDump(p->pCache);
@ -237,19 +236,19 @@ static void pcacheUnpin(PgHdr *p){
** Compute the number of pages of cache requested. p->szCache is the ** Compute the number of pages of cache requested. p->szCache is the
** cache size requested by the "PRAGMA cache_size" statement. ** cache size requested by the "PRAGMA cache_size" statement.
*/ */
static int numberOfCachePages(PCache *p){ static int numberOfCachePages(PCache *p) {
if( p->szCache>=0 ){ if (p->szCache >= 0) {
/* IMPLEMENTATION-OF: R-42059-47211 If the argument N is positive then the /* IMPLEMENTATION-OF: R-42059-47211 If the argument N is positive then the
** suggested cache size is set to N. */ ** suggested cache size is set to N. */
return p->szCache; return p->szCache;
}else{ } else {
i64 n; i64 n;
/* IMPLEMANTATION-OF: R-59858-46238 If the argument N is negative, then the /* IMPLEMANTATION-OF: R-59858-46238 If the argument N is negative, then the
** number of cache pages is adjusted to be a number of pages that would ** number of cache pages is adjusted to be a number of pages that would
** use approximately abs(N*1024) bytes of memory based on the current ** use approximately abs(N*1024) bytes of memory based on the current
** page size. */ ** page size. */
n = ((-1024*(i64)p->szCache)/(p->szPage+p->szExtra)); n = ((-1024 * (i64)p->szCache) / (p->szPage + p->szExtra));
if( n>1000000000 ) n = 1000000000; if (n > 1000000000) n = 1000000000;
return (int)n; return (int)n;
} }
} }
@ -259,11 +258,9 @@ static int numberOfCachePages(PCache *p){
** Initialize and shutdown the page cache subsystem. Neither of these ** Initialize and shutdown the page cache subsystem. Neither of these
** functions are threadsafe. ** functions are threadsafe.
*/ */
int sqlite3PcacheInitialize(void){ int sqlite3PcacheInitialize(void) { return pcache2.xInit(pcache2.pArg); }
return pcache2.xInit(pcache2.pArg); void sqlite3PcacheShutdown(void) {
} if (pcache2.xShutdown) {
void sqlite3PcacheShutdown(void){
if( pcache2.xShutdown ){
/* IMPLEMENTATION-OF: R-26000-56589 The xShutdown() method may be NULL. */ /* IMPLEMENTATION-OF: R-26000-56589 The xShutdown() method may be NULL. */
pcache2.xShutdown(pcache2.pArg); pcache2.xShutdown(pcache2.pArg);
} }
@ -272,7 +269,7 @@ void sqlite3PcacheShutdown(void){
/* /*
** Return the size in bytes of a PCache object. ** Return the size in bytes of a PCache object.
*/ */
int sqlite3PcacheSize(void){ return sizeof(PCache); } int sqlite3PcacheSize(void) { return sizeof(PCache); }
/* /*
** Create a new PCache object. Storage space to hold the object ** Create a new PCache object. Storage space to hold the object
@ -286,25 +283,24 @@ int sqlite3PcacheSize(void){ return sizeof(PCache); }
** to this module, the extra space really ends up being the MemPage ** to this module, the extra space really ends up being the MemPage
** structure in the pager. ** structure in the pager.
*/ */
int sqlite3PcacheOpen( int sqlite3PcacheOpen(int szPage, /* Size of every page */
int szPage, /* Size of every page */
int szExtra, /* Extra space associated with each page */ int szExtra, /* Extra space associated with each page */
int bPurgeable, /* True if pages are on backing store */ int bPurgeable, /* True if pages are on backing store */
int (*xStress)(void*,PgHdr*),/* Call to try to make pages clean */ int (*xStress)(void *, PgHdr *), /* Call to try to make pages clean */
void *pStress, /* Argument to xStress */ void * pStress, /* Argument to xStress */
PCache *p /* Preallocated space for the PCache */ PCache *p /* Preallocated space for the PCache */
){ ) {
memset(p, 0, sizeof(PCache)); memset(p, 0, sizeof(PCache));
p->szPage = 1; p->szPage = 1;
p->szExtra = szExtra; p->szExtra = szExtra;
assert( szExtra>=8 ); /* First 8 bytes will be zeroed */ assert(szExtra >= 8); /* First 8 bytes will be zeroed */
p->bPurgeable = bPurgeable; p->bPurgeable = bPurgeable;
p->eCreate = 2; p->eCreate = 2;
p->xStress = xStress; p->xStress = xStress;
p->pStress = pStress; p->pStress = pStress;
p->szCache = 100; p->szCache = 100;
p->szSpill = 1; p->szSpill = 1;
pcacheTrace(("%p.OPEN szPage %d bPurgeable %d\n",p,szPage,bPurgeable)); pcacheTrace(("%p.OPEN szPage %d bPurgeable %d\n", p, szPage, bPurgeable));
return sqlite3PcacheSetPageSize(p, szPage); return sqlite3PcacheSetPageSize(p, szPage);
} }
@ -312,22 +308,19 @@ int sqlite3PcacheOpen(
** Change the page size for PCache object. The caller must ensure that there ** Change the page size for PCache object. The caller must ensure that there
** are no outstanding page references when this function is called. ** are no outstanding page references when this function is called.
*/ */
int sqlite3PcacheSetPageSize(PCache *pCache, int szPage){ int sqlite3PcacheSetPageSize(PCache *pCache, int szPage) {
assert( pCache->nRefSum==0 && pCache->pDirty==0 ); assert(pCache->nRefSum == 0 && pCache->pDirty == 0);
if( pCache->szPage ){ if (pCache->szPage) {
sqlite3_pcache *pNew; sqlite3_pcache *pNew;
pNew = pcache2.xCreate( pNew = pcache2.xCreate(szPage, pCache->szExtra + ROUND8(sizeof(PgHdr)), pCache->bPurgeable);
szPage, pCache->szExtra + ROUND8(sizeof(PgHdr)), if (pNew == 0) return SQLITE_NOMEM;
pCache->bPurgeable
);
if( pNew==0 ) return SQLITE_NOMEM_BKPT;
pcache2.xCachesize(pNew, numberOfCachePages(pCache)); pcache2.xCachesize(pNew, numberOfCachePages(pCache));
if( pCache->pCache ){ if (pCache->pCache) {
pcache2.xDestroy(pCache->pCache); pcache2.xDestroy(pCache->pCache);
} }
pCache->pCache = pNew; pCache->pCache = pNew;
pCache->szPage = szPage; pCache->szPage = szPage;
pcacheTrace(("%p.PAGESIZE %d\n",pCache,szPage)); pcacheTrace(("%p.PAGESIZE %d\n", pCache, szPage));
} }
return 0; return 0;
} }
@ -356,18 +349,17 @@ int sqlite3PcacheSetPageSize(PCache *pCache, int szPage){
** the stack on entry and pop them back off on exit, which saves a ** the stack on entry and pop them back off on exit, which saves a
** lot of pushing and popping. ** lot of pushing and popping.
*/ */
sqlite3_pcache_page *sqlite3PcacheFetch( sqlite3_pcache_page *sqlite3PcacheFetch(PCache *pCache, /* Obtain the page from this cache */
PCache *pCache, /* Obtain the page from this cache */
Pgno pgno, /* Page number to obtain */ Pgno pgno, /* Page number to obtain */
int createFlag /* If true, create page if it does not exist already */ int createFlag /* If true, create page if it does not exist already */
){ ) {
int eCreate; int eCreate;
sqlite3_pcache_page *pRes; sqlite3_pcache_page *pRes;
assert( pCache!=0 ); assert(pCache != 0);
assert( pCache->pCache!=0 ); assert(pCache->pCache != 0);
assert( createFlag==3 || createFlag==0 ); assert(createFlag == 3 || createFlag == 0);
assert( pCache->eCreate==((pCache->bPurgeable && pCache->pDirty) ? 1 : 2) ); assert(pCache->eCreate == ((pCache->bPurgeable && pCache->pDirty) ? 1 : 2));
/* eCreate defines what to do if the page does not exist. /* eCreate defines what to do if the page does not exist.
** 0 Do not allocate a new page. (createFlag==0) ** 0 Do not allocate a new page. (createFlag==0)
@ -377,12 +369,11 @@ sqlite3_pcache_page *sqlite3PcacheFetch(
** (createFlag==1 AND !(bPurgeable AND pDirty) ** (createFlag==1 AND !(bPurgeable AND pDirty)
*/ */
eCreate = createFlag & pCache->eCreate; eCreate = createFlag & pCache->eCreate;
assert( eCreate==0 || eCreate==1 || eCreate==2 ); assert(eCreate == 0 || eCreate == 1 || eCreate == 2);
assert( createFlag==0 || pCache->eCreate==eCreate ); assert(createFlag == 0 || pCache->eCreate == eCreate);
assert( createFlag==0 || eCreate==1+(!pCache->bPurgeable||!pCache->pDirty) ); assert(createFlag == 0 || eCreate == 1 + (!pCache->bPurgeable || !pCache->pDirty));
pRes = pcache2.xFetch(pCache->pCache, pgno, eCreate); pRes = pcache2.xFetch(pCache->pCache, pgno, eCreate);
pcacheTrace(("%p.FETCH %d%s (result: %p)\n",pCache,pgno, pcacheTrace(("%p.FETCH %d%s (result: %p)\n", pCache, pgno, createFlag ? " create" : "", pRes));
createFlag?" create":"",pRes));
return pRes; return pRes;
} }
@ -397,15 +388,14 @@ sqlite3_pcache_page *sqlite3PcacheFetch(
** **
** This routine should be invoked only after sqlite3PcacheFetch() fails. ** This routine should be invoked only after sqlite3PcacheFetch() fails.
*/ */
int sqlite3PcacheFetchStress( int sqlite3PcacheFetchStress(PCache * pCache, /* Obtain the page from this cache */
PCache *pCache, /* Obtain the page from this cache */
Pgno pgno, /* Page number to obtain */ Pgno pgno, /* Page number to obtain */
sqlite3_pcache_page **ppPage /* Write result here */ sqlite3_pcache_page **ppPage /* Write result here */
){ ) {
PgHdr *pPg; PgHdr *pPg;
if( pCache->eCreate==2 ) return 0; if (pCache->eCreate == 2) return 0;
if( sqlite3PcachePagecount(pCache)>pCache->szSpill ){ if (sqlite3PcachePagecount(pCache) > pCache->szSpill) {
/* Find a dirty page to write-out and recycle. First try to find a /* Find a dirty page to write-out and recycle. First try to find a
** page that does not require a journal-sync (one with PGHDR_NEED_SYNC ** page that does not require a journal-sync (one with PGHDR_NEED_SYNC
** cleared), but if that is not possible settle for any other ** cleared), but if that is not possible settle for any other
@ -415,33 +405,29 @@ int sqlite3PcacheFetchStress(
** flag is currently referenced, then the following may leave pSynced ** flag is currently referenced, then the following may leave pSynced
** set incorrectly (pointing to other than the LRU page with NEED_SYNC ** set incorrectly (pointing to other than the LRU page with NEED_SYNC
** cleared). This is Ok, as pSynced is just an optimization. */ ** cleared). This is Ok, as pSynced is just an optimization. */
for(pPg=pCache->pSynced; for (pPg = pCache->pSynced; pPg && (pPg->nRef || (pPg->flags & PGHDR_NEED_SYNC)); pPg = pPg->pDirtyPrev)
pPg && (pPg->nRef || (pPg->flags&PGHDR_NEED_SYNC)); ;
pPg=pPg->pDirtyPrev
);
pCache->pSynced = pPg; pCache->pSynced = pPg;
if( !pPg ){ if (!pPg) {
for(pPg=pCache->pDirtyTail; pPg && pPg->nRef; pPg=pPg->pDirtyPrev); for (pPg = pCache->pDirtyTail; pPg && pPg->nRef; pPg = pPg->pDirtyPrev)
;
} }
if( pPg ){ if (pPg) {
int rc; int rc;
#ifdef SQLITE_LOG_CACHE_SPILL #ifdef SQLITE_LOG_CACHE_SPILL
sqlite3_log(SQLITE_FULL, sqlite3_log(SQLITE_FULL, "spill page %d making room for %d - cache used: %d/%d", pPg->pgno, pgno,
"spill page %d making room for %d - cache used: %d/%d", pcache2.xPagecount(pCache->pCache), numberOfCachePages(pCache));
pPg->pgno, pgno,
pcache2.xPagecount(pCache->pCache),
numberOfCachePages(pCache));
#endif #endif
pcacheTrace(("%p.SPILL %d\n",pCache,pPg->pgno)); pcacheTrace(("%p.SPILL %d\n", pCache, pPg->pgno));
rc = pCache->xStress(pCache->pStress, pPg); rc = pCache->xStress(pCache->pStress, pPg);
pcacheDump(pCache); pcacheDump(pCache);
if( rc!=0 && rc!=SQLITE_BUSY ){ if (rc != 0 && rc != SQLITE_BUSY) {
return rc; return rc;
} }
} }
} }
*ppPage = pcache2.xFetch(pCache->pCache, pgno, 2); *ppPage = pcache2.xFetch(pCache->pCache, pgno, 2);
return *ppPage==0 ? SQLITE_NOMEM_BKPT : 0; return *ppPage == 0 ? SQLITE_NOMEM : 0;
} }
/* /*
@ -453,16 +439,15 @@ int sqlite3PcacheFetchStress(
** requires extra stack manipulation that can be avoided in the common ** requires extra stack manipulation that can be avoided in the common
** case. ** case.
*/ */
static SQLITE_NOINLINE PgHdr *pcacheFetchFinishWithInit( static PgHdr *pcacheFetchFinishWithInit(PCache * pCache, /* Obtain the page from this cache */
PCache *pCache, /* Obtain the page from this cache */
Pgno pgno, /* Page number obtained */ Pgno pgno, /* Page number obtained */
sqlite3_pcache_page *pPage /* Page obtained by prior PcacheFetch() call */ sqlite3_pcache_page *pPage /* Page obtained by prior PcacheFetch() call */
){ ) {
PgHdr *pPgHdr; PgHdr *pPgHdr;
assert( pPage!=0 ); assert(pPage != 0);
pPgHdr = (PgHdr*)pPage->pExtra; pPgHdr = (PgHdr *)pPage->pExtra;
assert( pPgHdr->pPage==0 ); assert(pPgHdr->pPage == 0);
memset(&pPgHdr->pDirty, 0, sizeof(PgHdr) - offsetof(PgHdr,pDirty)); memset(&pPgHdr->pDirty, 0, sizeof(PgHdr) - offsetof(PgHdr, pDirty));
pPgHdr->pPage = pPage; pPgHdr->pPage = pPage;
pPgHdr->pData = pPage->pBuf; pPgHdr->pData = pPage->pBuf;
pPgHdr->pExtra = (void *)&pPgHdr[1]; pPgHdr->pExtra = (void *)&pPgHdr[1];
@ -470,7 +455,7 @@ static SQLITE_NOINLINE PgHdr *pcacheFetchFinishWithInit(
pPgHdr->pCache = pCache; pPgHdr->pCache = pCache;
pPgHdr->pgno = pgno; pPgHdr->pgno = pgno;
pPgHdr->flags = PGHDR_CLEAN; pPgHdr->flags = PGHDR_CLEAN;
return sqlite3PcacheFetchFinish(pCache,pgno,pPage); return sqlite3PcacheFetchFinish(pCache, pgno, pPage);
} }
/* /*
@ -479,22 +464,21 @@ static SQLITE_NOINLINE PgHdr *pcacheFetchFinishWithInit(
** must be called after sqlite3PcacheFetch() in order to get a usable ** must be called after sqlite3PcacheFetch() in order to get a usable
** result. ** result.
*/ */
PgHdr *sqlite3PcacheFetchFinish( PgHdr *sqlite3PcacheFetchFinish(PCache * pCache, /* Obtain the page from this cache */
PCache *pCache, /* Obtain the page from this cache */
Pgno pgno, /* Page number obtained */ Pgno pgno, /* Page number obtained */
sqlite3_pcache_page *pPage /* Page obtained by prior PcacheFetch() call */ sqlite3_pcache_page *pPage /* Page obtained by prior PcacheFetch() call */
){ ) {
PgHdr *pPgHdr; PgHdr *pPgHdr;
assert( pPage!=0 ); assert(pPage != 0);
pPgHdr = (PgHdr *)pPage->pExtra; pPgHdr = (PgHdr *)pPage->pExtra;
if( !pPgHdr->pPage ){ if (!pPgHdr->pPage) {
return pcacheFetchFinishWithInit(pCache, pgno, pPage); return pcacheFetchFinishWithInit(pCache, pgno, pPage);
} }
pCache->nRefSum++; pCache->nRefSum++;
pPgHdr->nRef++; pPgHdr->nRef++;
assert( sqlite3PcachePageSanity(pPgHdr) ); // assert(sqlite3PcachePageSanity(pPgHdr));
return pPgHdr; return pPgHdr;
} }
@ -502,13 +486,13 @@ PgHdr *sqlite3PcacheFetchFinish(
** Decrement the reference count on a page. If the page is clean and the ** Decrement the reference count on a page. If the page is clean and the
** reference count drops to 0, then it is made eligible for recycling. ** reference count drops to 0, then it is made eligible for recycling.
*/ */
void SQLITE_NOINLINE sqlite3PcacheRelease(PgHdr *p){ void sqlite3PcacheRelease(PgHdr *p) {
assert( p->nRef>0 ); assert(p->nRef > 0);
p->pCache->nRefSum--; p->pCache->nRefSum--;
if( (--p->nRef)==0 ){ if ((--p->nRef) == 0) {
if( p->flags&PGHDR_CLEAN ){ if (p->flags & PGHDR_CLEAN) {
pcacheUnpin(p); pcacheUnpin(p);
}else{ } else {
pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT); pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT);
} }
} }
@ -517,9 +501,9 @@ void SQLITE_NOINLINE sqlite3PcacheRelease(PgHdr *p){
/* /*
** Increase the reference count of a supplied page by 1. ** Increase the reference count of a supplied page by 1.
*/ */
void sqlite3PcacheRef(PgHdr *p){ void sqlite3PcacheRef(PgHdr *p) {
assert(p->nRef>0); assert(p->nRef > 0);
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
p->nRef++; p->nRef++;
p->pCache->nRefSum++; p->pCache->nRefSum++;
} }
@ -529,10 +513,10 @@ void sqlite3PcacheRef(PgHdr *p){
** page. This function deletes that reference, so after it returns the ** page. This function deletes that reference, so after it returns the
** page pointed to by p is invalid. ** page pointed to by p is invalid.
*/ */
void sqlite3PcacheDrop(PgHdr *p){ void sqlite3PcacheDrop(PgHdr *p) {
assert( p->nRef==1 ); assert(p->nRef == 1);
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
if( p->flags&PGHDR_DIRTY ){ if (p->flags & PGHDR_DIRTY) {
pcacheManageDirtyList(p, PCACHE_DIRTYLIST_REMOVE); pcacheManageDirtyList(p, PCACHE_DIRTYLIST_REMOVE);
} }
p->pCache->nRefSum--; p->pCache->nRefSum--;
@ -543,18 +527,18 @@ void sqlite3PcacheDrop(PgHdr *p){
** Make sure the page is marked as dirty. If it isn't dirty already, ** Make sure the page is marked as dirty. If it isn't dirty already,
** make it so. ** make it so.
*/ */
void sqlite3PcacheMakeDirty(PgHdr *p){ void sqlite3PcacheMakeDirty(PgHdr *p) {
assert( p->nRef>0 ); assert(p->nRef > 0);
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
if( p->flags & (PGHDR_CLEAN|PGHDR_DONT_WRITE) ){ /*OPTIMIZATION-IF-FALSE*/ if (p->flags & (PGHDR_CLEAN | PGHDR_DONT_WRITE)) { /*OPTIMIZATION-IF-FALSE*/
p->flags &= ~PGHDR_DONT_WRITE; p->flags &= ~PGHDR_DONT_WRITE;
if( p->flags & PGHDR_CLEAN ){ if (p->flags & PGHDR_CLEAN) {
p->flags ^= (PGHDR_DIRTY|PGHDR_CLEAN); p->flags ^= (PGHDR_DIRTY | PGHDR_CLEAN);
pcacheTrace(("%p.DIRTY %d\n",p->pCache,p->pgno)); pcacheTrace(("%p.DIRTY %d\n", p->pCache, p->pgno));
assert( (p->flags & (PGHDR_DIRTY|PGHDR_CLEAN))==PGHDR_DIRTY ); assert((p->flags & (PGHDR_DIRTY | PGHDR_CLEAN)) == PGHDR_DIRTY);
pcacheManageDirtyList(p, PCACHE_DIRTYLIST_ADD); pcacheManageDirtyList(p, PCACHE_DIRTYLIST_ADD);
} }
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
} }
} }
@ -562,16 +546,16 @@ void sqlite3PcacheMakeDirty(PgHdr *p){
** Make sure the page is marked as clean. If it isn't clean already, ** Make sure the page is marked as clean. If it isn't clean already,
** make it so. ** make it so.
*/ */
void sqlite3PcacheMakeClean(PgHdr *p){ void sqlite3PcacheMakeClean(PgHdr *p) {
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
assert( (p->flags & PGHDR_DIRTY)!=0 ); assert((p->flags & PGHDR_DIRTY) != 0);
assert( (p->flags & PGHDR_CLEAN)==0 ); assert((p->flags & PGHDR_CLEAN) == 0);
pcacheManageDirtyList(p, PCACHE_DIRTYLIST_REMOVE); pcacheManageDirtyList(p, PCACHE_DIRTYLIST_REMOVE);
p->flags &= ~(PGHDR_DIRTY|PGHDR_NEED_SYNC|PGHDR_WRITEABLE); p->flags &= ~(PGHDR_DIRTY | PGHDR_NEED_SYNC | PGHDR_WRITEABLE);
p->flags |= PGHDR_CLEAN; p->flags |= PGHDR_CLEAN;
pcacheTrace(("%p.CLEAN %d\n",p->pCache,p->pgno)); pcacheTrace(("%p.CLEAN %d\n", p->pCache, p->pgno));
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
if( p->nRef==0 ){ if (p->nRef == 0) {
pcacheUnpin(p); pcacheUnpin(p);
} }
} }
@ -579,10 +563,10 @@ void sqlite3PcacheMakeClean(PgHdr *p){
/* /*
** Make every page in the cache clean. ** Make every page in the cache clean.
*/ */
void sqlite3PcacheCleanAll(PCache *pCache){ void sqlite3PcacheCleanAll(PCache *pCache) {
PgHdr *p; PgHdr *p;
pcacheTrace(("%p.CLEAN-ALL\n",pCache)); pcacheTrace(("%p.CLEAN-ALL\n", pCache));
while( (p = pCache->pDirty)!=0 ){ while ((p = pCache->pDirty) != 0) {
sqlite3PcacheMakeClean(p); sqlite3PcacheMakeClean(p);
} }
} }
@ -590,11 +574,11 @@ void sqlite3PcacheCleanAll(PCache *pCache){
/* /*
** Clear the PGHDR_NEED_SYNC and PGHDR_WRITEABLE flag from all dirty pages. ** Clear the PGHDR_NEED_SYNC and PGHDR_WRITEABLE flag from all dirty pages.
*/ */
void sqlite3PcacheClearWritable(PCache *pCache){ void sqlite3PcacheClearWritable(PCache *pCache) {
PgHdr *p; PgHdr *p;
pcacheTrace(("%p.CLEAR-WRITEABLE\n",pCache)); pcacheTrace(("%p.CLEAR-WRITEABLE\n", pCache));
for(p=pCache->pDirty; p; p=p->pDirtyNext){ for (p = pCache->pDirty; p; p = p->pDirtyNext) {
p->flags &= ~(PGHDR_NEED_SYNC|PGHDR_WRITEABLE); p->flags &= ~(PGHDR_NEED_SYNC | PGHDR_WRITEABLE);
} }
pCache->pSynced = pCache->pDirtyTail; pCache->pSynced = pCache->pDirtyTail;
} }
@ -602,9 +586,9 @@ void sqlite3PcacheClearWritable(PCache *pCache){
/* /*
** Clear the PGHDR_NEED_SYNC flag from all dirty pages. ** Clear the PGHDR_NEED_SYNC flag from all dirty pages.
*/ */
void sqlite3PcacheClearSyncFlags(PCache *pCache){ void sqlite3PcacheClearSyncFlags(PCache *pCache) {
PgHdr *p; PgHdr *p;
for(p=pCache->pDirty; p; p=p->pDirtyNext){ for (p = pCache->pDirty; p; p = p->pDirtyNext) {
p->flags &= ~PGHDR_NEED_SYNC; p->flags &= ~PGHDR_NEED_SYNC;
} }
pCache->pSynced = pCache->pDirtyTail; pCache->pSynced = pCache->pDirtyTail;
@ -613,15 +597,15 @@ void sqlite3PcacheClearSyncFlags(PCache *pCache){
/* /*
** Change the page number of page p to newPgno. ** Change the page number of page p to newPgno.
*/ */
void sqlite3PcacheMove(PgHdr *p, Pgno newPgno){ void sqlite3PcacheMove(PgHdr *p, Pgno newPgno) {
PCache *pCache = p->pCache; PCache *pCache = p->pCache;
assert( p->nRef>0 ); assert(p->nRef > 0);
assert( newPgno>0 ); assert(newPgno > 0);
assert( sqlite3PcachePageSanity(p) ); // assert(sqlite3PcachePageSanity(p));
pcacheTrace(("%p.MOVE %d -> %d\n",pCache,p->pgno,newPgno)); pcacheTrace(("%p.MOVE %d -> %d\n", pCache, p->pgno, newPgno));
pcache2.xRekey(pCache->pCache, p->pPage, p->pgno,newPgno); pcache2.xRekey(pCache->pCache, p->pPage, p->pgno, newPgno);
p->pgno = newPgno; p->pgno = newPgno;
if( (p->flags&PGHDR_DIRTY) && (p->flags&PGHDR_NEED_SYNC) ){ if ((p->flags & PGHDR_DIRTY) && (p->flags & PGHDR_NEED_SYNC)) {
pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT); pcacheManageDirtyList(p, PCACHE_DIRTYLIST_FRONT);
} }
} }
@ -635,74 +619,72 @@ void sqlite3PcacheMove(PgHdr *p, Pgno newPgno){
** function is 0, then the data area associated with page 1 is zeroed, but ** function is 0, then the data area associated with page 1 is zeroed, but
** the page object is not dropped. ** the page object is not dropped.
*/ */
void sqlite3PcacheTruncate(PCache *pCache, Pgno pgno){ void sqlite3PcacheTruncate(PCache *pCache, Pgno pgno) {
if( pCache->pCache ){ if (pCache->pCache) {
PgHdr *p; PgHdr *p;
PgHdr *pNext; PgHdr *pNext;
pcacheTrace(("%p.TRUNCATE %d\n",pCache,pgno)); pcacheTrace(("%p.TRUNCATE %d\n", pCache, pgno));
for(p=pCache->pDirty; p; p=pNext){ for (p = pCache->pDirty; p; p = pNext) {
pNext = p->pDirtyNext; pNext = p->pDirtyNext;
/* This routine never gets call with a positive pgno except right /* This routine never gets call with a positive pgno except right
** after sqlite3PcacheCleanAll(). So if there are dirty pages, ** after sqlite3PcacheCleanAll(). So if there are dirty pages,
** it must be that pgno==0. ** it must be that pgno==0.
*/ */
assert( p->pgno>0 ); assert(p->pgno > 0);
if( p->pgno>pgno ){ if (p->pgno > pgno) {
assert( p->flags&PGHDR_DIRTY ); assert(p->flags & PGHDR_DIRTY);
sqlite3PcacheMakeClean(p); sqlite3PcacheMakeClean(p);
} }
} }
if( pgno==0 && pCache->nRefSum ){ if (pgno == 0 && pCache->nRefSum) {
sqlite3_pcache_page *pPage1; sqlite3_pcache_page *pPage1;
pPage1 = pcache2.xFetch(pCache->pCache,1,0); pPage1 = pcache2.xFetch(pCache->pCache, 1, 0);
if( ALWAYS(pPage1) ){ /* Page 1 is always available in cache, because if (ALWAYS(pPage1)) { /* Page 1 is always available in cache, because
** pCache->nRefSum>0 */ ** pCache->nRefSum>0 */
memset(pPage1->pBuf, 0, pCache->szPage); memset(pPage1->pBuf, 0, pCache->szPage);
pgno = 1; pgno = 1;
} }
} }
pcache2.xTruncate(pCache->pCache, pgno+1); pcache2.xTruncate(pCache->pCache, pgno + 1);
} }
} }
/* /*
** Close a cache. ** Close a cache.
*/ */
void sqlite3PcacheClose(PCache *pCache){ void sqlite3PcacheClose(PCache *pCache) {
assert( pCache->pCache!=0 ); assert(pCache->pCache != 0);
pcacheTrace(("%p.CLOSE\n",pCache)); pcacheTrace(("%p.CLOSE\n", pCache));
pcache2.xDestroy(pCache->pCache); pcache2.xDestroy(pCache->pCache);
} }
/* /*
** Discard the contents of the cache. ** Discard the contents of the cache.
*/ */
void sqlite3PcacheClear(PCache *pCache){ void sqlite3PcacheClear(PCache *pCache) { sqlite3PcacheTruncate(pCache, 0); }
sqlite3PcacheTruncate(pCache, 0);
}
/* /*
** Merge two lists of pages connected by pDirty and in pgno order. ** Merge two lists of pages connected by pDirty and in pgno order.
** Do not bother fixing the pDirtyPrev pointers. ** Do not bother fixing the pDirtyPrev pointers.
*/ */
static PgHdr *pcacheMergeDirtyList(PgHdr *pA, PgHdr *pB){ static PgHdr *pcacheMergeDirtyList(PgHdr *pA, PgHdr *pB) {
PgHdr result, *pTail; PgHdr result, *pTail;
pTail = &result; pTail = &result;
assert( pA!=0 && pB!=0 ); assert(pA != 0 && pB != 0);
for(;;){ for (;;) {
if( pA->pgno<pB->pgno ){ if (pA->pgno < pB->pgno) {
pTail->pDirty = pA; pTail->pDirty = pA;
pTail = pA; pTail = pA;
pA = pA->pDirty; pA = pA->pDirty;
if( pA==0 ){ if (pA == 0) {
pTail->pDirty = pB; pTail->pDirty = pB;
break; break;
} }
}else{ } else {
pTail->pDirty = pB; pTail->pDirty = pB;
pTail = pB; pTail = pB;
pB = pB->pDirty; pB = pB->pDirty;
if( pB==0 ){ if (pB == 0) {
pTail->pDirty = pA; pTail->pDirty = pA;
break; break;
} }
@ -722,24 +704,24 @@ static PgHdr *pcacheMergeDirtyList(PgHdr *pA, PgHdr *pB){
** ever changes to make the previous sentence incorrect. ** ever changes to make the previous sentence incorrect.
*/ */
#define N_SORT_BUCKET 32 #define N_SORT_BUCKET 32
static PgHdr *pcacheSortDirtyList(PgHdr *pIn){ static PgHdr *pcacheSortDirtyList(PgHdr *pIn) {
PgHdr *a[N_SORT_BUCKET], *p; PgHdr *a[N_SORT_BUCKET], *p;
int i; int i;
memset(a, 0, sizeof(a)); memset(a, 0, sizeof(a));
while( pIn ){ while (pIn) {
p = pIn; p = pIn;
pIn = p->pDirty; pIn = p->pDirty;
p->pDirty = 0; p->pDirty = 0;
for(i=0; ALWAYS(i<N_SORT_BUCKET-1); i++){ for (i = 0; ALWAYS(i < N_SORT_BUCKET - 1); i++) {
if( a[i]==0 ){ if (a[i] == 0) {
a[i] = p; a[i] = p;
break; break;
}else{ } else {
p = pcacheMergeDirtyList(a[i], p); p = pcacheMergeDirtyList(a[i], p);
a[i] = 0; a[i] = 0;
} }
} }
if( NEVER(i==N_SORT_BUCKET-1) ){ if (NEVER(i == N_SORT_BUCKET - 1)) {
/* To get here, there need to be 2^(N_SORT_BUCKET) elements in /* To get here, there need to be 2^(N_SORT_BUCKET) elements in
** the input list. But that is impossible. ** the input list. But that is impossible.
*/ */
@ -747,8 +729,8 @@ static PgHdr *pcacheSortDirtyList(PgHdr *pIn){
} }
} }
p = a[0]; p = a[0];
for(i=1; i<N_SORT_BUCKET; i++){ for (i = 1; i < N_SORT_BUCKET; i++) {
if( a[i]==0 ) continue; if (a[i] == 0) continue;
p = p ? pcacheMergeDirtyList(p, a[i]) : a[i]; p = p ? pcacheMergeDirtyList(p, a[i]) : a[i];
} }
return p; return p;
@ -757,9 +739,9 @@ static PgHdr *pcacheSortDirtyList(PgHdr *pIn){
/* /*
** Return a list of all dirty pages in the cache, sorted by page number. ** Return a list of all dirty pages in the cache, sorted by page number.
*/ */
PgHdr *sqlite3PcacheDirtyList(PCache *pCache){ PgHdr *sqlite3PcacheDirtyList(PCache *pCache) {
PgHdr *p; PgHdr *p;
for(p=pCache->pDirty; p; p=p->pDirtyNext){ for (p = pCache->pDirty; p; p = p->pDirtyNext) {
p->pDirty = p->pDirtyNext; p->pDirty = p->pDirtyNext;
} }
return pcacheSortDirtyList(pCache->pDirty); return pcacheSortDirtyList(pCache->pDirty);
@ -771,22 +753,18 @@ PgHdr *sqlite3PcacheDirtyList(PCache *pCache){
** This is not the total number of pages referenced, but the sum of the ** This is not the total number of pages referenced, but the sum of the
** reference count for all pages. ** reference count for all pages.
*/ */
int sqlite3PcacheRefCount(PCache *pCache){ int sqlite3PcacheRefCount(PCache *pCache) { return pCache->nRefSum; }
return pCache->nRefSum;
}
/* /*
** Return the number of references to the page supplied as an argument. ** Return the number of references to the page supplied as an argument.
*/ */
int sqlite3PcachePageRefcount(PgHdr *p){ int sqlite3PcachePageRefcount(PgHdr *p) { return p->nRef; }
return p->nRef;
}
/* /*
** Return the total number of pages in the cache. ** Return the total number of pages in the cache.
*/ */
int sqlite3PcachePagecount(PCache *pCache){ int sqlite3PcachePagecount(PCache *pCache) {
assert( pCache->pCache!=0 ); assert(pCache->pCache != 0);
return pcache2.xPagecount(pCache->pCache); return pcache2.xPagecount(pCache->pCache);
} }
@ -794,19 +772,16 @@ int sqlite3PcachePagecount(PCache *pCache){
/* /*
** Get the suggested cache-size value. ** Get the suggested cache-size value.
*/ */
int sqlite3PcacheGetCachesize(PCache *pCache){ int sqlite3PcacheGetCachesize(PCache *pCache) { return numberOfCachePages(pCache); }
return numberOfCachePages(pCache);
}
#endif #endif
/* /*
** Set the suggested cache-size value. ** Set the suggested cache-size value.
*/ */
void sqlite3PcacheSetCachesize(PCache *pCache, int mxPage){ void sqlite3PcacheSetCachesize(PCache *pCache, int mxPage) {
assert( pCache->pCache!=0 ); assert(pCache->pCache != 0);
pCache->szCache = mxPage; pCache->szCache = mxPage;
pcache2.xCachesize(pCache->pCache, pcache2.xCachesize(pCache->pCache, numberOfCachePages(pCache));
numberOfCachePages(pCache));
} }
/* /*
@ -814,25 +789,25 @@ void sqlite3PcacheSetCachesize(PCache *pCache, int mxPage){
** argument is zero. Return the effective cache-spill size, which will ** argument is zero. Return the effective cache-spill size, which will
** be the larger of the szSpill and szCache. ** be the larger of the szSpill and szCache.
*/ */
int sqlite3PcacheSetSpillsize(PCache *p, int mxPage){ int sqlite3PcacheSetSpillsize(PCache *p, int mxPage) {
int res; int res;
assert( p->pCache!=0 ); assert(p->pCache != 0);
if( mxPage ){ if (mxPage) {
if( mxPage<0 ){ if (mxPage < 0) {
mxPage = (int)((-1024*(i64)mxPage)/(p->szPage+p->szExtra)); mxPage = (int)((-1024 * (i64)mxPage) / (p->szPage + p->szExtra));
} }
p->szSpill = mxPage; p->szSpill = mxPage;
} }
res = numberOfCachePages(p); res = numberOfCachePages(p);
if( res<p->szSpill ) res = p->szSpill; if (res < p->szSpill) res = p->szSpill;
return res; return res;
} }
/* /*
** Free up as much memory as possible from the page cache. ** Free up as much memory as possible from the page cache.
*/ */
void sqlite3PcacheShrink(PCache *pCache){ void sqlite3PcacheShrink(PCache *pCache) {
assert( pCache->pCache!=0 ); assert(pCache->pCache != 0);
pcache2.xShrink(pCache->pCache); pcache2.xShrink(pCache->pCache);
} }
@ -840,17 +815,17 @@ void sqlite3PcacheShrink(PCache *pCache){
** Return the size of the header added by this middleware layer ** Return the size of the header added by this middleware layer
** in the page-cache hierarchy. ** in the page-cache hierarchy.
*/ */
int sqlite3HeaderSizePcache(void){ return ROUND8(sizeof(PgHdr)); } int sqlite3HeaderSizePcache(void) { return ROUND8(sizeof(PgHdr)); }
/* /*
** Return the number of dirty pages currently in the cache, as a percentage ** Return the number of dirty pages currently in the cache, as a percentage
** of the configured cache size. ** of the configured cache size.
*/ */
int sqlite3PCachePercentDirty(PCache *pCache){ int sqlite3PCachePercentDirty(PCache *pCache) {
PgHdr *pDirty; PgHdr *pDirty;
int nDirty = 0; int nDirty = 0;
int nCache = numberOfCachePages(pCache); int nCache = numberOfCachePages(pCache);
for(pDirty=pCache->pDirty; pDirty; pDirty=pDirty->pDirtyNext) nDirty++; for (pDirty = pCache->pDirty; pDirty; pDirty = pDirty->pDirtyNext) nDirty++;
return nCache ? (int)(((i64)nDirty * 100) / nCache) : 0; return nCache ? (int)(((i64)nDirty * 100) / nCache) : 0;
} }
@ -858,9 +833,7 @@ int sqlite3PCachePercentDirty(PCache *pCache){
/* /*
** Return true if there are one or more dirty pages in the cache. Else false. ** Return true if there are one or more dirty pages in the cache. Else false.
*/ */
int sqlite3PCacheIsDirty(PCache *pCache){ int sqlite3PCacheIsDirty(PCache *pCache) { return (pCache->pDirty != 0); }
return (pCache->pDirty!=0);
}
#endif #endif
#if defined(SQLITE_CHECK_PAGES) || defined(SQLITE_DEBUG) #if defined(SQLITE_CHECK_PAGES) || defined(SQLITE_DEBUG)
@ -869,9 +842,9 @@ int sqlite3PCacheIsDirty(PCache *pCache){
** callback. This is only used if the SQLITE_CHECK_PAGES macro is ** callback. This is only used if the SQLITE_CHECK_PAGES macro is
** defined. ** defined.
*/ */
void sqlite3PcacheIterateDirty(PCache *pCache, void (*xIter)(PgHdr *)){ void sqlite3PcacheIterateDirty(PCache *pCache, void (*xIter)(PgHdr *)) {
PgHdr *pDirty; PgHdr *pDirty;
for(pDirty=pCache->pDirty; pDirty; pDirty=pDirty->pDirtyNext){ for (pDirty = pCache->pDirty; pDirty; pDirty = pDirty->pDirtyNext) {
xIter(pDirty); xIter(pDirty);
} }
} }

20
source/libs/tdb/src/sqlite/wal.c
View File

@ -642,7 +642,7 @@ static SQLITE_NOINLINE int walIndexPageRealloc(
apNew = (volatile u32 **)sqlite3Realloc((void *)pWal->apWiData, nByte); apNew = (volatile u32 **)sqlite3Realloc((void *)pWal->apWiData, nByte);
if( !apNew ){ if( !apNew ){
*ppPage = 0; *ppPage = 0;
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
memset((void*)&apNew[pWal->nWiData], 0, memset((void*)&apNew[pWal->nWiData], 0,
sizeof(u32*)*(iPage+1-pWal->nWiData)); sizeof(u32*)*(iPage+1-pWal->nWiData));
@ -654,7 +654,7 @@ static SQLITE_NOINLINE int walIndexPageRealloc(
assert( pWal->apWiData[iPage]==0 ); assert( pWal->apWiData[iPage]==0 );
if( pWal->exclusiveMode==WAL_HEAPMEMORY_MODE ){ if( pWal->exclusiveMode==WAL_HEAPMEMORY_MODE ){
pWal->apWiData[iPage] = (u32 volatile *)sqlite3MallocZero(WALINDEX_PGSZ); pWal->apWiData[iPage] = (u32 volatile *)sqlite3MallocZero(WALINDEX_PGSZ);
if( !pWal->apWiData[iPage] ) rc = SQLITE_NOMEM_BKPT; if( !pWal->apWiData[iPage] ) rc = SQLITE_NOMEM;
}else{ }else{
rc = sqlite3OsShmMap(pWal->pDbFd, iPage, WALINDEX_PGSZ, rc = sqlite3OsShmMap(pWal->pDbFd, iPage, WALINDEX_PGSZ,
pWal->writeLock, (void volatile **)&pWal->apWiData[iPage] pWal->writeLock, (void volatile **)&pWal->apWiData[iPage]
@ -1310,7 +1310,7 @@ static int walIndexRecover(Wal *pWal){
szFrame = szPage + WAL_FRAME_HDRSIZE; szFrame = szPage + WAL_FRAME_HDRSIZE;
aFrame = (u8 *)sqlite3_malloc64(szFrame + WALINDEX_PGSZ); aFrame = (u8 *)sqlite3_malloc64(szFrame + WALINDEX_PGSZ);
if( !aFrame ){ if( !aFrame ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto recovery_error; goto recovery_error;
} }
aData = &aFrame[WAL_FRAME_HDRSIZE]; aData = &aFrame[WAL_FRAME_HDRSIZE];
@ -1534,7 +1534,7 @@ int sqlite3WalOpen(
*ppWal = 0; *ppWal = 0;
pRet = (Wal*)sqlite3MallocZero(sizeof(Wal) + pVfs->szOsFile); pRet = (Wal*)sqlite3MallocZero(sizeof(Wal) + pVfs->szOsFile);
if( !pRet ){ if( !pRet ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
pRet->pVfs = pVfs; pRet->pVfs = pVfs;
@ -1799,7 +1799,7 @@ static int walIteratorInit(Wal *pWal, u32 nBackfill, WalIterator **pp){
+ iLast*sizeof(ht_slot); + iLast*sizeof(ht_slot);
p = (WalIterator *)sqlite3_malloc64(nByte); p = (WalIterator *)sqlite3_malloc64(nByte);
if( !p ){ if( !p ){
return SQLITE_NOMEM_BKPT; return SQLITE_NOMEM;
} }
memset(p, 0, nByte); memset(p, 0, nByte);
p->nSegment = nSegment; p->nSegment = nSegment;
@ -1811,7 +1811,7 @@ static int walIteratorInit(Wal *pWal, u32 nBackfill, WalIterator **pp){
sizeof(ht_slot) * (iLast>HASHTABLE_NPAGE?HASHTABLE_NPAGE:iLast) sizeof(ht_slot) * (iLast>HASHTABLE_NPAGE?HASHTABLE_NPAGE:iLast)
); );
if( !aTmp ){ if( !aTmp ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
} }
for(i=walFramePage(nBackfill+1); rc==SQLITE_OK && i<nSegment; i++){ for(i=walFramePage(nBackfill+1); rc==SQLITE_OK && i<nSegment; i++){
@ -2129,7 +2129,7 @@ static int walCheckpoint(
i64 iOffset; i64 iOffset;
assert( walFramePgno(pWal, iFrame)==iDbpage ); assert( walFramePgno(pWal, iFrame)==iDbpage );
if( AtomicLoad(&db->u1.isInterrupted) ){ if( AtomicLoad(&db->u1.isInterrupted) ){
rc = db->mallocFailed ? SQLITE_NOMEM_BKPT : SQLITE_INTERRUPT; rc = db->mallocFailed ? SQLITE_NOMEM : SQLITE_INTERRUPT;
break; break;
} }
if( iFrame<=nBackfill || iFrame>mxSafeFrame || iDbpage>mxPage ){ if( iFrame<=nBackfill || iFrame>mxSafeFrame || iDbpage>mxPage ){
@ -2606,7 +2606,7 @@ static int walBeginShmUnreliable(Wal *pWal, int *pChanged){
szFrame = pWal->hdr.szPage + WAL_FRAME_HDRSIZE; szFrame = pWal->hdr.szPage + WAL_FRAME_HDRSIZE;
aFrame = (u8 *)sqlite3_malloc64(szFrame); aFrame = (u8 *)sqlite3_malloc64(szFrame);
if( aFrame==0 ){ if( aFrame==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
goto begin_unreliable_shm_out; goto begin_unreliable_shm_out;
} }
aData = &aFrame[WAL_FRAME_HDRSIZE]; aData = &aFrame[WAL_FRAME_HDRSIZE];
@ -3559,7 +3559,7 @@ static int walRewriteChecksums(Wal *pWal, u32 iLast){
i64 iCksumOff; i64 iCksumOff;
aBuf = sqlite3_malloc(szPage + WAL_FRAME_HDRSIZE); aBuf = sqlite3_malloc(szPage + WAL_FRAME_HDRSIZE);
if( aBuf==0 ) return SQLITE_NOMEM_BKPT; if( aBuf==0 ) return SQLITE_NOMEM;
/* Find the checksum values to use as input for the recalculating the /* Find the checksum values to use as input for the recalculating the
** first checksum. If the first frame is frame 1 (implying that the current ** first checksum. If the first frame is frame 1 (implying that the current
@ -4059,7 +4059,7 @@ int sqlite3WalSnapshotGet(Wal *pWal, sqlite3_snapshot **ppSnapshot){
} }
pRet = (WalIndexHdr*)sqlite3_malloc(sizeof(WalIndexHdr)); pRet = (WalIndexHdr*)sqlite3_malloc(sizeof(WalIndexHdr));
if( pRet==0 ){ if( pRet==0 ){
rc = SQLITE_NOMEM_BKPT; rc = SQLITE_NOMEM;
}else{ }else{
memcpy(pRet, &pWal->hdr, sizeof(WalIndexHdr)); memcpy(pRet, &pWal->hdr, sizeof(WalIndexHdr));
*ppSnapshot = (sqlite3_snapshot*)pRet; *ppSnapshot = (sqlite3_snapshot*)pRet;

95
source/libs/tdb/src/sqliteinc/sqlite3.h Normal file
View File

@ -0,0 +1,95 @@
/*
** 2001-09-15
**
** The author disclaims copyright to this source code. In place of
** a legal notice, here is a blessing:
**
** May you do good and not evil.
** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
*************************************************************************
** This header file defines the interface that the SQLite library
** presents to client programs. If a C-function, structure, datatype,
** or constant definition does not appear in this file, then it is
** not a published API of SQLite, is subject to change without
** notice, and should not be referenced by programs that use SQLite.
**
** Some of the definitions that are in this file are marked as
** "experimental". Experimental interfaces are normally new
** features recently added to SQLite. We do not anticipate changes
** to experimental interfaces but reserve the right to make minor changes
** if experience from use "in the wild" suggest such changes are prudent.
**
** The official C-language API documentation for SQLite is derived
** from comments in this file. This file is the authoritative source
** on how SQLite interfaces are supposed to operate.
**
** The name of this file under configuration management is "sqlite.h.in".
** The makefile makes some minor changes to this file (such as inserting
** the version number) and changes its name to "sqlite3.h" as
** part of the build process.
*/
#ifndef SQLITE3_H
#define SQLITE3_H
#include <stdarg.h> /* Needed for the definition of va_list */
/*
** Make sure we can call this stuff from C++.
*/
#ifdef __cplusplus
extern "C" {
#endif
/*
** CAPI3REF: Result Codes
** KEYWORDS: {result code definitions}
**
** Many SQLite functions return an integer result code from the set shown
** here in order to indicate success or failure.
**
** New error codes may be added in future versions of SQLite.
**
** See also: [extended result code definitions]
*/
#define SQLITE_OK 0 /* Successful result */
/* beginning-of-error-codes */
#define SQLITE_ERROR 1 /* Generic error */
#define SQLITE_INTERNAL 2 /* Internal logic error in SQLite */
#define SQLITE_PERM 3 /* Access permission denied */
#define SQLITE_ABORT 4 /* Callback routine requested an abort */
#define SQLITE_BUSY 5 /* The database file is locked */
#define SQLITE_LOCKED 6 /* A table in the database is locked */
#define SQLITE_NOMEM 7 /* A malloc() failed */
#define SQLITE_READONLY 8 /* Attempt to write a readonly database */
#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/
#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */
#define SQLITE_CORRUPT 11 /* The database disk image is malformed */
#define SQLITE_NOTFOUND 12 /* Unknown opcode in sqlite3_file_control() */
#define SQLITE_FULL 13 /* Insertion failed because database is full */
#define SQLITE_CANTOPEN 14 /* Unable to open the database file */
#define SQLITE_PROTOCOL 15 /* Database lock protocol error */
#define SQLITE_EMPTY 16 /* Internal use only */
#define SQLITE_SCHEMA 17 /* The database schema changed */
#define SQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */
#define SQLITE_CONSTRAINT 19 /* Abort due to constraint violation */
#define SQLITE_MISMATCH 20 /* Data type mismatch */
#define SQLITE_MISUSE 21 /* Library used incorrectly */
#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */
#define SQLITE_AUTH 23 /* Authorization denied */
#define SQLITE_FORMAT 24 /* Not used */
#define SQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */
#define SQLITE_NOTADB 26 /* File opened that is not a database file */
#define SQLITE_NOTICE 27 /* Notifications from sqlite3_log() */
#define SQLITE_WARNING 28 /* Warnings from sqlite3_log() */
#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */
#define SQLITE_DONE 101 /* sqlite3_step() has finished executing */
/* end-of-error-codes */
#ifdef __cplusplus
} /* end of the 'extern "C"' block */
#endif
#endif /* _FTS5_H */
/******** End of fts5.h *********/

3
source/libs/tdb/src/sqliteinc/sqliteInt.h
View File

@ -15,12 +15,15 @@
#include <assert.h> #include <assert.h>
#include <pthread.h> #include <pthread.h>
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#ifndef SQLITEINT_H #ifndef SQLITEINT_H
#define SQLITEINT_H #define SQLITEINT_H
#include "sqlite3.h"
typedef int8_t i8; typedef int8_t i8;
typedef int16_t i16; typedef int16_t i16;
typedef int32_t i32; typedef int32_t i32;