aboutsummaryrefslogtreecommitdiff
path: root/weed
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2024-04-29 18:42:31 -0700
committerGitHub <noreply@github.com>2024-04-29 18:42:31 -0700
commit36a1cf036180ec0ba8549fed21543f42bdedccb7 (patch)
tree6afaea01d580c8aabd5d4a22e56403aebfe968b4 /weed
parent6d8283d45822291945b6c311f067569ee95f8300 (diff)
downloadseaweedfs-36a1cf036180ec0ba8549fed21543f42bdedccb7.tar.xz
seaweedfs-36a1cf036180ec0ba8549fed21543f42bdedccb7.zip
chore(deps): bump github.com/viant/ptrie from 0.3.1 to 1.0.1 (#5552)
* chore(deps): bump github.com/viant/ptrie from 0.3.1 to 1.0.1 Bumps [github.com/viant/ptrie](https://github.com/viant/ptrie) from 0.3.1 to 1.0.1. - [Release notes](https://github.com/viant/ptrie/releases) - [Changelog](https://github.com/viant/ptrie/blob/master/CHANGELOG.md) - [Commits](https://github.com/viant/ptrie/compare/v0.3.1...v1.0.1) --- updated-dependencies: - dependency-name: github.com/viant/ptrie dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix compilation --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: chrislu <chris.lu@gmail.com>
Diffstat (limited to 'weed')
-rw-r--r--weed/filer/filer_conf.go25
-rw-r--r--weed/filer/filerstore_wrapper.go8
-rw-r--r--weed/filer/remote_storage.go12
3 files changed, 21 insertions, 24 deletions
diff --git a/weed/filer/filer_conf.go b/weed/filer/filer_conf.go
index 554a00f58..25bf83771 100644
--- a/weed/filer/filer_conf.go
+++ b/weed/filer/filer_conf.go
@@ -27,7 +27,7 @@ const (
)
type FilerConf struct {
- rules ptrie.Trie
+ rules ptrie.Trie[*filer_pb.FilerConf_PathConf]
}
func ReadFilerConf(filerGrpcAddress pb.ServerAddress, grpcDialOption grpc.DialOption, masterClient *wdclient.MasterClient) (*FilerConf, error) {
@@ -55,7 +55,7 @@ func ReadFilerConf(filerGrpcAddress pb.ServerAddress, grpcDialOption grpc.DialOp
func NewFilerConf() (fc *FilerConf) {
fc = &FilerConf{
- rules: ptrie.New(),
+ rules: ptrie.New[*filer_pb.FilerConf_PathConf](),
}
return fc
}
@@ -120,8 +120,8 @@ func (fc *FilerConf) AddLocationConf(locConf *filer_pb.FilerConf_PathConf) (err
}
func (fc *FilerConf) DeleteLocationConf(locationPrefix string) {
- rules := ptrie.New()
- fc.rules.Walk(func(key []byte, value interface{}) bool {
+ rules := ptrie.New[*filer_pb.FilerConf_PathConf]()
+ fc.rules.Walk(func(key []byte, value *filer_pb.FilerConf_PathConf) bool {
if string(key) == locationPrefix {
return true
}
@@ -135,9 +135,8 @@ func (fc *FilerConf) DeleteLocationConf(locationPrefix string) {
func (fc *FilerConf) MatchStorageRule(path string) (pathConf *filer_pb.FilerConf_PathConf) {
pathConf = &filer_pb.FilerConf_PathConf{}
- fc.rules.MatchPrefix([]byte(path), func(key []byte, value interface{}) bool {
- t := value.(*filer_pb.FilerConf_PathConf)
- mergePathConf(pathConf, t)
+ fc.rules.MatchPrefix([]byte(path), func(key []byte, value *filer_pb.FilerConf_PathConf) bool {
+ mergePathConf(pathConf, value)
return true
})
return pathConf
@@ -145,10 +144,9 @@ func (fc *FilerConf) MatchStorageRule(path string) (pathConf *filer_pb.FilerConf
func (fc *FilerConf) GetCollectionTtls(collection string) (ttls map[string]string) {
ttls = make(map[string]string)
- fc.rules.Walk(func(key []byte, value interface{}) bool {
- t := value.(*filer_pb.FilerConf_PathConf)
- if t.Collection == collection {
- ttls[t.LocationPrefix] = t.GetTtl()
+ fc.rules.Walk(func(key []byte, value *filer_pb.FilerConf_PathConf) bool {
+ if value.Collection == collection {
+ ttls[value.LocationPrefix] = value.GetTtl()
}
return true
})
@@ -176,9 +174,8 @@ func mergePathConf(a, b *filer_pb.FilerConf_PathConf) {
func (fc *FilerConf) ToProto() *filer_pb.FilerConf {
m := &filer_pb.FilerConf{}
- fc.rules.Walk(func(key []byte, value interface{}) bool {
- pathConf := value.(*filer_pb.FilerConf_PathConf)
- m.Locations = append(m.Locations, pathConf)
+ fc.rules.Walk(func(key []byte, value *filer_pb.FilerConf_PathConf) bool {
+ m.Locations = append(m.Locations, value)
return true
})
return m
diff --git a/weed/filer/filerstore_wrapper.go b/weed/filer/filerstore_wrapper.go
index 986dadb77..d3beaba89 100644
--- a/weed/filer/filerstore_wrapper.go
+++ b/weed/filer/filerstore_wrapper.go
@@ -32,7 +32,7 @@ type VirtualFilerStore interface {
type FilerStoreWrapper struct {
defaultStore FilerStore
- pathToStore ptrie.Trie
+ pathToStore ptrie.Trie[string]
storeIdToStore map[string]FilerStore
}
@@ -42,7 +42,7 @@ func NewFilerStoreWrapper(store FilerStore) *FilerStoreWrapper {
}
return &FilerStoreWrapper{
defaultStore: store,
- pathToStore: ptrie.New(),
+ pathToStore: ptrie.New[string](),
storeIdToStore: make(map[string]FilerStore),
}
}
@@ -89,8 +89,8 @@ func (fsw *FilerStoreWrapper) getActualStore(path util.FullPath) (store FilerSto
return
}
var storeId string
- fsw.pathToStore.MatchPrefix([]byte(path), func(key []byte, value interface{}) bool {
- storeId = value.(string)
+ fsw.pathToStore.MatchPrefix([]byte(path), func(key []byte, value string) bool {
+ storeId = value
return false
})
if storeId != "" {
diff --git a/weed/filer/remote_storage.go b/weed/filer/remote_storage.go
index 88e7e9614..3764fbac6 100644
--- a/weed/filer/remote_storage.go
+++ b/weed/filer/remote_storage.go
@@ -21,13 +21,13 @@ const REMOTE_STORAGE_CONF_SUFFIX = ".conf"
const REMOTE_STORAGE_MOUNT_FILE = "mount.mapping"
type FilerRemoteStorage struct {
- rules ptrie.Trie
+ rules ptrie.Trie[*remote_pb.RemoteStorageLocation]
storageNameToConf map[string]*remote_pb.RemoteConf
}
func NewFilerRemoteStorage() (rs *FilerRemoteStorage) {
rs = &FilerRemoteStorage{
- rules: ptrie.New(),
+ rules: ptrie.New[*remote_pb.RemoteStorageLocation](),
storageNameToConf: make(map[string]*remote_pb.RemoteConf),
}
return rs
@@ -82,9 +82,9 @@ func (rs *FilerRemoteStorage) mapDirectoryToRemoteStorage(dir util.FullPath, loc
}
func (rs *FilerRemoteStorage) FindMountDirectory(p util.FullPath) (mountDir util.FullPath, remoteLocation *remote_pb.RemoteStorageLocation) {
- rs.rules.MatchPrefix([]byte(p), func(key []byte, value interface{}) bool {
+ rs.rules.MatchPrefix([]byte(p), func(key []byte, value *remote_pb.RemoteStorageLocation) bool {
mountDir = util.FullPath(string(key[:len(key)-1]))
- remoteLocation = value.(*remote_pb.RemoteStorageLocation)
+ remoteLocation = value
return true
})
return
@@ -92,8 +92,8 @@ func (rs *FilerRemoteStorage) FindMountDirectory(p util.FullPath) (mountDir util
func (rs *FilerRemoteStorage) FindRemoteStorageClient(p util.FullPath) (client remote_storage.RemoteStorageClient, remoteConf *remote_pb.RemoteConf, found bool) {
var storageLocation *remote_pb.RemoteStorageLocation
- rs.rules.MatchPrefix([]byte(p), func(key []byte, value interface{}) bool {
- storageLocation = value.(*remote_pb.RemoteStorageLocation)
+ rs.rules.MatchPrefix([]byte(p), func(key []byte, value *remote_pb.RemoteStorageLocation) bool {
+ storageLocation = value
return true
})