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

fix seek lastkey may reach EOF

Browse source
This commit is contained in:
qieqieplus 2021-01-07 17:07:56 +08:00
parent 0764fccde7
commit c7e7431fd3
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
weed/filer/rocksdb/rocksdb_store.go
View file

@ -182,18 +182,10 @@ func enumerate(iter *gorocksdb.Iterator, prefix, lastKey []byte, includeLastKey
} else { } else {
iter.Seek(lastKey) iter.Seek(lastKey)
if !includeLastKey { if iter.Valid() && !includeLastKey &&
key := iter.Key().Data() bytes.Equal(iter.Key().Data(), lastKey) {
if !bytes.HasPrefix(key, prefix) {
return nil
}
if bytes.Equal(key, lastKey) {
iter.Next() iter.Next()
} }
}
} }
i := 0 i := 0
@ -250,10 +242,6 @@ func (store *RocksDBStore) ListDirectoryPrefixedEntries(ctx context.Context, ful
if fileName == "" { if fileName == "" {
return true return true
} }
limit--
if limit < 0 {
return false
}
entry := &filer.Entry{ entry := &filer.Entry{
FullPath: weed_util.NewFullPath(string(fullpath), fileName), FullPath: weed_util.NewFullPath(string(fullpath), fileName),
} }