merge 5.7.8 minimal release (#635)

merge back all the cherry-picks

2 files changed, 23 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26a3c27f7..c7abc2658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,30 @@
 ##
+- Include all changes from 5.7.7
 - Improvement: Hide compress/download rates when uploading build when complete
 - Improvement: Compress partial file chunks inside blocks if appropriate
-- Bugfix: Fixed ASSERT when using `zen workspace create` command
-- Bugfix: Fixed race condition in Latch. Sometimes the Wait() could early out before the completion event had been set
-- Bugfix: Fixed issue on MacOS where trace options would not stick due to `IterateCommandlineArgs` bug
 - Bugfix: If we fail to finalize a build part during `zen builds upload` due to request of upload of pre-existing blobs, fail the upload after retry attempts
 - Bugfix: Don't display "Validating" progress title during download if validation is disabled
 
+## 5.7.8
+- Rollback to 5.7.6
+- Updated: Bump vcpkg version to 2024.06.15
+- Improvement: Exclude .sym and .psym files from chunking and compress them as individual chunks
+- Improvement: Exclude .ogg and .jpg files from chunking and compress them as individual chunks
+- Improvement: Exclude various source code file extensions from chunking and compress them as individual chunks
+- Improvement: Self-hosted dashboard's summary of stats if more robust to future changes
+- Improvement: Change the logic for number of network and disk threads for `zen builds` commands
+- Improvement: Optimized file size check if currently written CAS block file
+- Improvement: Flushing of CAS block store files are now done outside of synchronization lock
+- Bugfix: Add quotes around messages when using `--log-progress` with `zen builds` commands
+- Bugfix: Fix ASSERT after running `zen workspace info` on a non-existing workspace
+- Bugfix: Fixed ASSERT when using `zen workspace create` command
+- Bugfix: Storage stats of builds on dashboard start page fixed
+- Bugfix: Fixed progress reporting when scanning for changes in local folder state
+- Bugfix: Fixed issue on MacOS where trace options would not stick due to `IterateCommandlineArgs` bug
+- Bugfix: Fixed race condition in Latch. Sometimes the Wait() could early out before the completion event had been set
+- Bugfix: Flushing of CAS block store files are now done after the block is fully written
+- Bugfix: Fixed ASSERT when using zen builds download with include/exclude wildcards
+
 ## 5.7.7
 - Feature: Added `zen builds prime-cache` command to download all blocks and build blobs for a build and upload to a zen cache host
   - This replaces the `--cache-prime-only` option for the `zen builds download` command
diff --git a/src/zenremotestore/chunking/chunkedcontent.cpp b/src/zenremotestore/chunking/chunkedcontent.cpp
index 5e6cb9ba5..af1f06cec 100644
--- a/src/zenremotestore/chunking/chunkedcontent.cpp
+++ b/src/zenremotestore/chunking/chunkedcontent.cpp
@@ -717,6 +717,8 @@ DeletePathsFromChunkedContent(const ChunkedFolderContent&			 BaseContent,
 		Result.ChunkedContent.ChunkRawSizes.reserve(BaseChunkCount);
 
 		tsl::robin_map<IoHash, uint32_t, IoHash::Hasher> RawHashToSequenceRawHashIndex;
+		RawHashToSequenceRawHashIndex.reserve(ExpectedPathCount);
+		Result.ChunkedContent.SequenceRawHashes.reserve(ExpectedPathCount);
 		for (uint32_t PathIndex = 0; PathIndex < BaseContent.Paths.size(); PathIndex++)
 		{
 			const std::filesystem::path& Path = BaseContent.Paths[PathIndex];