Move bulk of MigrateLegacyData to blockstore.cpp

1 files changed, 15 insertions, 8 deletions

diff --git a/zenstore/include/zenstore/blockstore.h b/zenstore/include/zenstore/blockstore.h
index 21c02d389..0cef7600f 100644
--- a/zenstore/include/zenstore/blockstore.h
+++ b/zenstore/include/zenstore/blockstore.h
@@ -117,14 +117,14 @@ public:
 		std::unordered_set<uint32_t> ExcludeBlockIndexes;
 		size_t						 BlockCount;
 	};
-	typedef std::function<void(uint32_t												 BlockIndex,
-							   const std::unordered_map<size_t, BlockStoreLocation>& MovedChunks,
-							   const std::vector<size_t>&							 RemovedChunks)>
+	typedef std::function<void(const std::unordered_map<size_t, BlockStoreLocation>& MovedChunks, const std::vector<size_t>& RemovedChunks)>
 																										 ReclaimCallback;
 	typedef std::function<void(const BlockStoreLocation& Location)>										 WriteChunkCallback;
 	typedef std::function<void(size_t ChunkIndex, const void* Data, uint64_t Size)>						 IterateChunksSmallSizeCallback;
 	typedef std::function<void(size_t ChunkIndex, BasicFile& BlockFile, uint64_t Offset, uint64_t Size)> IterateChunksLargeSizeCallback;
 
+	typedef std::function<void(const std::vector<std::pair<size_t, BlockStoreLocation>>& MovedChunks)> SplitCallback;
+
 	void Initialize(const std::filesystem::path&		   BlocksBasePath,
 					uint64_t							   MaxBlockSize,
 					uint64_t							   MaxBlockCount,
@@ -144,11 +144,18 @@ public:
 						const std::vector<size_t>&			   KeepChunkIndexes,
 						uint64_t							   PayloadAlignment,
 						bool								   DryRun,
-						const ReclaimCallback& Callback = [](uint32_t, const std::unordered_map<size_t, BlockStoreLocation>&, const std::vector<size_t>&) {
-		});
-	void IterateChunks(const std::vector<BlockStoreLocation>& ChunkLocations,
-					   IterateChunksSmallSizeCallback		  SmallSizeCallback,
-					   IterateChunksLargeSizeCallback		  LargeSizeCallback);
+						const ReclaimCallback& Callback = [](const std::unordered_map<size_t, BlockStoreLocation>&, const std::vector<size_t>&) {});
+	void		IterateChunks(const std::vector<BlockStoreLocation>& ChunkLocations,
+							  IterateChunksSmallSizeCallback		 SmallSizeCallback,
+							  IterateChunksLargeSizeCallback		 LargeSizeCallback);
+	static bool Split(const std::vector<BlockStoreLocation>& ChunkLocations,
+					  const std::filesystem::path&			 SourceBlockFilePath,
+					  const std::filesystem::path&			 BlocksBasePath,
+					  uint64_t								 MaxBlockSize,
+					  uint64_t								 MaxBlockCount,
+					  size_t								 PayloadAlignment,
+					  bool									 CleanSource,
+					  const SplitCallback&					 Callback);
 
 	static const char*			 GetBlockFileExtension();
 	static std::filesystem::path GetBlockPath(const std::filesystem::path& BlocksBasePath, const uint32_t BlockIndex);