gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

remove unused code

Browse source
This commit is contained in:
Chris Lu 2020-12-26 15:21:12 -08:00
parent 0a7c5f85a9
commit da87f6b265
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
weed/filer/filer_search.go
View file

@ -7,19 +7,16 @@ import (
"strings" "strings"
) )
func splitPattern(pattern string) (prefix string, restPattern string, hasUpper bool) { func splitPattern(pattern string) (prefix string, restPattern string) {
for i := 0; i < len(pattern); i++ {
hasUpper = hasUpper || ('A' <= pattern[i] && pattern[i] <= 'Z')
}
position := strings.Index(pattern, "*") position := strings.Index(pattern, "*")
if position >= 0 { if position >= 0 {
return pattern[:position], pattern[position:], hasUpper return pattern[:position], pattern[position:]
} }
position = strings.Index(pattern, "?") position = strings.Index(pattern, "?")
if position >= 0 { 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) { 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] p = p[0 : len(p)-1]
} }
prefix, restNamePattern, hasUpper := splitPattern(namePattern) prefix, restNamePattern := splitPattern(namePattern)
var missedCount int var missedCount int
var lastFileName string 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 { for missedCount > 0 && err == nil {
var makeupEntries []*Entry 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 { for _, entry := range makeupEntries {
entries = append(entries, entry) entries = append(entries, entry)
} }
@ -44,7 +41,7 @@ func (f *Filer) ListDirectoryEntries(ctx context.Context, p util.FullPath, start
return entries, err 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 var foundEntries []*Entry
foundEntries, lastFileName, err = f.doListValidEntries(ctx, p, startFileName, inclusive, limit, prefix) foundEntries, lastFileName, err = f.doListValidEntries(ctx, p, startFileName, inclusive, limit, prefix)