Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement btree.item on item itelf, not only its pointer. #254

Merged
merged 4 commits into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions memdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ type item struct {
}

// Less implements btree.Item.
func (i *item) Less(other btree.Item) bool {
func (i item) Less(other btree.Item) bool {
// this considers nil == []byte{}, but that's ok since we handle nil endpoints
// in iterators specially anyway
return bytes.Compare(i.key, other.(*item).key) == -1
return bytes.Compare(i.key, other.(item).key) == -1
}

// newKey creates a new key item.
func newKey(key []byte) *item {
return &item{key: key}
func newKey(key []byte) item {
return item{key: key}
}

// newPair creates a new pair item.
func newPair(key, value []byte) *item {
return &item{key: key, value: value}
func newPair(key, value []byte) item {
return item{key: key, value: value}
}

// MemDB is an in-memory database backend using a B-tree for storage.
Expand Down Expand Up @@ -73,7 +73,7 @@ func (db *MemDB) Get(key []byte) ([]byte, error) {

i := db.btree.Get(newKey(key))
if i != nil {
return i.(*item).value, nil
return i.(item).value, nil
}
return nil, nil
}
Expand Down Expand Up @@ -150,7 +150,7 @@ func (db *MemDB) Print() error {
defer db.mtx.RUnlock()

db.btree.Ascend(func(i btree.Item) bool {
item := i.(*item)
item := i.(item)
fmt.Printf("[%X]:\t[%X]\n", item.key, item.value)
return true
})
Expand Down
4 changes: 2 additions & 2 deletions memdb_iterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func newMemDBIteratorMtxChoice(db *MemDB, start []byte, end []byte, reverse bool
abortLessThan []byte
)
visitor := func(i btree.Item) bool {
item := i.(*item)
item := i.(item)
if skipEqual != nil && bytes.Equal(item.key, skipEqual) {
skipEqual = nil
return true
Expand All @@ -67,7 +67,7 @@ func newMemDBIteratorMtxChoice(db *MemDB, start []byte, end []byte, reverse bool
select {
case <-ctx.Done():
return false
case ch <- item:
case ch <- &item:
return true
}
}
Expand Down