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

Fixed replication after MetaName improvements

Browse Source
This commit is contained in:
Dmitry Yemanov 2020-07-24 20:38:25 +03:00
parent ca12563ba5
commit 9b8c654fd7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/replication/Applier.cpp
View File

@ -118,10 +118,10 @@ namespace
return *ptr;
}
const MetaName& getMetaName()
const MetaString& getMetaName()
{
const auto offset = getInt() * sizeof(MetaName);
const auto metaPtr = (const MetaName*) (m_metadata + offset);
const auto offset = getInt() * sizeof(MetaString);
const auto metaPtr = (const MetaString*) (m_metadata + offset);
return *metaPtr;
}

2
src/jrd/replication/Replicator.cpp
View File

@ -58,7 +58,7 @@ void Replicator::flush(BatchBlock& block, FlushReason reason, ULONG flags)
fb_assert(orgLength > sizeof(Block));
block.header.protocol = PROTOCOL_CURRENT_VERSION;
block.header.dataLength = orgLength - sizeof(Block);
block.header.metaLength = (ULONG) (block.metadata.getCount() * sizeof(MetaName));
block.header.metaLength = (ULONG) (block.metadata.getCount() * sizeof(MetaString));
block.header.timestamp = TimeZoneUtil::getCurrentGmtTimeStamp().utc_timestamp;
block.header.flags |= flags;