Worker set its working directory (#8461)
* set working directory * consolidate to worker directory * working directory * correct directory name * refactoring to use wildcard matcher * simplify * cleaning ec working directory * fix reference * clean * adjust test
This commit is contained in:
39
weed/util/wildcard/filter.go
Normal file
39
weed/util/wildcard/filter.go
Normal file
@@ -0,0 +1,39 @@
|
||||
package wildcard
|
||||
|
||||
import "strings"
|
||||
|
||||
// CompileWildcardMatchers parses comma-separated wildcard patterns and compiles them.
|
||||
// Empty tokens are ignored. Invalid patterns are skipped.
|
||||
func CompileWildcardMatchers(filter string) []*WildcardMatcher {
|
||||
parts := strings.Split(filter, ",")
|
||||
matchers := make([]*WildcardMatcher, 0, len(parts))
|
||||
for _, part := range parts {
|
||||
trimmed := strings.TrimSpace(part)
|
||||
if trimmed == "" {
|
||||
continue
|
||||
}
|
||||
matcher, err := NewWildcardMatcher(trimmed)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
matchers = append(matchers, matcher)
|
||||
}
|
||||
if len(matchers) == 0 {
|
||||
return nil
|
||||
}
|
||||
return matchers
|
||||
}
|
||||
|
||||
// MatchesAnyWildcard returns true when no matcher is provided,
|
||||
// or when any matcher matches the given value.
|
||||
func MatchesAnyWildcard(matchers []*WildcardMatcher, value string) bool {
|
||||
if len(matchers) == 0 {
|
||||
return true
|
||||
}
|
||||
for _, matcher := range matchers {
|
||||
if matcher != nil && matcher.Match(value) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
186
weed/util/wildcard/wildcard_matcher.go
Normal file
186
weed/util/wildcard/wildcard_matcher.go
Normal file
@@ -0,0 +1,186 @@
|
||||
package wildcard
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
||||
)
|
||||
|
||||
// WildcardMatcher provides unified wildcard matching functionality.
|
||||
type WildcardMatcher struct {
|
||||
useRegex bool
|
||||
regex *regexp.Regexp
|
||||
pattern string
|
||||
}
|
||||
|
||||
// WildcardMatcherCache provides caching for WildcardMatcher instances.
|
||||
type WildcardMatcherCache struct {
|
||||
mu sync.RWMutex
|
||||
matchers map[string]*WildcardMatcher
|
||||
maxSize int
|
||||
accessOrder []string
|
||||
}
|
||||
|
||||
// NewWildcardMatcherCache creates a new WildcardMatcherCache with a configurable maxSize.
|
||||
func NewWildcardMatcherCache(maxSize int) *WildcardMatcherCache {
|
||||
if maxSize <= 0 {
|
||||
maxSize = 1000
|
||||
}
|
||||
return &WildcardMatcherCache{
|
||||
matchers: make(map[string]*WildcardMatcher),
|
||||
maxSize: maxSize,
|
||||
}
|
||||
}
|
||||
|
||||
var wildcardMatcherCache = NewWildcardMatcherCache(1000)
|
||||
|
||||
// GetCachedWildcardMatcher gets or creates a cached WildcardMatcher for the given pattern.
|
||||
func GetCachedWildcardMatcher(pattern string) (*WildcardMatcher, error) {
|
||||
wildcardMatcherCache.mu.RLock()
|
||||
if matcher, exists := wildcardMatcherCache.matchers[pattern]; exists {
|
||||
wildcardMatcherCache.mu.RUnlock()
|
||||
wildcardMatcherCache.updateAccessOrder(pattern)
|
||||
return matcher, nil
|
||||
}
|
||||
wildcardMatcherCache.mu.RUnlock()
|
||||
|
||||
wildcardMatcherCache.mu.Lock()
|
||||
defer wildcardMatcherCache.mu.Unlock()
|
||||
|
||||
if matcher, exists := wildcardMatcherCache.matchers[pattern]; exists {
|
||||
wildcardMatcherCache.updateAccessOrderLocked(pattern)
|
||||
return matcher, nil
|
||||
}
|
||||
|
||||
matcher, err := NewWildcardMatcher(pattern)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(wildcardMatcherCache.matchers) >= wildcardMatcherCache.maxSize {
|
||||
wildcardMatcherCache.evictLeastRecentlyUsed()
|
||||
}
|
||||
|
||||
wildcardMatcherCache.matchers[pattern] = matcher
|
||||
wildcardMatcherCache.accessOrder = append(wildcardMatcherCache.accessOrder, pattern)
|
||||
return matcher, nil
|
||||
}
|
||||
|
||||
func (c *WildcardMatcherCache) updateAccessOrder(pattern string) {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
c.updateAccessOrderLocked(pattern)
|
||||
}
|
||||
|
||||
func (c *WildcardMatcherCache) updateAccessOrderLocked(pattern string) {
|
||||
for i, p := range c.accessOrder {
|
||||
if p == pattern {
|
||||
c.accessOrder = append(c.accessOrder[:i], c.accessOrder[i+1:]...)
|
||||
break
|
||||
}
|
||||
}
|
||||
c.accessOrder = append(c.accessOrder, pattern)
|
||||
}
|
||||
|
||||
func (c *WildcardMatcherCache) evictLeastRecentlyUsed() {
|
||||
if len(c.accessOrder) == 0 {
|
||||
return
|
||||
}
|
||||
lruPattern := c.accessOrder[0]
|
||||
c.accessOrder = c.accessOrder[1:]
|
||||
delete(c.matchers, lruPattern)
|
||||
}
|
||||
|
||||
func (c *WildcardMatcherCache) ClearCache() {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
c.matchers = make(map[string]*WildcardMatcher)
|
||||
c.accessOrder = c.accessOrder[:0]
|
||||
}
|
||||
|
||||
func (c *WildcardMatcherCache) GetCacheStats() (size int, maxSize int) {
|
||||
c.mu.RLock()
|
||||
defer c.mu.RUnlock()
|
||||
return len(c.matchers), c.maxSize
|
||||
}
|
||||
|
||||
// NewWildcardMatcher creates a new wildcard matcher for the given pattern.
|
||||
func NewWildcardMatcher(pattern string) (*WildcardMatcher, error) {
|
||||
matcher := &WildcardMatcher{pattern: pattern, useRegex: false}
|
||||
return matcher, nil
|
||||
}
|
||||
|
||||
// Match checks if a string matches the wildcard pattern.
|
||||
func (m *WildcardMatcher) Match(str string) bool {
|
||||
if m.useRegex {
|
||||
return m.regex.MatchString(str)
|
||||
}
|
||||
return matchWildcardString(m.pattern, str)
|
||||
}
|
||||
|
||||
// MatchesWildcard provides a simple function interface for wildcard matching.
|
||||
func MatchesWildcard(pattern, str string) bool {
|
||||
return matchWildcardString(pattern, str)
|
||||
}
|
||||
|
||||
// FastMatchesWildcard uses a cached WildcardMatcher for repeated pattern matching.
|
||||
func FastMatchesWildcard(pattern, str string) bool {
|
||||
matcher, err := GetCachedWildcardMatcher(pattern)
|
||||
if err != nil {
|
||||
glog.Errorf("Error getting cached WildcardMatcher for pattern %s: %v. Falling back to MatchesWildcard.", pattern, err)
|
||||
return MatchesWildcard(pattern, str)
|
||||
}
|
||||
return matcher.Match(str)
|
||||
}
|
||||
|
||||
// CompileWildcardPattern converts a wildcard pattern to a compiled regex.
|
||||
func CompileWildcardPattern(pattern string) (*regexp.Regexp, error) {
|
||||
return compileWildcardPattern(pattern)
|
||||
}
|
||||
|
||||
func matchWildcardString(pattern, str string) bool {
|
||||
if pattern == "*" {
|
||||
return true
|
||||
}
|
||||
if pattern == str {
|
||||
return true
|
||||
}
|
||||
|
||||
targetIndex := 0
|
||||
patternIndex := 0
|
||||
lastStarIndex := -1
|
||||
lastStarMatchIndex := 0
|
||||
|
||||
for targetIndex < len(str) {
|
||||
switch {
|
||||
case patternIndex < len(pattern) && (pattern[patternIndex] == '?' || pattern[patternIndex] == str[targetIndex]):
|
||||
targetIndex++
|
||||
patternIndex++
|
||||
case patternIndex < len(pattern) && pattern[patternIndex] == '*':
|
||||
lastStarIndex = patternIndex
|
||||
lastStarMatchIndex = targetIndex
|
||||
patternIndex++
|
||||
case lastStarIndex != -1:
|
||||
patternIndex = lastStarIndex + 1
|
||||
lastStarMatchIndex++
|
||||
targetIndex = lastStarMatchIndex
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
for patternIndex < len(pattern) && pattern[patternIndex] == '*' {
|
||||
patternIndex++
|
||||
}
|
||||
return patternIndex == len(pattern)
|
||||
}
|
||||
|
||||
func compileWildcardPattern(pattern string) (*regexp.Regexp, error) {
|
||||
escaped := regexp.QuoteMeta(pattern)
|
||||
escaped = strings.ReplaceAll(escaped, `\*`, `.*`)
|
||||
escaped = strings.ReplaceAll(escaped, `\?`, `.`)
|
||||
escaped = "^" + escaped + "$"
|
||||
return regexp.Compile(escaped)
|
||||
}
|
||||
211
weed/util/wildcard/wildcard_matcher_test.go
Normal file
211
weed/util/wildcard/wildcard_matcher_test.go
Normal file
@@ -0,0 +1,211 @@
|
||||
package wildcard
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestMatchesWildcard(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
pattern string
|
||||
str string
|
||||
expected bool
|
||||
}{
|
||||
{"Exact match", "test", "test", true},
|
||||
{"Single wildcard", "*", "anything", true},
|
||||
{"Empty string with wildcard", "*", "", true},
|
||||
{"Prefix wildcard", "test*", "test123", true},
|
||||
{"Suffix wildcard", "*test", "123test", true},
|
||||
{"Middle wildcard", "test*123", "testABC123", true},
|
||||
{"Multiple wildcards", "test*abc*123", "testXYZabcDEF123", true},
|
||||
{"No match", "test*", "other", false},
|
||||
{"Single question mark", "test?", "test1", true},
|
||||
{"Multiple question marks", "test??", "test12", true},
|
||||
{"Question mark no match", "test?", "test12", false},
|
||||
{"Mixed wildcards", "test*abc?def", "testXYZabc1def", true},
|
||||
{"Empty pattern", "", "", true},
|
||||
{"Empty pattern with string", "", "test", false},
|
||||
{"Pattern with string empty", "test", "", false},
|
||||
{"Pattern with regex special chars", "test[abc]", "test[abc]", true},
|
||||
{"Pattern with dots", "test.txt", "test.txt", true},
|
||||
{"Pattern with dots and wildcard", "*.txt", "test.txt", true},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := MatchesWildcard(tt.pattern, tt.str)
|
||||
if got != tt.expected {
|
||||
t.Errorf("MatchesWildcard(%q, %q) = %v, want %v", tt.pattern, tt.str, got, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestWildcardMatcherMatch(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
pattern string
|
||||
inputs []string
|
||||
expected []bool
|
||||
}{
|
||||
{"Simple star", "test*", []string{"test", "test123", "testing", "other"}, []bool{true, true, true, false}},
|
||||
{"Question mark", "test?", []string{"test1", "test2", "test", "test12"}, []bool{true, true, false, false}},
|
||||
{"Extension filter", "*.txt", []string{"file.txt", "test.txt", "file.doc", "txt"}, []bool{true, true, false, false}},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
m, err := NewWildcardMatcher(tt.pattern)
|
||||
if err != nil {
|
||||
t.Fatalf("NewWildcardMatcher: %v", err)
|
||||
}
|
||||
for i, s := range tt.inputs {
|
||||
got := m.Match(s)
|
||||
if got != tt.expected[i] {
|
||||
t.Errorf("Match(%q) = %v, want %v", s, got, tt.expected[i])
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCompileWildcardPattern(t *testing.T) {
|
||||
tests := []struct {
|
||||
pattern string
|
||||
input string
|
||||
want bool
|
||||
}{
|
||||
{"s3:Get*", "s3:GetObject", true},
|
||||
{"s3:Get?bject", "s3:GetObject", true},
|
||||
{"s3:*Object*", "s3:GetObjectAcl", true},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.pattern, func(t *testing.T) {
|
||||
re, err := CompileWildcardPattern(tt.pattern)
|
||||
if err != nil {
|
||||
t.Fatalf("CompileWildcardPattern: %v", err)
|
||||
}
|
||||
if got := re.MatchString(tt.input); got != tt.want {
|
||||
t.Errorf("got %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFastMatchesWildcard(t *testing.T) {
|
||||
tests := []struct {
|
||||
pattern string
|
||||
input string
|
||||
want bool
|
||||
}{
|
||||
{"s3:Get*", "s3:GetObject", true},
|
||||
{"s3:Put*", "s3:GetObject", false},
|
||||
{"arn:aws:s3:::bucket/*", "arn:aws:s3:::bucket/file.txt", true},
|
||||
{"user:admin-*", "user:admin-john", true},
|
||||
{"user:admin-*", "user:guest-john", false},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.pattern+"_"+tt.input, func(t *testing.T) {
|
||||
got := FastMatchesWildcard(tt.pattern, tt.input)
|
||||
if got != tt.want {
|
||||
t.Errorf("FastMatchesWildcard(%q, %q) = %v, want %v", tt.pattern, tt.input, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestWildcardMatcherCaching(t *testing.T) {
|
||||
m1, err := GetCachedWildcardMatcher("s3:Get*")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
m2, err := GetCachedWildcardMatcher("s3:Get*")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if m1 != m2 {
|
||||
t.Error("expected same cached instance")
|
||||
}
|
||||
if !m1.Match("s3:GetObject") {
|
||||
t.Error("expected match")
|
||||
}
|
||||
}
|
||||
|
||||
func TestWildcardMatcherCacheBounding(t *testing.T) {
|
||||
wildcardMatcherCache.ClearCache()
|
||||
orig := wildcardMatcherCache.maxSize
|
||||
wildcardMatcherCache.maxSize = 3
|
||||
defer func() {
|
||||
wildcardMatcherCache.maxSize = orig
|
||||
wildcardMatcherCache.ClearCache()
|
||||
}()
|
||||
for _, p := range []string{"p1", "p2", "p3"} {
|
||||
GetCachedWildcardMatcher(p)
|
||||
}
|
||||
size, maxSize := wildcardMatcherCache.GetCacheStats()
|
||||
if size != 3 {
|
||||
t.Errorf("expected size 3, got %d", size)
|
||||
}
|
||||
if maxSize != 3 {
|
||||
t.Errorf("expected maxSize 3, got %d", maxSize)
|
||||
}
|
||||
GetCachedWildcardMatcher("p4")
|
||||
size, _ = wildcardMatcherCache.GetCacheStats()
|
||||
if size != 3 {
|
||||
t.Errorf("expected size 3 after eviction, got %d", size)
|
||||
}
|
||||
wildcardMatcherCache.mu.RLock()
|
||||
defer wildcardMatcherCache.mu.RUnlock()
|
||||
if _, ok := wildcardMatcherCache.matchers["p1"]; ok {
|
||||
t.Error("p1 should have been evicted (LRU)")
|
||||
}
|
||||
if _, ok := wildcardMatcherCache.matchers["p4"]; !ok {
|
||||
t.Error("p4 should be in cache")
|
||||
}
|
||||
}
|
||||
|
||||
func TestWildcardMatcherCacheLRU(t *testing.T) {
|
||||
wildcardMatcherCache.ClearCache()
|
||||
orig := wildcardMatcherCache.maxSize
|
||||
wildcardMatcherCache.maxSize = 3
|
||||
defer func() {
|
||||
wildcardMatcherCache.maxSize = orig
|
||||
wildcardMatcherCache.ClearCache()
|
||||
}()
|
||||
for _, p := range []string{"p1", "p2", "p3"} {
|
||||
GetCachedWildcardMatcher(p)
|
||||
}
|
||||
GetCachedWildcardMatcher("p1") // access p1 to make it most-recently used
|
||||
GetCachedWildcardMatcher("p4") // should evict p2 (now LRU)
|
||||
wildcardMatcherCache.mu.RLock()
|
||||
defer wildcardMatcherCache.mu.RUnlock()
|
||||
if _, ok := wildcardMatcherCache.matchers["p2"]; ok {
|
||||
t.Error("p2 should be evicted (least recently used)")
|
||||
}
|
||||
if _, ok := wildcardMatcherCache.matchers["p1"]; !ok {
|
||||
t.Error("p1 should remain (recently accessed)")
|
||||
}
|
||||
if _, ok := wildcardMatcherCache.matchers["p3"]; !ok {
|
||||
t.Error("p3 should remain")
|
||||
}
|
||||
if _, ok := wildcardMatcherCache.matchers["p4"]; !ok {
|
||||
t.Error("p4 should be in cache")
|
||||
}
|
||||
}
|
||||
|
||||
func TestWildcardMatcherCacheClear(t *testing.T) {
|
||||
GetCachedWildcardMatcher("test")
|
||||
wildcardMatcherCache.ClearCache()
|
||||
size, _ := wildcardMatcherCache.GetCacheStats()
|
||||
if size != 0 {
|
||||
t.Errorf("expected 0 after clear, got %d", size)
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkMatchesWildcard(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
MatchesWildcard("s3:Get*", "s3:GetObject")
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkFastMatchesWildcard(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
FastMatchesWildcard("s3:Get*", "s3:GetObject")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user