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

Short-circuit check for replication being not configured

Browse Source
This commit is contained in:
Dmitry Yemanov 2020-04-22 10:23:24 +03:00
parent 3bda59e42d
commit 1cd0a17330
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jrd/Database.cpp
View File

@ -307,6 +307,9 @@ namespace Jrd
bool Database::isReplicating(thread_db* tdbb)
{
if (!replManager())
return false;
Sync sync(&dbb_repl_sync, FB_FUNCTION);
sync.lock(SYNC_SHARED);

18
src/jrd/replication/Publisher.cpp
View File

@ -80,16 +80,9 @@ namespace
if (attachment->isSystem())
return NULL;
// Check whether replication is configured for this database
// Check whether replication is configured and enabled for this database
const auto dbb = tdbb->getDatabase();
const auto replMgr = dbb->replManager();
if (!replMgr)
return NULL;
// Check database-wise replication state
if (!dbb->isReplicating(tdbb))
{
if (attachment->att_replicator)
@ -106,13 +99,12 @@ namespace
if (!attachment->att_replicator)
{
auto& pool = *attachment->att_pool;
const auto dbId = dbb->getUniqueFileId();
const auto& dbName = dbb->dbb_filename;
const auto& dbGuid = dbb->dbb_guid;
const auto& currentUser = attachment->att_user->getUserName();
const auto manager = dbb->replManager();
const auto& guid = dbb->dbb_guid;
const auto& userName = attachment->att_user->getUserName();
attachment->att_replicator = (IReplicatedSession*) FB_NEW_POOL(pool)
Replicator(pool, replMgr, dbGuid, currentUser, cleanupTransactions);
Replicator(pool, manager, guid, userName, cleanupTransactions);
}
fb_assert(attachment->att_replicator);