Update for c/storage almost always computing UncompressedDigest

We will want c/storage to do that in order to avoid the traditional/partial "view"
ambiguity.

Signed-off-by: Miloslav Trmač <[email protected]>

storage/storage_dest.go

@@ -388,23 +388,21 @@ func (s *storageImageDestination) PutBlobPartial(ctx context.Context, chunkAcces
 		if out.UncompressedDigest != "" {
 			s.lockProtected.indexToDiffID[options.LayerIndex] = out.UncompressedDigest
 			if out.TOCDigest != "" {
+				s.lockProtected.indexToTOCDigest[options.LayerIndex] = out.TOCDigest
 				options.Cache.RecordTOCUncompressedPair(out.TOCDigest, out.UncompressedDigest)
 			}
-			// Don’t set indexToTOCDigest on this path:
-			// - Using UncompressedDigest allows image reuse with non-partially-pulled layers, so we want to set indexToDiffID.
-			// - If UncompressedDigest has been computed, that means the layer was read completely, and the TOC has been created from scratch.
-			//   That TOC is quite unlikely to match any other TOC value.
-
-			// The computation of UncompressedDigest means the whole layer has been consumed; while doing that, chunked.GetDiffer is
-			// responsible for ensuring blobDigest has been validated.
-			if out.CompressedDigest != blobDigest {
-				return fmt.Errorf("internal error: PrepareStagedLayer returned CompressedDigest %q not matching expected %q",
-					out.CompressedDigest, blobDigest)
+
+			// If the whole layer has been consumed, chunked.GetDiffer is responsible for ensuring blobDigest has been validated.
+			if out.CompressedDigest != "" {
+				if out.CompressedDigest != blobDigest {
+					return fmt.Errorf("internal error: PrepareStagedLayer returned CompressedDigest %q not matching expected %q",
+						out.CompressedDigest, blobDigest)
+				}
+				// So, record also information about blobDigest, that might benefit reuse.
+				// We trust PrepareStagedLayer to validate or create both values correctly.
+				s.lockProtected.blobDiffIDs[blobDigest] = out.UncompressedDigest
+				options.Cache.RecordDigestUncompressedPair(out.CompressedDigest, out.UncompressedDigest)
 			}
-			// So, record also information about blobDigest, that might benefit reuse.
-			// We trust PrepareStagedLayer to validate or create both values correctly.
-			s.lockProtected.blobDiffIDs[blobDigest] = out.UncompressedDigest
-			options.Cache.RecordDigestUncompressedPair(out.CompressedDigest, out.UncompressedDigest)
 		} else {
 			// Sanity-check the defined rules for indexToTOCDigest.
 			toc, err := toc.GetTOCDigest(srcInfo.Annotations)