mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-01-18 14:41:31 +08:00
Code Issues Packages 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

18
weed/filer/rocksdb/rocksdb_store.go
View File

@ -182,17 +182,9 @@ 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) {
iter.Next()
if !bytes.HasPrefix(key, prefix) {
return nil
}
if bytes.Equal(key, lastKey) {
iter.Next()
}
} }
} }
@ -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),
} }