diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-10-07 21:13:31 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-10-07 21:13:31 -0700 |
| commit | e4830bd93dd18eface5a0590e3e18672bd7d30ef (patch) | |
| tree | 348ec9eae5c0108fbf3f8308f1cfd58156023c6d /weed/util | |
| parent | 0a856241fe2ac9492229ff9c63b6879d04d69185 (diff) | |
| download | seaweedfs-e4830bd93dd18eface5a0590e3e18672bd7d30ef.tar.xz seaweedfs-e4830bd93dd18eface5a0590e3e18672bd7d30ef.zip | |
go fmt
Diffstat (limited to 'weed/util')
| -rw-r--r-- | weed/util/skiplist/name_list.go | 6 | ||||
| -rw-r--r-- | weed/util/skiplist/name_list_serde.go | 2 | ||||
| -rw-r--r-- | weed/util/skiplist/name_list_test.go | 2 | ||||
| -rw-r--r-- | weed/util/skiplist/skiplist.go | 2 | ||||
| -rw-r--r-- | weed/util/skiplist/skiplist_serde.go | 2 | ||||
| -rw-r--r-- | weed/util/skiplist/skiplist_test.go | 1 |
6 files changed, 7 insertions, 8 deletions
diff --git a/weed/util/skiplist/name_list.go b/weed/util/skiplist/name_list.go index 19e8e6b49..1d4d2ebae 100644 --- a/weed/util/skiplist/name_list.go +++ b/weed/util/skiplist/name_list.go @@ -249,7 +249,7 @@ func (nl *NameList) DeleteName(name string) error { } return nil } - if nextNameBatch != nil && len(nextNameBatch.names) + len(prevNameBatch.names) < nl.batchSize { + if nextNameBatch != nil && len(nextNameBatch.names)+len(prevNameBatch.names) < nl.batchSize { // case 3.1 merge nextNode and prevNode if _, err := nl.skipList.DeleteByKey(nextNode.Key); err != nil { return err @@ -300,7 +300,7 @@ func (nl *NameList) ListNames(startFrom string, visitNamesFn func(name string) b } } - return nil + return nil } func (nl *NameList) RemoteAllListElement() error { @@ -323,4 +323,4 @@ func (nl *NameList) RemoteAllListElement() error { } return nil -}
\ No newline at end of file +} diff --git a/weed/util/skiplist/name_list_serde.go b/weed/util/skiplist/name_list_serde.go index 397dfd432..0a2052e7b 100644 --- a/weed/util/skiplist/name_list_serde.go +++ b/weed/util/skiplist/name_list_serde.go @@ -68,4 +68,4 @@ func (nl *NameList) ToBytes() []byte { glog.Errorf("marshal skiplist: %v", err) } return data -}
\ No newline at end of file +} diff --git a/weed/util/skiplist/name_list_test.go b/weed/util/skiplist/name_list_test.go index b3a686553..9d539c9ba 100644 --- a/weed/util/skiplist/name_list_test.go +++ b/weed/util/skiplist/name_list_test.go @@ -34,7 +34,7 @@ func TestNameList(t *testing.T) { // list.skipList.println() deleteBase := 5 - deleteCount := maxNameCount - 3 * deleteBase + deleteCount := maxNameCount - 3*deleteBase for i := deleteBase; i < deleteBase+deleteCount; i++ { list.DeleteName(String(i)) diff --git a/weed/util/skiplist/skiplist.go b/weed/util/skiplist/skiplist.go index 2a0262c69..21eed4b43 100644 --- a/weed/util/skiplist/skiplist.go +++ b/weed/util/skiplist/skiplist.go @@ -467,7 +467,7 @@ func (t *SkipList) GetSmallestNode() (*SkipListElement, error) { func (t *SkipList) GetLargestNode() (*SkipListElement, error) { return t.LoadElement(t.EndLevels[0]) } -func (t *SkipList) GetLargestNodeReference() (*SkipListElementReference) { +func (t *SkipList) GetLargestNodeReference() *SkipListElementReference { return t.EndLevels[0] } diff --git a/weed/util/skiplist/skiplist_serde.go b/weed/util/skiplist/skiplist_serde.go index f3b81b7fc..a735f66fa 100644 --- a/weed/util/skiplist/skiplist_serde.go +++ b/weed/util/skiplist/skiplist_serde.go @@ -48,4 +48,4 @@ func (ref *SkipListElementReference) IsNil() bool { return true } return false -}
\ No newline at end of file +} diff --git a/weed/util/skiplist/skiplist_test.go b/weed/util/skiplist/skiplist_test.go index 69b38012f..e423e8b27 100644 --- a/weed/util/skiplist/skiplist_test.go +++ b/weed/util/skiplist/skiplist_test.go @@ -30,7 +30,6 @@ func TestReverseInsert(t *testing.T) { } - func TestInsertAndFind(t *testing.T) { k0 := []byte("0") |
