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

Fixes for OOM and IO error handling with temp file databases.

Browse Source 
FossilOrigin-Name: 4eb06e843af60d5e533793618c6e0e9b7ef7a1a6
This commit is contained in:
dan
2016-04-11 18:07:47 +00:00
parent 7082371de7
commit 67330a1224
5 changed files with 133 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pager.c
View File

@@ -958,7 +958,7 @@ static int assert_pager_state(Pager *p){
** back to OPEN state.
*/
assert( pPager->errCode!=SQLITE_OK );
assert( sqlite3PcacheRefCount(pPager->pPCache)>0 );
assert( sqlite3PcacheRefCount(pPager->pPCache)>0 || pPager->tempFile );
break;
}
@@ -1819,11 +1819,14 @@ static void pager_unlock(Pager *pPager){
** trusted. Now that there are no outstanding references to the pager,
** it can safely move back to PAGER_OPEN state. This happens in both
** normal and exclusive-locking mode.
*/
if( pPager->errCode ){
assert( !MEMDB );
**
** Exception: There is no way out of the error state for temp files.
** This is because it is not possible to call pager_reset() on a temp
** file pager (as this may discard the only copy of some data). */
assert( pPager->errCode==SQLITE_OK || !MEMDB );
if( pPager->tempFile==0 && pPager->errCode ){
pager_reset(pPager);
pPager->changeCountDone = pPager->tempFile;
pPager->changeCountDone = 0;
pPager->eState = PAGER_OPEN;
pPager->errCode = SQLITE_OK;
if( USEFETCH(pPager) ) sqlite3OsUnfetch(pPager->fd, 0, 0);
@@ -5034,8 +5037,8 @@ int sqlite3PagerSharedLock(Pager *pPager){
*/
assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
assert( assert_pager_state(pPager) );
if( pPager->tempFile && pPager->errCode ) { return pPager->errCode; }
assert( pPager->eState==PAGER_OPEN || pPager->eState==PAGER_READER );
if( NEVER(MEMDB && pPager->errCode) ){ return pPager->errCode; }
if( !pagerUseWal(pPager) && pPager->eState==PAGER_OPEN ){
int bHotJournal = 1; /* True if there exists a hot journal-file */