constexpr/final/noexcept in Replicator

Author: mrotteveel

src/jrd/replication/Replicator.cpp

@@ -88,7 +88,7 @@ void Replicator::storeBlob(Transaction* transaction, ISC_QUAD blobId)
 		localStatus.raise();
 
 	UCharBuffer buffer;
-	const auto bufferLength = MAX_USHORT;
+	constexpr FB_SIZE_T bufferLength = MAX_USHORT;
 	auto data = buffer.getBuffer(bufferLength);
 
 	auto& txnData = transaction->getData();
@@ -311,10 +311,10 @@ void Replicator::insertRecord(CheckStatusWrapper* status,
 			IReplicatedField* field = record->getField(id);
 			if (field != nullptr)
 			{
-				auto type = field->getType();
+				const auto type = field->getType();
 				if (type == SQL_ARRAY || type == SQL_BLOB)
 				{
-					const auto blobId = (ISC_QUAD*) field->getData();
+					const auto* blobId = (ISC_QUAD*) field->getData();
 
 					if (blobId && !BlobWrapper::blobIsNull(*blobId))
 						storeBlob(transaction, *blobId);
@@ -358,10 +358,10 @@ void Replicator::updateRecord(CheckStatusWrapper* status,
 			IReplicatedField* field = newRecord->getField(id);
 			if (field != nullptr)
 			{
-				auto type = field->getType();
+				const auto type = field->getType();
 				if (type == SQL_ARRAY || type == SQL_BLOB)
 				{
-					const auto blobId = (ISC_QUAD*) field->getData();
+					const auto* blobId = (ISC_QUAD*) field->getData();
 
 					if (blobId && !BlobWrapper::blobIsNull(*blobId))
 						storeBlob(transaction, *blobId);

src/jrd/replication/Replicator.h

@@ -36,15 +36,15 @@
 
 namespace Replication
 {
-	class Replicator :
+	class Replicator final :
 		public Firebird::StdPlugin<Firebird::IReplicatedSessionImpl<Replicator, Firebird::CheckStatusWrapper> >
 	{
 		typedef Firebird::ObjectsArray<Firebird::string> NameCache;
 		typedef Firebird::HalfStaticArray<SavNumber, 16> SavepointStack;
 
 		struct BatchBlock
 		{
-			Block header;
+			Block header{};
 			Firebird::UCharBuffer* buffer;
 			NameCache atoms;
 			ULONG lastAtom;
@@ -54,10 +54,9 @@ namespace Replication
 				: buffer(NULL), atoms(pool),
 				  lastAtom(MAX_ULONG), flushes(0)
 			{
-				memset(&header, 0, sizeof(Block));
 			}
 
-			ULONG getSize() const
+			ULONG getSize() const noexcept
 			{
 				return (ULONG) buffer->getCount();
 			}
@@ -138,20 +137,20 @@ namespace Replication
 			}
 		};
 
-		class Transaction :
+		class Transaction final :
 			public Firebird::AutoIface<Firebird::IReplicatedTransactionImpl<Transaction, Firebird::CheckStatusWrapper> >
 		{
 		public:
 			explicit Transaction(Replicator* replicator, Firebird::ITransaction* trans)
 				: m_replicator(replicator), m_transaction(trans), m_data(replicator->getPool())
 			{}
 
-			BatchBlock& getData()
+			BatchBlock& getData() noexcept
 			{
 				return m_data;
 			}
 
-			Firebird::ITransaction* getInterface()
+			Firebird::ITransaction* getInterface() noexcept
 			{
 				return m_transaction.getPtr();
 			}
@@ -259,7 +258,7 @@ namespace Replication
 		struct GeneratorValue
 		{
 			Jrd::QualifiedName name;
-			SINT64 value;
+			SINT64 value = 0;
 		};
 
 		typedef Firebird::Array<GeneratorValue> GeneratorCache;