lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 18:17:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

filer: fix elastic search pagination

Browse Source 
possible fix for https://github.com/chrislusf/seaweedfs/issues/1774
This commit is contained in:
Chris Lu
2021-02-02 11:34:12 -08:00
parent 609daaf387
commit 2396ac234c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/filer/elastic/v7/elastic_store.go
View File

@@ -218,7 +218,6 @@ func (store *ElasticStore) listRootDirectoryEntries(ctx context.Context, startFi
if entry, err := store.FindEntry(ctx, if entry, err := store.FindEntry(ctx,
weed_util.FullPath("/"+strings.Replace(index.Index, indexPrefix, "", 1))); err == nil { weed_util.FullPath("/"+strings.Replace(index.Index, indexPrefix, "", 1))); err == nil {
fileName := getFileName(entry.FullPath) fileName := getFileName(entry.FullPath)
lastFileName = fileName
if fileName == startFileName && !inclusive { if fileName == startFileName && !inclusive {
continue continue
} }
@@ -229,6 +228,7 @@ func (store *ElasticStore) listRootDirectoryEntries(ctx context.Context, startFi
if !eachEntryFunc(entry) { if !eachEntryFunc(entry) {
break break
} }
lastFileName = fileName
} }
} }
} }
@@ -278,13 +278,13 @@ func (store *ElasticStore) listDirectoryEntries(
} }
nextStart = string(esEntry.Entry.FullPath) nextStart = string(esEntry.Entry.FullPath)
fileName := getFileName(esEntry.Entry.FullPath) fileName := getFileName(esEntry.Entry.FullPath)
lastFileName = fileName
if fileName == startFileName && !inclusive { if fileName == startFileName && !inclusive {
continue continue
} }
if !eachEntryFunc(esEntry.Entry) { if !eachEntryFunc(esEntry.Entry) {
break break
} }
lastFileName = fileName
} }
} }
} }