mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-27 20:59:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix s3 api object list with params max-keys and prefix

Browse Source
This commit is contained in:
annluda 2023-09-12 11:06:12 +08:00 committed by Chris Lu
parent 9b666a53ed
commit 8908810376
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weed/filer/filerstore_wrapper.go
View File

@ -292,10 +292,8 @@ func (fsw *FilerStoreWrapper) prefixFilterEntries(ctx context.Context, dirPath u
count := int64(0) count := int64(0)
for count < limit && len(notPrefixed) > 0 { for count < limit && len(notPrefixed) > 0 {
var isLastItemHasPrefix bool
for _, entry := range notPrefixed { for _, entry := range notPrefixed {
if strings.HasPrefix(entry.Name(), prefix) { if strings.HasPrefix(entry.Name(), prefix) {
isLastItemHasPrefix = true
count++ count++
if !eachEntryFunc(entry) { if !eachEntryFunc(entry) {
return return
@ -303,11 +301,9 @@ func (fsw *FilerStoreWrapper) prefixFilterEntries(ctx context.Context, dirPath u
if count >= limit { if count >= limit {
break break
} }
} else {
isLastItemHasPrefix = false
} }
} }
if count < limit && isLastItemHasPrefix && len(notPrefixed) == int(limit) { if count < limit && lastFileName <= prefix && len(notPrefixed) == int(limit) {
notPrefixed = notPrefixed[:0] notPrefixed = notPrefixed[:0]
lastFileName, err = actualStore.ListDirectoryEntries(ctx, dirPath, lastFileName, false, limit, func(entry *Entry) bool { lastFileName, err = actualStore.ListDirectoryEntries(ctx, dirPath, lastFileName, false, limit, func(entry *Entry) bool {
notPrefixed = append(notPrefixed, entry) notPrefixed = append(notPrefixed, entry)