diff options
| author | Konstantin Lebedev <lebedev_k@tochka.com> | 2020-08-31 22:13:13 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <lebedev_k@tochka.com> | 2020-08-31 22:13:13 +0500 |
| commit | 9a195bebfd6c803161d07ca80b227dd058719aa5 (patch) | |
| tree | 1490f2b266990a8e46c8da5699db72e271818362 | |
| parent | 18b98f9747082c9cd5e7ee83f98ab3d6c0eeddb3 (diff) | |
| download | seaweedfs-9a195bebfd6c803161d07ca80b227dd058719aa5.tar.xz seaweedfs-9a195bebfd6c803161d07ca80b227dd058719aa5.zip | |
accurate limit
| -rw-r--r-- | weed/filer2/filerstore.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/weed/filer2/filerstore.go b/weed/filer2/filerstore.go index db53734bc..32c4c94fb 100644 --- a/weed/filer2/filerstore.go +++ b/weed/filer2/filerstore.go @@ -155,12 +155,11 @@ func (fsw *FilerStoreWrapper) ListDirectoryPrefixedEntries(ctx context.Context, count++ entries = append(entries, entry) } + if count >= limit { + goto Exit + } } - if count >= limit { - break - } - - notPrefixed, err = fsw.ActualStore.ListDirectoryEntries(ctx, dirPath, lastFileName, includeStartFile, limit) + notPrefixed, err = fsw.ActualStore.ListDirectoryEntries(ctx, dirPath, lastFileName, false, limit) if err != nil { return nil, err } @@ -169,6 +168,7 @@ func (fsw *FilerStoreWrapper) ListDirectoryPrefixedEntries(ctx context.Context, break } } + Exit: } } else if err != nil { return nil, err |