Update gomod and vendor

2025-09-11 03:59:35 +00:00 · 2021-01-19 18:29:09 +01:00
parent dbd37afced
commit 7b25a54653
930 changed files with 183699 additions and 4609 deletions
--- a/vendor/github.com/moby/buildkit/solver/combinedcache.go
+++ b/vendor/github.com/moby/buildkit/solver/combinedcache.go
@@ -0,0 +1,143 @@
+package solver
+
+import (
+	"context"
+	"strings"
+	"sync"
+	"time"
+
+	digest "github.com/opencontainers/go-digest"
+	"github.com/pkg/errors"
+	"golang.org/x/sync/errgroup"
+)
+
+func NewCombinedCacheManager(cms []CacheManager, main CacheManager) CacheManager {
+	return &combinedCacheManager{cms: cms, main: main}
+}
+
+type combinedCacheManager struct {
+	cms    []CacheManager
+	main   CacheManager
+	id     string
+	idOnce sync.Once
+}
+
+func (cm *combinedCacheManager) ID() string {
+	cm.idOnce.Do(func() {
+		ids := make([]string, len(cm.cms))
+		for i, c := range cm.cms {
+			ids[i] = c.ID()
+		}
+		cm.id = digest.FromBytes([]byte(strings.Join(ids, ","))).String()
+	})
+	return cm.id
+}
+
+func (cm *combinedCacheManager) Query(inp []CacheKeyWithSelector, inputIndex Index, dgst digest.Digest, outputIndex Index) ([]*CacheKey, error) {
+	eg, _ := errgroup.WithContext(context.TODO())
+	keys := make(map[string]*CacheKey, len(cm.cms))
+	var mu sync.Mutex
+	for _, c := range cm.cms {
+		func(c CacheManager) {
+			eg.Go(func() error {
+				recs, err := c.Query(inp, inputIndex, dgst, outputIndex)
+				if err != nil {
+					return err
+				}
+				mu.Lock()
+				for _, r := range recs {
+					if _, ok := keys[r.ID]; !ok || c == cm.main {
+						keys[r.ID] = r
+					}
+				}
+				mu.Unlock()
+				return nil
+			})
+		}(c)
+	}
+
+	if err := eg.Wait(); err != nil {
+		return nil, err
+	}
+
+	out := make([]*CacheKey, 0, len(keys))
+	for _, k := range keys {
+		out = append(out, k)
+	}
+	return out, nil
+}
+
+func (cm *combinedCacheManager) Load(ctx context.Context, rec *CacheRecord) (res Result, err error) {
+	results, err := rec.cacheManager.LoadWithParents(ctx, rec)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		for i, res := range results {
+			if err == nil && i == 0 {
+				continue
+			}
+			res.Result.Release(context.TODO())
+		}
+	}()
+	if rec.cacheManager != cm.main && cm.main != nil {
+		for _, res := range results {
+			if _, err := cm.main.Save(res.CacheKey, res.Result, res.CacheResult.CreatedAt); err != nil {
+				return nil, err
+			}
+		}
+	}
+	if len(results) == 0 { // TODO: handle gracefully
+		return nil, errors.Errorf("failed to load deleted cache")
+	}
+	return results[0].Result, nil
+}
+
+func (cm *combinedCacheManager) Save(key *CacheKey, s Result, createdAt time.Time) (*ExportableCacheKey, error) {
+	if cm.main == nil {
+		return nil, nil
+	}
+	return cm.main.Save(key, s, createdAt)
+}
+
+func (cm *combinedCacheManager) Records(ck *CacheKey) ([]*CacheRecord, error) {
+	if len(ck.ids) == 0 {
+		return nil, errors.Errorf("no results")
+	}
+
+	records := map[string]*CacheRecord{}
+	var mu sync.Mutex
+
+	eg, _ := errgroup.WithContext(context.TODO())
+	for c := range ck.ids {
+		func(c *cacheManager) {
+			eg.Go(func() error {
+				recs, err := c.Records(ck)
+				if err != nil {
+					return err
+				}
+				mu.Lock()
+				for _, rec := range recs {
+					if _, ok := records[rec.ID]; !ok || c == cm.main {
+						if c == cm.main {
+							rec.Priority = 1
+						}
+						records[rec.ID] = rec
+					}
+				}
+				mu.Unlock()
+				return nil
+			})
+		}(c)
+	}
+
+	if err := eg.Wait(); err != nil {
+		return nil, err
+	}
+
+	out := make([]*CacheRecord, 0, len(records))
+	for _, rec := range records {
+		out = append(out, rec)
+	}
+	return out, nil
+}