Merge branch 'main' of https://github.ol.epicgames.net/ue-foundation/zensb/cleanup-main

1 files changed, 10 insertions, 4 deletions

diff --git a/src/zenstore/blockstore.cpp b/src/zenstore/blockstore.cpp
index 9ad672060..e976c061d 100644
--- a/src/zenstore/blockstore.cpp
+++ b/src/zenstore/blockstore.cpp
@@ -2,6 +2,7 @@
 
 #include <zenstore/blockstore.h>
 
+#include <zencore/enumflags.h>
 #include <zencore/except.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
@@ -809,8 +810,8 @@ BlockStore::IterateBlock(std::span<const BlockStoreLocation>   ChunkLocations,
 		ZEN_ASSERT(BlockFile);
 		InsertLock.ReleaseNow();
 
-		IoBuffer ReadBuffer{IterateSmallChunkWindowSize};
-		void*	 BufferBase = ReadBuffer.MutableData();
+		IoBuffer ReadBuffer;
+		void*	 BufferBase = nullptr;
 
 		size_t LocationIndexOffset = 0;
 		while (LocationIndexOffset < ChunkIndexes.size())
@@ -825,6 +826,11 @@ BlockStore::IterateBlock(std::span<const BlockStoreLocation>   ChunkLocations,
 				size_t					  LastChunkIndex = ChunkIndexes[LocationIndexOffset + RangeCount - 1];
 				const BlockStoreLocation& LastLocation	 = ChunkLocations[LastChunkIndex];
 				uint64_t				  Size			 = LastLocation.Offset + LastLocation.Size - FirstLocation.Offset;
+				if (ReadBuffer.GetSize() < Size)
+				{
+					ReadBuffer = IoBuffer(Min(Size * 2, IterateSmallChunkWindowSize));
+					BufferBase = ReadBuffer.MutableData();
+				}
 				BlockFile->Read(BufferBase, Size, FirstLocation.Offset);
 				for (size_t RangeIndex = 0; RangeIndex < RangeCount; ++RangeIndex)
 				{
@@ -1422,8 +1428,8 @@ namespace blockstore::impl {
 	{
 		DirectoryContent DirectoryContent;
 		GetDirectoryContent(RootDir,
-							DirectoryContent::RecursiveFlag | (Files ? DirectoryContent::IncludeFilesFlag : 0) |
-								(Directories ? DirectoryContent::IncludeDirsFlag : 0),
+							DirectoryContentFlags::Recursive | (Files ? DirectoryContentFlags::IncludeFiles : DirectoryContentFlags::None) |
+								(Directories ? DirectoryContentFlags::IncludeDirs : DirectoryContentFlags::None),
 							DirectoryContent);
 		std::vector<std::filesystem::path> Result;
 		Result.insert(Result.end(), DirectoryContent.Directories.begin(), DirectoryContent.Directories.end());