aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2024-01-25 08:09:36 -0800
committerchrislu <chris.lu@gmail.com>2024-01-25 08:09:36 -0800
commitcb50b720fdc3602d0803de7972d4cf6c44306a89 (patch)
treea2994031d04534193f3c30c93a99b5a2a5ea18a7
parent1f08010ef04870721cac39f357a7c23bf5167cef (diff)
downloadseaweedfs-cb50b720fdc3602d0803de7972d4cf6c44306a89.tar.xz
seaweedfs-cb50b720fdc3602d0803de7972d4cf6c44306a89.zip
Revert "Fix weed fix"
This reverts commit 6c1ce18541731b01cca7c13f6245cbaad3bca7a5.
-rw-r--r--weed/storage/needle_map/memdb.go30
1 files changed, 2 insertions, 28 deletions
diff --git a/weed/storage/needle_map/memdb.go b/weed/storage/needle_map/memdb.go
index fb3d0130d..d3d47b605 100644
--- a/weed/storage/needle_map/memdb.go
+++ b/weed/storage/needle_map/memdb.go
@@ -1,11 +1,9 @@
package needle_map
import (
- "bytes"
"fmt"
"io"
"os"
- "sort"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/iterator"
@@ -36,6 +34,7 @@ func NewMemDb() *MemDb {
}
func (cm *MemDb) Set(key NeedleId, offset Offset, size Size) error {
+
bytes := ToBytes(key, offset, size)
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
}
-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) {
iter := cm.db.NewIterator(nil, nil)
if iter.First() {
@@ -148,7 +122,7 @@ func (cm *MemDb) SaveToIdx(idxName string) (ret error) {
idxFile.Close()
}()
- return cm.AscendingVisitByOffset(func(value NeedleValue) error {
+ return cm.AscendingVisit(func(value NeedleValue) error {
if value.Offset.IsZero() || value.Size.IsDeleted() {
return nil
}