Only link what needs to be uploaded #48
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dfederm
reviewed
Jan 26, 2024
| Dictionary<DedupIdentifier, long> dedupToSize = new(); | ||
| foreach (ContentHash hash in dedupToHash.Values) | ||
| { | ||
| StreamWithLength? streamWithLength = await LocalCacheSession |
There was a problem hiding this comment.
Probably need to using so it gets disposed.
dfederm
reviewed
Jan 26, 2024
| hash => hash); | ||
|
|
||
| // open a stream to get the length of all content | ||
| Dictionary<DedupIdentifier, long> dedupToSize = new(); |
dfederm
reviewed
Jan 26, 2024
|
|
||
| foreach (KeyValuePair<string, ContentHash> output in outputs) | ||
| { | ||
| string relativePath = output.Key.MakePathRelativeTo(RepoRoot)!.Replace("\\", "/", StringComparison.Ordinal); |
There was a problem hiding this comment.
Should merge with the latest and use the helper
dfederm
reviewed
Jan 26, 2024
| relativePath, | ||
| new DedupInfo(dedupId.ValueString, (ulong)dedupToSize[dedupId]))); | ||
| } | ||
| items.Sort((i1, i2) => StringComparer.Ordinal.Compare(i1.Path, i2.Path)); |
There was a problem hiding this comment.
Should this be case-sensitive or insensitive?
dfederm
reviewed
Jan 26, 2024
| Dictionary<string, PlaceFileResult> placeResults = await TryPlaceFilesFromCacheAsync(context, tempFiles, cancellationToken); | ||
| foreach (PlaceFileResult placeResult in placeResults.Values) | ||
| // Store the manifest in local cache to simplify the code below | ||
| using MemoryStream manifestStream = new(JsonSerializer.Serialize(manifest).GetUTF8Bytes()); |
There was a problem hiding this comment.
I believe you can serialize directly to a stream, which should cut out the intermediate string.
dfederm
reviewed
Jan 26, 2024
| Dictionary<DedupIdentifier, CheckIfUploadNeededResult> uploadCheckResults = | ||
| await uploadSession.CheckIfUploadIsNeededAsync(dedupToSize, cancellationToken); | ||
|
|
||
| IEnumerable<DedupIdentifier> hashesToupload = uploadCheckResults |
There was a problem hiding this comment.
Nit: hashesToupload -> hashesToUpload
dfederm
reviewed
Jan 26, 2024
| } | ||
| else | ||
| { | ||
| DedupNode node = await ChunkFileAsync(kvp.Value, cancellationToken); |
There was a problem hiding this comment.
Does this re-hash the file? That seems a bit expensive :(
dfederm
reviewed
Jan 26, 2024
| // 3. map all the relative paths to the temp files | ||
| foreach (KeyValuePair<string, ContentHash> output in outputs) | ||
|
|
||
| while (pageRoots.Count > 1) |
There was a problem hiding this comment.
> 0? If not, might need to add a comment explaining why
dfederm
reviewed
Jan 26, 2024
| } | ||
|
|
||
| DedupNode root = pageRoots.Single(); |
dfederm
reviewed
Jan 26, 2024
|
|
||
| DedupNode root = pageRoots.Single(); | ||
|
|
||
| HashSet<DedupNode> proofNodes = ProofHelper.CreateProofNodes( |
There was a problem hiding this comment.
Can you explain what "proof" is?
dfederm
reviewed
Jan 26, 2024
| @@ -377,6 +493,9 @@ internal sealed class PipelineCachingCacheClient : CacheClient | |||
| } | |||
| } | |||
|
|
|||
| private static Task<DedupNode> ChunkFileAsync(string path, CancellationToken cancellationToken) => | |||
There was a problem hiding this comment.
This is used exactly once and is 1 line. Consider inlining it.
dfederm
reviewed
Jan 26, 2024
| infos = outputs.Keys.Select(f => new FileInfo(f)).ToArray(); | ||
| FileInfo[] infos = outputs.Keys.Select(f => new FileInfo(f)).ToArray(); | ||
| publishResult = await WithHttpRetries( | ||
| () => _manifestClient.PublishAsync(RepoRoot, infos, extras, new ArtifactPublishOptions(), manifestFileOutputPath: null, cancellationToken), |
There was a problem hiding this comment.
Do similar things need to be done here?
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.