lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-06-28 15:41:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix weed fix"

Browse Source 
This reverts commit 6c1ce18541.
This commit is contained in:
chrislu 2024-01-25 08:09:36 -08:00
parent 1f08010ef0
commit cb50b720fd
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
weed/storage/needle_map/memdb.go
View File

@ -1,11 +1,9 @@
package needle_map package needle_map
import ( import (
"bytes"
"fmt" "fmt"
"io" "io"
"os" "os"
"sort"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/iterator"
@ -36,6 +34,7 @@ func NewMemDb() *MemDb {
} }
func (cm *MemDb) Set(key NeedleId, offset Offset, size Size) error { func (cm *MemDb) Set(key NeedleId, offset Offset, size Size) error {
bytes := ToBytes(key, offset, size) bytes := ToBytes(key, offset, size)
if err := cm.db.Put(bytes[0:NeedleIdSize], bytes[NeedleIdSize:NeedleIdSize+OffsetSize+SizeSize], nil); err != nil { if err := cm.db.Put(bytes[0:NeedleIdSize], bytes[NeedleIdSize:NeedleIdSize+OffsetSize+SizeSize], nil); err != nil {
@ -77,31 +76,6 @@ func doVisit(iter iterator.Iterator, visit func(NeedleValue) error) (ret error)
return nil return nil
} }
func (cm *MemDb) AscendingVisitByOffset(visit func(NeedleValue) error) (ret error) {
var needles []NeedleValue
err := cm.AscendingVisit(func(value NeedleValue) error {
needles = append(needles, value)
return nil
})
if err != nil {
return err
}
sort.Slice(needles, func(i, j int) bool {
i_bytes := make([]byte, OffsetSize)
j_bytes := make([]byte, OffsetSize)
OffsetToBytes(i_bytes, needles[i].Offset)
OffsetToBytes(j_bytes, needles[j].Offset)
return bytes.Compare(i_bytes, j_bytes) < 0
})
for _, needle := range needles {
ret = visit(needle)
if ret != nil {
return ret
}
}
return nil
}
func (cm *MemDb) AscendingVisit(visit func(NeedleValue) error) (ret error) { func (cm *MemDb) AscendingVisit(visit func(NeedleValue) error) (ret error) {
iter := cm.db.NewIterator(nil, nil) iter := cm.db.NewIterator(nil, nil)
if iter.First() { if iter.First() {
@ -148,7 +122,7 @@ func (cm *MemDb) SaveToIdx(idxName string) (ret error) {
idxFile.Close() idxFile.Close()
}() }()
return cm.AscendingVisitByOffset(func(value NeedleValue) error { return cm.AscendingVisit(func(value NeedleValue) error {
if value.Offset.IsZero() || value.Size.IsDeleted() { if value.Offset.IsZero() || value.Size.IsDeleted() {
return nil return nil
} }