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

If there is a hot-journal in the file-system, a connection with journal_mode=memory set may have to open it to effect rollback. Account for this in pager_end_transaction(). This prevents an assert from failing in the in-memory journal permutation test. (CVS 6947)

Browse Source 
FossilOrigin-Name: 224bc69a04f4fe6d1004125847761b7842c2bfe0
This commit is contained in:
danielk1977
2009-07-27 14:15:44 +00:00
parent b5a1920816
commit ded6d0f1a9
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
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.627 2009/07/25 22:13:35 drh Exp $
** @(#) $Id: pager.c,v 1.628 2009/07/27 14:15:44 danielk1977 Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -1280,17 +1280,9 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
assert( isOpen(pPager->jfd) || pPager->pInJournal==0 );
if( isOpen(pPager->jfd) ){
/* TODO: There's a problem here if a journal-file was opened in MEMORY
** mode and then the journal-mode is changed to TRUNCATE or PERSIST
** during the transaction. This code should be changed to assume
** that the journal mode has not changed since the transaction was
** started. And the sqlite3PagerJournalMode() function should be
** changed to make sure that this is the case too.
*/
/* Finalize the journal file. */
if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
assert( sqlite3IsMemJournal(pPager->jfd) );
if( sqlite3IsMemJournal(pPager->jfd) ){
assert( pPager->journalMode==PAGER_JOURNALMODE_MEMORY );
sqlite3OsClose(pPager->jfd);
}else if( pPager->journalMode==PAGER_JOURNALMODE_TRUNCATE ){
if( pPager->journalOff==0 ){
@@ -1308,7 +1300,13 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
pPager->journalOff = 0;
pPager->journalStarted = 0;
}else{
assert( pPager->journalMode==PAGER_JOURNALMODE_DELETE );
/* This branch may be executed with Pager.journalMode==MEMORY if
** a hot-journal was just rolled back. In this case the journal
** file should be closed and deleted. If this connection writes to
** the database file, it will do so using an in-memory journal. */
assert( pPager->journalMode==PAGER_JOURNALMODE_DELETE
|| pPager->journalMode==PAGER_JOURNALMODE_MEMORY
);
sqlite3OsClose(pPager->jfd);
if( !pPager->tempFile ){
rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);