Merge pull request moby#5055 from tonistiigi/immutable-radix-v2

update immutable-radix and simplelru to v2

Author: AkihiroSuda

cache/contenthash/checksum.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"sync"
 
-	iradix "github.com/hashicorp/go-immutable-radix"
-	"github.com/hashicorp/golang-lru/simplelru"
+	iradix "github.com/hashicorp/go-immutable-radix/v2"
+	simplelru "github.com/hashicorp/golang-lru/v2/simplelru"
 	"github.com/moby/buildkit/cache"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/snapshot"
@@ -31,7 +31,7 @@ var defaultManagerOnce sync.Once
 
 func getDefaultManager() *cacheManager {
 	defaultManagerOnce.Do(func() {
-		lru, _ := simplelru.NewLRU(20, nil) // error is impossible on positive size
+		lru, _ := simplelru.NewLRU[string, *cacheContext](20, nil) // error is impossible on positive size
 		defaultManager = &cacheManager{lru: lru, locker: locker.New()}
 	})
 	return defaultManager
@@ -85,7 +85,7 @@ type includedPath struct {
 
 type cacheManager struct {
 	locker *locker.Locker
-	lru    *simplelru.LRU
+	lru    *simplelru.LRU[string, *cacheContext]
 	lruMu  sync.Mutex
 }
 
@@ -110,10 +110,10 @@ func (cm *cacheManager) GetCacheContext(ctx context.Context, md cache.RefMetadat
 	cm.lruMu.Unlock()
 	if ok {
 		cm.locker.Unlock(md.ID())
-		v.(*cacheContext).mu.Lock() // locking is required because multiple ImmutableRefs can reach this code; however none of them use the linkMap.
-		v.(*cacheContext).linkMap = map[string][][]byte{}
-		v.(*cacheContext).mu.Unlock()
-		return v.(*cacheContext), nil
+		v.mu.Lock() // locking is required because multiple ImmutableRefs can reach this code; however none of them use the linkMap.
+		v.linkMap = map[string][][]byte{}
+		v.mu.Unlock()
+		return v, nil
 	}
 	cc, err := newCacheContext(md)
 	if err != nil {
@@ -159,12 +159,12 @@ func (cm *cacheManager) clearCacheContext(id string) {
 type cacheContext struct {
 	mu    sync.RWMutex
 	md    cacheMetadata
-	tree  *iradix.Tree
+	tree  *iradix.Tree[*CacheRecord]
 	dirty bool // needs to be persisted to disk
 
 	// used in HandleChange
-	txn      *iradix.Txn
-	node     *iradix.Node
+	txn      *iradix.Txn[*CacheRecord]
+	node     *iradix.Node[*CacheRecord]
 	dirtyMap map[string]struct{}
 	linkMap  map[string][][]byte
 }
@@ -224,7 +224,7 @@ func (m *mount) clean() error {
 func newCacheContext(md cache.RefMetadata) (*cacheContext, error) {
 	cc := &cacheContext{
 		md:       cacheMetadata{md},
-		tree:     iradix.New(),
+		tree:     iradix.New[*CacheRecord](),
 		dirtyMap: map[string]struct{}{},
 		linkMap:  map[string][][]byte{},
 	}
@@ -263,10 +263,10 @@ func (cc *cacheContext) save() error {
 
 	var l CacheRecords
 	node := cc.tree.Root()
-	node.Walk(func(k []byte, v interface{}) bool {
+	node.Walk(func(k []byte, v *CacheRecord) bool {
 		l.Paths = append(l.Paths, &CacheRecordWithPath{
 			Path:   string(k),
-			Record: v.(*CacheRecord),
+			Record: v,
 		})
 		return false
 	})
@@ -294,7 +294,7 @@ func (cc *cacheContext) HandleChange(kind fsutil.ChangeKind, p string, fi os.Fil
 
 	deleteDir := func(cr *CacheRecord) {
 		if cr.Type == CacheRecordTypeDir {
-			cc.node.WalkPrefix(append(k, 0), func(k []byte, v interface{}) bool {
+			cc.node.WalkPrefix(append(k, 0), func(k []byte, v *CacheRecord) bool {
 				cc.txn.Delete(k)
 				return false
 			})
@@ -322,7 +322,7 @@ func (cc *cacheContext) HandleChange(kind fsutil.ChangeKind, p string, fi os.Fil
 	if kind == fsutil.ChangeKindDelete {
 		v, ok := cc.txn.Delete(k)
 		if ok {
-			deleteDir(v.(*CacheRecord))
+			deleteDir(v)
 		}
 		d := path.Dir(p)
 		if d == "/" {
@@ -344,7 +344,7 @@ func (cc *cacheContext) HandleChange(kind fsutil.ChangeKind, p string, fi os.Fil
 
 	v, ok := cc.node.Get(k)
 	if ok {
-		deleteDir(v.(*CacheRecord))
+		deleteDir(v)
 	}
 
 	cr := &CacheRecord{
@@ -371,7 +371,7 @@ func (cc *cacheContext) HandleChange(kind fsutil.ChangeKind, p string, fi os.Fil
 		ln := path.Join("/", filepath.ToSlash(stat.Linkname))
 		v, ok := cc.txn.Get(convertPathToKey(ln))
 		if ok {
-			cp := *v.(*CacheRecord)
+			cp := *v
 			cr = &cp
 		}
 		cc.linkMap[ln] = append(cc.linkMap[ln], k)
@@ -496,7 +496,7 @@ func (cc *cacheContext) includedPaths(ctx context.Context, m *mount, p string, o
 	root = txn.Root()
 	var (
 		updated        bool
-		iter           *iradix.Iterator
+		iter           *iradix.Iterator[*CacheRecord]
 		k              []byte
 		keyOk          bool
 		origPrefix     string
@@ -716,7 +716,7 @@ func shouldIncludePath(
 	return true, nil
 }
 
-func wildcardPrefix(root *iradix.Node, p string) (string, []byte, bool, error) {
+func wildcardPrefix(root *iradix.Node[*CacheRecord], p string) (string, []byte, bool, error) {
 	// For consistency with what the copy implementation in fsutil
 	// does: split pattern into non-wildcard prefix and rest of
 	// pattern, then follow symlinks when resolving the non-wildcard
@@ -849,7 +849,7 @@ func (cc *cacheContext) scanChecksum(ctx context.Context, m *mount, p string, fo
 	return cr, err
 }
 
-func (cc *cacheContext) checksum(ctx context.Context, root *iradix.Node, txn *iradix.Txn, m *mount, k []byte, followTrailing bool) (*CacheRecord, bool, error) {
+func (cc *cacheContext) checksum(ctx context.Context, root *iradix.Node[*CacheRecord], txn *iradix.Txn[*CacheRecord], m *mount, k []byte, followTrailing bool) (*CacheRecord, bool, error) {
 	origk := k
 	k, cr, err := getFollowLinks(root, k, followTrailing)
 	if err != nil {
@@ -930,7 +930,7 @@ func (cc *cacheContext) checksum(ctx context.Context, root *iradix.Node, txn *ir
 
 // needsScan returns false if path is in the tree or a parent path is in tree
 // and subpath is missing.
-func (cc *cacheContext) needsScan(root *iradix.Node, path string, followTrailing bool) (bool, error) {
+func (cc *cacheContext) needsScan(root *iradix.Node[*CacheRecord], path string, followTrailing bool) (bool, error) {
 	var (
 		lastGoodPath    string
 		hasParentInTree bool
@@ -1047,7 +1047,7 @@ func (cc *cacheContext) scanPath(ctx context.Context, m *mount, p string, follow
 type followLinksCallback func(path string, cr *CacheRecord) error
 
 // getFollowLinks is shorthand for getFollowLinksCallback(..., nil).
-func getFollowLinks(root *iradix.Node, k []byte, followTrailing bool) ([]byte, *CacheRecord, error) {
+func getFollowLinks(root *iradix.Node[*CacheRecord], k []byte, followTrailing bool) ([]byte, *CacheRecord, error) {
 	return getFollowLinksCallback(root, k, followTrailing, nil)
 }
 
@@ -1063,10 +1063,10 @@ func getFollowLinks(root *iradix.Node, k []byte, followTrailing bool) ([]byte, *
 // The callback cb is called after each cache lookup done by
 // getFollowLinksCallback, except for the first lookup where the verbatim key
 // is looked up in the cache.
-func getFollowLinksCallback(root *iradix.Node, k []byte, followTrailing bool, cb followLinksCallback) ([]byte, *CacheRecord, error) {
+func getFollowLinksCallback(root *iradix.Node[*CacheRecord], k []byte, followTrailing bool, cb followLinksCallback) ([]byte, *CacheRecord, error) {
 	v, ok := root.Get(k)
-	if ok && (!followTrailing || v.(*CacheRecord).Type != CacheRecordTypeSymlink) {
-		return k, v.(*CacheRecord), nil
+	if ok && (!followTrailing || v.Type != CacheRecordTypeSymlink) {
+		return k, v, nil
 	}
 	if len(k) == 0 {
 		return k, nil, nil
@@ -1104,11 +1104,7 @@ func getFollowLinksCallback(root *iradix.Node, k []byte, followTrailing bool, cb
 			continue
 		}
 
-		cr = nil
-		v, ok := root.Get(convertPathToKey(nextPath))
-		if ok {
-			cr = v.(*CacheRecord)
-		}
+		cr, ok = root.Get(convertPathToKey(nextPath))
 		if cb != nil {
 			if err := cb(nextPath, cr); err != nil {
 				return nil, nil, err
@@ -1137,12 +1133,8 @@ func getFollowLinksCallback(root *iradix.Node, k []byte, followTrailing bool, cb
 	// trailing slash in the original path, we need to do the lookup again with
 	// the slash applied.
 	if hadTrailingSlash {
-		cr = nil
 		currentPath += "/"
-		v, ok := root.Get(convertPathToKey(currentPath))
-		if ok {
-			cr = v.(*CacheRecord)
-		}
+		cr, _ = root.Get(convertPathToKey(currentPath))
 		if cb != nil {
 			if err := cb(currentPath, cr); err != nil {
 				return nil, nil, err

go.mod

@@ -40,9 +40,9 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/hashicorp/go-immutable-radix v1.3.1
+	github.com/hashicorp/go-immutable-radix/v2 v2.1.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/hashicorp/golang-lru/v2 v2.0.0
 	github.com/in-toto/in-toto-golang v0.5.0
 	github.com/klauspost/compress v1.17.4
 	github.com/mitchellh/hashstructure/v2 v2.0.2

go.sum

@@ -241,17 +241,16 @@ github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/S
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
 github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo=
+github.com/hashicorp/go-immutable-radix/v2 v2.1.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M=
 github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
-github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru/v2 v2.0.0 h1:Lf+9eD8m5pncvHAOCQj49GSN6aQI8XGfI5OpXNkoWaA=
+github.com/hashicorp/golang-lru/v2 v2.0.0/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
@@ -466,6 +465,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=