optimize block store CompactBlocks (#384)

- Improvement: Optimize block compact reducing memcpy operations
- Improvement: Handle padding of block store blocks when compacting to avoid excessive flusing of write buffer
- Improvement: Handle padding when writing oplog index snapshot to avoid unnecessary flushing of write buffer

1 files changed, 8 insertions, 16 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index e91e6ac51..071aab137 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -1748,36 +1748,28 @@ ProjectStore::Oplog::WriteIndexSnapshot()
 
 			uint64_t Offset = 0;
 			IndexFile.Write(&Header, sizeof(OplogIndexHeader), Offset);
-			Offset += sizeof(OplogIndexHeader);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(LSNEntries.data(), LSNEntries.size() * sizeof(uint32_t), Offset);
-			Offset += LSNEntries.size() * sizeof(uint32_t);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(Keys.data(), Keys.size() * sizeof(Oid), Offset);
-			Offset += Keys.size() * sizeof(Oid);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(AddressMapEntries.data(), AddressMapEntries.size() * sizeof(OplogEntryAddress), Offset);
-			Offset += AddressMapEntries.size() * sizeof(OplogEntryAddress);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(LatestOpMapEntries.data(), LatestOpMapEntries.size() * sizeof(uint32_t), Offset);
-			Offset += LatestOpMapEntries.size() * sizeof(uint32_t);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(ChunkMapEntries.data(), ChunkMapEntries.size() * sizeof(IoHash), Offset);
-			Offset += ChunkMapEntries.size() * sizeof(IoHash);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(MetaMapEntries.data(), MetaMapEntries.size() * sizeof(IoHash), Offset);
-			Offset += MetaMapEntries.size() * sizeof(IoHash);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			IndexFile.Write(FilePathLengths.data(), FilePathLengths.size() * sizeof(uint32_t), Offset);
-			Offset += FilePathLengths.size() * sizeof(uint32_t);
-			Offset = RoundUp(Offset, OplogIndexHeader::DataAlignment);
+			Offset = IndexFile.AlignTo(OplogIndexHeader::DataAlignment);
 
 			for (const auto& FilePath : FilePaths)
 			{