diff options
| author | Устюжанин Антон Александрович <ustuzhanin@tochka.com> | 2020-08-05 22:19:16 +0500 |
|---|---|---|
| committer | Устюжанин Антон Александрович <ustuzhanin@tochka.com> | 2020-08-05 22:19:16 +0500 |
| commit | 33a9e5e2d1948d08ec6456be6df3a6683a780905 (patch) | |
| tree | c123075cfe5b82dd53bf286c71f7c107b0d89f15 /weed/server | |
| parent | cbd80253e33688f55c02dd29c994a3ee6eac3d6c (diff) | |
| download | seaweedfs-33a9e5e2d1948d08ec6456be6df3a6683a780905.tar.xz seaweedfs-33a9e5e2d1948d08ec6456be6df3a6683a780905.zip | |
test ListDirectoryPrefixedEntries
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_grpc_server.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index 48e9253f0..eaace2fc2 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -6,7 +6,6 @@ import ( "os" "path/filepath" "strconv" - "strings" "time" "github.com/chrislusf/seaweedfs/weed/filer2" @@ -59,7 +58,7 @@ func (fs *FilerServer) ListEntries(req *filer_pb.ListEntriesRequest, stream file lastFileName := req.StartFromFileName includeLastFile := req.InclusiveStartFrom for limit > 0 { - entries, err := fs.filer.ListDirectoryEntries(stream.Context(), util.FullPath(req.Directory), lastFileName, includeLastFile, paginationLimit) + entries, err := fs.filer.ListDirectoryEntries(stream.Context(), util.FullPath(req.Directory), lastFileName, includeLastFile, paginationLimit, req.Prefix) if err != nil { return err @@ -74,12 +73,6 @@ func (fs *FilerServer) ListEntries(req *filer_pb.ListEntriesRequest, stream file lastFileName = entry.Name() - if req.Prefix != "" { - if !strings.HasPrefix(entry.Name(), req.Prefix) { - continue - } - } - if err := stream.Send(&filer_pb.ListEntriesResponse{ Entry: &filer_pb.Entry{ Name: entry.Name(), |