Pass a whole blobinfocache.DigestCompressorData to CandidateTemplateW…

…ithCompression

This is why we introduced DigestCompressorData in the first place, so that
this function can easily work with the full information.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

pkg/blobinfocache/boltdb/boltdb.go

@@ -373,7 +373,11 @@ func (bdc *cache) appendReplacementCandidates(candidates []prioritize.CandidateW
 			compressorName = string(compressorNameValue)
 		}
 	}
-	template := prioritize.CandidateTemplateWithCompression(v2Options, digest, compressorName)
+	template := prioritize.CandidateTemplateWithCompression(v2Options, digest, blobinfocache.DigestCompressorData{
+		BaseVariantCompressor:      compressorName,
+		SpecificVariantCompressor:  blobinfocache.UnknownCompression,
+		SpecificVariantAnnotations: nil,
+	})
 	if template == nil {
 		return candidates
 	}

pkg/blobinfocache/internal/prioritize/prioritize.go

@@ -25,14 +25,14 @@ const replacementAttempts = 5
 // This is a heuristic/guess, and could well use a different value.
 const replacementUnknownLocationAttempts = 2
 
-// CandidateTemplateWithCompression returns a partially-filled BICReplacementCandidate2  if a blob
-// with compressionName (which can be Uncompressed or UnknownCompression) is acceptable for a CandidateLocations* call with v2Options.
+// CandidateTemplateWithCompression returns a partially-filled BICReplacementCandidate2 if a blob
+// with data is acceptable for a CandidateLocations* call with v2Options.
 //
 // v2Options can be set to nil if the call is CandidateLocations (i.e. compression is not required to be known);
 // if not nil, the call is assumed to be CandidateLocations2.
 //
 // The returned value is suitable for CandidateWithLocation and CandidateWithUnknownLocation.
-func CandidateTemplateWithCompression(v2Options *blobinfocache.CandidateLocations2Options, digest digest.Digest, compressorName string) *blobinfocache.BICReplacementCandidate2 {
+func CandidateTemplateWithCompression(v2Options *blobinfocache.CandidateLocations2Options, digest digest.Digest, data blobinfocache.DigestCompressorData) *blobinfocache.BICReplacementCandidate2 {
 	if v2Options == nil {
 		return &blobinfocache.BICReplacementCandidate2{ // Anything goes. The CompressionOperation, CompressionAlgorithm values are not used.
 			Digest:                 digest,
@@ -42,7 +42,7 @@ func CandidateTemplateWithCompression(v2Options *blobinfocache.CandidateLocation
 		}
 	}
 
-	switch compressorName {
+	switch data.BaseVariantCompressor {
 	case blobinfocache.Uncompressed:
 		return &blobinfocache.BICReplacementCandidate2{
 			Digest:                 digest,
@@ -54,10 +54,10 @@ func CandidateTemplateWithCompression(v2Options *blobinfocache.CandidateLocation
 		logrus.Debugf("Ignoring BlobInfoCache record of digest %q with unknown compression", digest.String())
 		return nil // Not allowed with CandidateLocations2
 	default:
-		algo, err := compression.AlgorithmByName(compressorName)
+		algo, err := compression.AlgorithmByName(data.BaseVariantCompressor)
 		if err != nil {
 			logrus.Debugf("Ignoring BlobInfoCache record of digest %q with unrecognized compression %q: %v",
-				digest.String(), compressorName, err)
+				digest.String(), data.BaseVariantCompressor, err)
 			return nil // The BICReplacementCandidate2.CompressionAlgorithm field is required
 		}
 
@@ -70,7 +70,7 @@ func CandidateTemplateWithCompression(v2Options *blobinfocache.CandidateLocation
 				requiredCompresssion = v2Options.RequiredCompression.Name()
 			}
 			logrus.Debugf("Ignoring BlobInfoCache record of digest %q, compression %q does not match required %s or MIME types %#v",
-				digest.String(), compressorName, requiredCompresssion, v2Options.PossibleManifestFormats)
+				digest.String(), data.BaseVariantCompressor, requiredCompresssion, v2Options.PossibleManifestFormats)
 			return nil
 		}
 

pkg/blobinfocache/memory/memory.go

@@ -179,7 +179,11 @@ func (mem *cache) appendReplacementCandidates(candidates []prioritize.CandidateW
 	if v, ok := mem.compressors[digest]; ok {
 		compressorName = v
 	}
-	template := prioritize.CandidateTemplateWithCompression(v2Options, digest, compressorName)
+	template := prioritize.CandidateTemplateWithCompression(v2Options, digest, blobinfocache.DigestCompressorData{
+		BaseVariantCompressor:      compressorName,
+		SpecificVariantCompressor:  blobinfocache.UnknownCompression,
+		SpecificVariantAnnotations: nil,
+	})
 	if template == nil {
 		return candidates
 	}

pkg/blobinfocache/sqlite/sqlite.go

@@ -507,7 +507,11 @@ func (sqc *cache) appendReplacementCandidates(candidates []prioritize.CandidateW
 			compressorName = compressor
 		}
 	}
-	template := prioritize.CandidateTemplateWithCompression(v2Options, digest, compressorName)
+	template := prioritize.CandidateTemplateWithCompression(v2Options, digest, blobinfocache.DigestCompressorData{
+		BaseVariantCompressor:      compressorName,
+		SpecificVariantCompressor:  blobinfocache.UnknownCompression,
+		SpecificVariantAnnotations: nil,
+	})
 	if template == nil {
 		return candidates, nil
 	}