firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Fixed bug CORE-3521 : Delta file contents is not flushed to disk

Browse Source
This commit is contained in:
hvlad 2011-06-15 11:43:42 +00:00
parent 317430bc0d
commit 9f94f41e4e
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/cch.cpp
View File

@ -1187,6 +1187,15 @@ void CCH_flush(thread_db* tdbb, USHORT flush_flag, SLONG tra_number)
{ {
PIO_flush(dbb, dbb->dbb_shadow->sdw_file); PIO_flush(dbb, dbb->dbb_shadow->sdw_file);
} }
{
BackupManager* bm = dbb->dbb_backup_manager;
BackupManager::StateReadGuard stateGuard(tdbb);
const int backup_state = bm->getState();
if (backup_state == nbak_state_stalled || backup_state == nbak_state_merge)
bm->flushDifference();
}
tdbb->bumpStats(RuntimeStatistics::FLUSHES); tdbb->bumpStats(RuntimeStatistics::FLUSHES);
} }

5
src/jrd/nbak.cpp
View File

@ -661,6 +661,11 @@ bool BackupManager::readDifference(thread_db* tdbb, ULONG diff_page, Ods::pag* p
return true; return true;
} }
void BackupManager::flushDifference()
{
PIO_flush(database, diff_file);
}
BackupManager::BackupManager(thread_db* tdbb, Database* _database, int ini_state) : BackupManager::BackupManager(thread_db* tdbb, Database* _database, int ini_state) :
dbCreating(false), database(_database), diff_file(NULL), alloc_table(NULL), dbCreating(false), database(_database), diff_file(NULL), alloc_table(NULL),
last_allocated_page(0), current_scn(0), diff_name(*_database->dbb_permanent), last_allocated_page(0), current_scn(0), diff_name(*_database->dbb_permanent),

1
src/jrd/nbak.h
View File

@ -369,6 +369,7 @@ public:
void closeDelta(); void closeDelta();
bool writeDifference(ISC_STATUS* status, ULONG diff_page, Ods::pag* page); bool writeDifference(ISC_STATUS* status, ULONG diff_page, Ods::pag* page);
bool readDifference(thread_db* tdbb, ULONG diff_page, Ods::pag* page); bool readDifference(thread_db* tdbb, ULONG diff_page, Ods::pag* page);
void flushDifference();
void shutdown(thread_db* tdbb); void shutdown(thread_db* tdbb);