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

Do not truncate a database file until after fsync() has been called on the journal. (CVS 2068)

Browse Source 
FossilOrigin-Name: cfee7f4a004c5e57d58edcf9de3ded0a199940a3
This commit is contained in:
danielk1977
2004-11-05 16:37:02 +00:00
parent 951af8050b
commit d761c0c9fd
5 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.210 2004/11/05 15:45:10 danielk1977 Exp $
** $Id: btree.c,v 1.211 2004/11/05 16:37:03 danielk1977 Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -1719,7 +1719,7 @@ static int allocatePage(Btree *, MemPage **, Pgno *, Pgno, u8);
** This routine is called prior to sqlite3pager_commit when a transaction
** is commited for an auto-vacuum database.
*/
static int autoVacuumCommit(Btree *pBt){
static int autoVacuumCommit(Btree *pBt, Pgno *nTrunc){
Pager *pPager = pBt->pPager;
Pgno nFreeList; /* Number of pages remaining on the free-list. */
int nPtrMap; /* Number of pointer-map pages deallocated */
@@ -1746,6 +1746,7 @@ static int autoVacuumCommit(Btree *pBt){
*/
nFreeList = get4byte(&pBt->pPage1->aData[36]);
if( nFreeList==0 ){
*nTrunc = 0;
return SQLITE_OK;
}
@@ -1803,8 +1804,8 @@ static int autoVacuumCommit(Btree *pBt){
if( rc!=SQLITE_OK ) goto autovacuum_out;
put4byte(&pBt->pPage1->aData[32], 0);
put4byte(&pBt->pPage1->aData[36], 0);
rc = sqlite3pager_truncate(pBt->pPager, finSize);
if( rc!=SQLITE_OK ) goto autovacuum_out;
*nTrunc = finSize;
autovacuum_out:
/* TODO: A goto autovacuum_out; will fail to call releasePage() on
@@ -5378,12 +5379,14 @@ int sqlite3BtreeIsInStmt(Btree *pBt){
int sqlite3BtreeSync(Btree *pBt, const char *zMaster){
if( pBt->inTrans==TRANS_WRITE ){
#ifndef SQLITE_OMIT_AUTOVACUUM
Pgno nTrunc = 0;
if( pBt->autoVacuum ){
int rc = autoVacuumCommit(pBt);
int rc = autoVacuumCommit(pBt, &nTrunc);
if( rc!=SQLITE_OK ) return rc;
}
return sqlite3pager_sync(pBt->pPager, zMaster, nTrunc);
#endif
return sqlite3pager_sync(pBt->pPager, zMaster);
return sqlite3pager_sync(pBt->pPager, zMaster, 0);
}
return SQLITE_OK;
}