WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Move blob search logic in Replicator into a new method to prevent code duplication #8651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Noremos wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Move blob search logic in Replicator into a new method to prevent code duplication #8651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f16fe2
Move blob searching in Replicator to new method
Jul 17, 2025
0997b43
Merge remote-tracking branch 'origin/master' into replicator_duplicat…
Aug 19, 2025
332c4d7
Merge branch 'FirebirdSQL:master' into replicator_duplicate_code
Noremos Sep 16, 2025
e8353a1
Fix build after merge
Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 21 additions & 30 deletions src/jrd/replication/Replicator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,21 +306,7 @@ void Replicator::insertRecord(CheckStatusWrapper* status,
{
try
{
for (unsigned id = 0; id < record->getCount(); id++)
{
IReplicatedField* field = record->getField(id);
if (field != nullptr)
{
const auto type = field->getType();
if (type == SQL_ARRAY || type == SQL_BLOB)
{
const auto* blobId = (ISC_QUAD*) field->getData();

if (blobId && !BlobWrapper::blobIsNull(*blobId))
storeBlob(transaction, *blobId);
}
}
}
storeBlobs(transaction, record);

const auto length = record->getRawLength();
const auto data = record->getRawData();
Expand Down Expand Up @@ -353,21 +339,7 @@ void Replicator::updateRecord(CheckStatusWrapper* status,
{
try
{
for (unsigned id = 0; id < newRecord->getCount(); id++)
{
IReplicatedField* field = newRecord->getField(id);
if (field != nullptr)
{
const auto type = field->getType();
if (type == SQL_ARRAY || type == SQL_BLOB)
{
const auto* blobId = (ISC_QUAD*) field->getData();

if (blobId && !BlobWrapper::blobIsNull(*blobId))
storeBlob(transaction, *blobId);
}
}
}
storeBlobs(transaction, newRecord);

const auto orgLength = orgRecord->getRawLength();
const auto orgData = orgRecord->getRawData();
Expand Down Expand Up @@ -454,6 +426,25 @@ void Replicator::executeSqlIntl(CheckStatusWrapper* status,
}
}

void Replicator::storeBlobs(Transaction* transaction, Firebird::IReplicatedRecord* record)
{
for (unsigned id = 0; id < record->getCount(); id++)
{
IReplicatedField* field = record->getField(id);
if (field == nullptr)
continue;

const auto type = field->getType();
if (type == SQL_ARRAY || type == SQL_BLOB)
{
const auto* blobId = (ISC_QUAD*) field->getData();

if (blobId && !BlobWrapper::blobIsNull(*blobId))
storeBlob(transaction, *blobId);
}
}
}

void Replicator::cleanupTransaction(CheckStatusWrapper* status,
SINT64 number)
{
Expand Down
2 changes: 2 additions & 0 deletions src/jrd/replication/Replicator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ namespace Replication
unsigned charset,
const char* schemaSearchPath,
const char* sql);

void storeBlobs(Transaction* transaction, Firebird::IReplicatedRecord* record);
};

} // namespace
Expand Down
Loading