Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tac0turtle committed May 28, 2024
1 parent af8478d commit 65dd14a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
4 changes: 2 additions & 2 deletions mutable_tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ func (tree *MutableTree) addUnsavedAddition(key []byte, node *fastnode.Node) {

func (tree *MutableTree) saveFastNodeAdditions() error {
keysToSort := make([]string, 0)
tree.unsavedFastNodeAdditions.Range(func(k, v interface{}) bool {
tree.unsavedFastNodeAdditions.Range(func(k, _ interface{}) bool {
keysToSort = append(keysToSort, k.(string))
return true
})
Expand All @@ -837,7 +837,7 @@ func (tree *MutableTree) addUnsavedRemoval(key []byte) {

func (tree *MutableTree) saveFastNodeRemovals() error {
keysToSort := make([]string, 0)
tree.unsavedFastNodeRemovals.Range(func(k, v interface{}) bool {
tree.unsavedFastNodeRemovals.Range(func(k, _ interface{}) bool {
keysToSort = append(keysToSort, k.(string))
return true
})
Expand Down
16 changes: 6 additions & 10 deletions nodedb.go
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ func (ndb *nodeDB) deleteLegacyVersions(legacyLatestVersion int64) error {
return err
}
// Delete all legacy roots
if err := ndb.traversePrefix(legacyRootKeyFormat.Key(), func(key, value []byte) error {
if err := ndb.traversePrefix(legacyRootKeyFormat.Key(), func(key, _ []byte) error {
checkDeletePause()
return ndb.batch.Delete(key)
}); err != nil {
Expand Down Expand Up @@ -502,11 +502,9 @@ func (ndb *nodeDB) DeleteVersionsFrom(fromVersion int64) error {
}

// Delete the nodes for new format
err = ndb.traverseRange(nodeKeyPrefixFormat.KeyInt64(fromVersion), nodeKeyPrefixFormat.KeyInt64(latest+1), func(k, v []byte) error {
if err = ndb.traverseRange(nodeKeyPrefixFormat.KeyInt64(fromVersion), nodeKeyPrefixFormat.KeyInt64(latest+1), func(k, _ []byte) error {
return ndb.batch.Delete(k)
})

if err != nil {
}); err != nil {
return err
}

Expand Down Expand Up @@ -1093,7 +1091,7 @@ func (ndb *nodeDB) orphans() ([][]byte, error) {

func (ndb *nodeDB) size() int {
size := 0
err := ndb.traverse(func(k, v []byte) error {
err := ndb.traverse(func(_, _ []byte) error {
size++
return nil
})
Expand Down Expand Up @@ -1199,7 +1197,7 @@ func (ndb *nodeDB) String() (string, error) {

buf.WriteByte('\n')

err = ndb.traverseNodes(func(node *Node) error {
if err = ndb.traverseNodes(func(node *Node) error {
switch {
case node == nil:
fmt.Fprintf(buf, "%s: <nil>\n", nodeKeyFormat.Prefix())
Expand All @@ -1212,9 +1210,7 @@ func (ndb *nodeDB) String() (string, error) {
}
index++
return nil
})

if err != nil {
}); err != nil {
return "", err
}

Expand Down
2 changes: 1 addition & 1 deletion tree_random_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func testRandomOperations(t *testing.T, randSeed int64) {
// data is left behind in the database.
prevVersion := tree.Version()
keys := [][]byte{}
_, err = tree.Iterate(func(key, value []byte) bool {
_, err = tree.Iterate(func(key, _ []byte) bool {
keys = append(keys, key)
return false
})
Expand Down
2 changes: 1 addition & 1 deletion tree_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,7 @@ func TestNodeCacheStatisic(t *testing.T) {

for name, tc := range testcases {
tc := tc
t.Run(name, func(sub *testing.T) {
t.Run(name, func(_ *testing.T) {
stat := &Statistics{}
db, err := dbm.NewDB("test", "memdb", "")
require.NoError(t, err)
Expand Down

0 comments on commit 65dd14a

Please sign in to comment.