aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-12-26 15:21:12 -0800
committerChris Lu <chris.lu@gmail.com>2020-12-26 15:21:12 -0800
commitda87f6b2653fbfff88a1c345d703a063155d76ef (patch)
treef4c448f44d90d564383213a13b70e110ea5c94ec
parent0a7c5f85a966460a034de3ef782f54323f6f8238 (diff)
downloadseaweedfs-da87f6b2653fbfff88a1c345d703a063155d76ef.tar.xz
seaweedfs-da87f6b2653fbfff88a1c345d703a063155d76ef.zip
remove unused code
-rw-r--r--weed/filer/filer_search.go19
1 files changed, 8 insertions, 11 deletions
diff --git a/weed/filer/filer_search.go b/weed/filer/filer_search.go
index 9622b51eb..b26959cb0 100644
--- a/weed/filer/filer_search.go
+++ b/weed/filer/filer_search.go
@@ -7,19 +7,16 @@ import (
"strings"
)
-func splitPattern(pattern string) (prefix string, restPattern string, hasUpper bool) {
- for i := 0; i < len(pattern); i++ {
- hasUpper = hasUpper || ('A' <= pattern[i] && pattern[i] <= 'Z')
- }
+func splitPattern(pattern string) (prefix string, restPattern string) {
position := strings.Index(pattern, "*")
if position >= 0 {
- return pattern[:position], pattern[position:], hasUpper
+ return pattern[:position], pattern[position:]
}
position = strings.Index(pattern, "?")
if position >= 0 {
- return pattern[:position], pattern[position:], hasUpper
+ return pattern[:position], pattern[position:]
}
- return "", restPattern, hasUpper
+ return "", restPattern
}
func (f *Filer) ListDirectoryEntries(ctx context.Context, p util.FullPath, startFileName string, inclusive bool, limit int, namePattern string) (entries []*Entry, err error) {
@@ -27,15 +24,15 @@ func (f *Filer) ListDirectoryEntries(ctx context.Context, p util.FullPath, start
p = p[0 : len(p)-1]
}
- prefix, restNamePattern, hasUpper := splitPattern(namePattern)
+ prefix, restNamePattern := splitPattern(namePattern)
var missedCount int
var lastFileName string
- entries, missedCount, lastFileName, err = f.doListPatternMatchedEntries(ctx, p, startFileName, inclusive, limit, prefix, restNamePattern, hasUpper)
+ entries, missedCount, lastFileName, err = f.doListPatternMatchedEntries(ctx, p, startFileName, inclusive, limit, prefix, restNamePattern)
for missedCount > 0 && err == nil {
var makeupEntries []*Entry
- makeupEntries, missedCount, lastFileName, err = f.doListPatternMatchedEntries(ctx, p, lastFileName, false, missedCount, prefix, restNamePattern, hasUpper)
+ makeupEntries, missedCount, lastFileName, err = f.doListPatternMatchedEntries(ctx, p, lastFileName, false, missedCount, prefix, restNamePattern)
for _, entry := range makeupEntries {
entries = append(entries, entry)
}
@@ -44,7 +41,7 @@ func (f *Filer) ListDirectoryEntries(ctx context.Context, p util.FullPath, start
return entries, err
}
-func (f *Filer) doListPatternMatchedEntries(ctx context.Context, p util.FullPath, startFileName string, inclusive bool, limit int, prefix, restNamePattern string, hasUpper bool) (matchedEntries []*Entry, missedCount int, lastFileName string, err error) {
+func (f *Filer) doListPatternMatchedEntries(ctx context.Context, p util.FullPath, startFileName string, inclusive bool, limit int, prefix, restNamePattern string) (matchedEntries []*Entry, missedCount int, lastFileName string, err error) {
var foundEntries []*Entry
foundEntries, lastFileName, err = f.doListValidEntries(ctx, p, startFileName, inclusive, limit, prefix)