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 call xSync() from zeroJournalHdr() if the Pager.noSync flag is set (i.e. for temp files). (CVS 5194)

Browse Source 
FossilOrigin-Name: 9f5cbe29226151113e4565fcf8170317afe1b8c6
This commit is contained in:
danielk1977
2008-06-07 05:19:37 +00:00
parent 0f01fdae33
commit 8162054b44
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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.454 2008/06/06 16:14:02 danielk1977 Exp $
** @(#) $Id: pager.c,v 1.455 2008/06/07 05:19:38 danielk1977 Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -982,7 +982,7 @@ static int zeroJournalHdr(Pager *pPager, int doTruncate){
}else{
rc = sqlite3OsWrite(pPager->jfd, zeroHdr, sizeof(zeroHdr), 0);
}
if( rc==SQLITE_OK ){
if( rc==SQLITE_OK && !pPager->noSync ){
rc = sqlite3OsSync(pPager->jfd, SQLITE_SYNC_DATAONLY|pPager->sync_flags);
}
@@ -3148,9 +3148,12 @@ static int hasHotJournal(Pager *pPager){
}
if( rc==SQLITE_OK && exists && !locked ){
if( sqlite3PagerPagecount(pPager)==0 ){
int nPage = sqlite3PagerPagecount(pPager);
if( nPage==0 ){
sqlite3OsDelete(pVfs, pPager->zJournal, 0);
exists = 0;
}else if( nPage<0 ){
rc = SQLITE_IOERR;
}
}