aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2025-10-27 10:22:57 +0100
committerGitHub Enterprise <[email protected]>2025-10-27 10:22:57 +0100
commitef86cb465997d20d34d4217acc64a51cfd2ab1d9 (patch)
treec3ac98560ddb04e8634180fc6e81733689722820
parent5.7.7-pre6 (diff)
downloadzen-ef86cb465997d20d34d4217acc64a51cfd2ab1d9.tar.xz
zen-ef86cb465997d20d34d4217acc64a51cfd2ab1d9.zip
use already built lookup when verifying folder (#615)
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zen/cmds/builds_cmd.cpp5
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d908048c9..0dc7b3e0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
- Improvement: If gc disk usage log file is corrupt, remove and restart the log
- Improvement: Optimized file size check if currently written CAS block file
- Improvement: Remove speculative RemoveFile call when saving large blobs in CAS store
+- Improvement: Don't rebuild content lookup when verifying a folder downloaded with `zen builds download`
- 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. UE-349934
- Bugfix: Fixed issue where GC could start after shutdown of GC had been requested causing a race
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index c5b9c4d70..3ba8cdfcc 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -838,6 +838,7 @@ namespace {
};
void VerifyFolder(const ChunkedFolderContent& Content,
+ const ChunkedContentLookup& Lookup,
const std::filesystem::path& Path,
bool VerifyFileHash,
VerifyFolderStatistics& VerifyFolderStats)
@@ -875,8 +876,6 @@ namespace {
return true;
};
- const ChunkedContentLookup Lookup = BuildChunkedContentLookup(Content);
-
for (uint32_t PathIndex = 0; PathIndex < PathCount; PathIndex++)
{
if (Work.IsAborted())
@@ -2247,7 +2246,7 @@ namespace {
ProgressBar::SetLogOperationProgress(ProgressMode, TaskSteps::Verify, TaskSteps::StepCount);
- VerifyFolder(RemoteContent, Path, Options.PostDownloadVerify, VerifyFolderStats);
+ VerifyFolder(RemoteContent, RemoteLookup, Path, Options.PostDownloadVerify, VerifyFolderStats);
Stopwatch WriteStateTimer;
CbObject StateObject = CreateStateObject(BuildId, AllBuildParts, PartContents, LocalFolderState, Path);