go fmt

11 files changed, 30 insertions, 31 deletions

diff --git a/weed/filer/redis3/ItemList.go b/weed/filer/redis3/ItemList.go
index 33855d22d..9f84d57f6 100644
--- a/weed/filer/redis3/ItemList.go
+++ b/weed/filer/redis3/ItemList.go
@@ -73,7 +73,7 @@ func (nl *ItemList) canAddMember(node *skiplist.SkipListElementReference, name s
 	key := fmt.Sprintf("%s%dm", nl.prefix, node.ElementPointer)
 	countOperation := pipe.ZLexCount(ctx, key, "-", "+")
 	scoreOperationt := pipe.ZScore(ctx, key, name)
-	if _, err = pipe.Exec(ctx); err != nil && err != redis.Nil{
+	if _, err = pipe.Exec(ctx); err != nil && err != redis.Nil {
 		return false, 0, err
 	}
 	if err == redis.Nil {
@@ -286,7 +286,7 @@ func (nl *ItemList) DeleteName(name string) error {
 		return nil
 	}
 	nextSize := nl.NodeSize(nextNode.Reference())
-	if nextSize > 0 && prevSize + nextSize < nl.batchSize {
+	if nextSize > 0 && prevSize+nextSize < nl.batchSize {
 		// case 3.1 merge nextNode and prevNode
 		if _, err := nl.skipList.DeleteByKey(nextNode.Key); err != nil {
 			return err
@@ -414,7 +414,7 @@ func (nl *ItemList) NodeInnerPosition(node *skiplist.SkipListElementReference, n
 func (nl *ItemList) NodeMin(node *skiplist.SkipListElementReference) string {
 	key := fmt.Sprintf("%s%dm", nl.prefix, node.ElementPointer)
 	slice := nl.client.ZPopMin(context.Background(), key).Val()
-	if len(slice)>0{
+	if len(slice) > 0 {
 		s := slice[0].Member.(string)
 		return s
 	}
diff --git a/weed/filer/redis3/kv_directory_children.go b/weed/filer/redis3/kv_directory_children.go
index 624d17374..d92dddfe6 100644
--- a/weed/filer/redis3/kv_directory_children.go
+++ b/weed/filer/redis3/kv_directory_children.go
@@ -12,7 +12,7 @@ const maxNameBatchSizeLimit = 1000000
 func insertChild(ctx context.Context, redisStore *UniversalRedis3Store, key string, name string) error {
 
 	// lock and unlock
-	mutex := redisStore.redsync.NewMutex(key+"lock")
+	mutex := redisStore.redsync.NewMutex(key + "lock")
 	if err := mutex.Lock(); err != nil {
 		return fmt.Errorf("lock %s: %v", key, err)
 	}
@@ -49,7 +49,7 @@ func insertChild(ctx context.Context, redisStore *UniversalRedis3Store, key stri
 func removeChild(ctx context.Context, redisStore *UniversalRedis3Store, key string, name string) error {
 
 	// lock and unlock
-	mutex := redisStore.redsync.NewMutex(key+"lock")
+	mutex := redisStore.redsync.NewMutex(key + "lock")
 	if err := mutex.Lock(); err != nil {
 		return fmt.Errorf("lock %s: %v", key, err)
 	}
@@ -82,7 +82,7 @@ func removeChild(ctx context.Context, redisStore *UniversalRedis3Store, key stri
 func removeChildren(ctx context.Context, redisStore *UniversalRedis3Store, key string, onDeleteFn func(name string) error) error {
 
 	// lock and unlock
-	mutex := redisStore.redsync.NewMutex(key+"lock")
+	mutex := redisStore.redsync.NewMutex(key + "lock")
 	if err := mutex.Lock(); err != nil {
 		return fmt.Errorf("lock %s: %v", key, err)
 	}
@@ -111,7 +111,7 @@ func removeChildren(ctx context.Context, redisStore *UniversalRedis3Store, key s
 	if err = nameList.RemoteAllListElement(); err != nil {
 		return err
 	}
- 
+
 	return nil
 
 }
diff --git a/weed/filer/redis3/kv_directory_children_test.go b/weed/filer/redis3/kv_directory_children_test.go
index 03c15ec35..78979cb21 100644
--- a/weed/filer/redis3/kv_directory_children_test.go
+++ b/weed/filer/redis3/kv_directory_children_test.go
@@ -94,7 +94,7 @@ func BenchmarkNameList(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		nameList := LoadItemList(data, "/yyy/bin", client, store, maxNameBatchSizeLimit)
 
-		nameList.WriteName(strconv.Itoa(i)+"namexxxxxxxxxxxxxxxxxxx")
+		nameList.WriteName(strconv.Itoa(i) + "namexxxxxxxxxxxxxxxxxxx")
 
 		if nameList.HasChanges() {
 			data = nameList.ToBytes()
@@ -116,7 +116,7 @@ func BenchmarkRedis(b *testing.B) {
 	})
 
 	for i := 0; i < b.N; i++ {
-		client.ZAddNX(context.Background(),"/yyy/bin", &redis.Z{Score: 0, Member: strconv.Itoa(i)+"namexxxxxxxxxxxxxxxxxxx"})
+		client.ZAddNX(context.Background(), "/yyy/bin", &redis.Z{Score: 0, Member: strconv.Itoa(i) + "namexxxxxxxxxxxxxxxxxxx"})
 	}
 }
 
@@ -149,24 +149,24 @@ func xTestNameListAdd(t *testing.T) {
 	ts1 := time.Now()
 
 	for i := 0; i < N; i++ {
-		client.ZAddNX(context.Background(),"/x", &redis.Z{Score: 0, Member: fmt.Sprintf("name %8d", i)})
+		client.ZAddNX(context.Background(), "/x", &redis.Z{Score: 0, Member: fmt.Sprintf("name %8d", i)})
 	}
 	ts2 := time.Now()
 
 	fmt.Printf("%v %v", ts1.Sub(ts0), ts2.Sub(ts1))
 
 	/*
-	keys := client.Keys(context.Background(), "/*m").Val()
-	for _, k := range keys {
-		println("key", k)
-		for i, v := range client.ZRangeByLex(context.Background(), k, &redis.ZRangeBy{
-			Min:    "-",
-			Max:    "+",
-		}).Val() {
-			println(" ", i, v)
+		keys := client.Keys(context.Background(), "/*m").Val()
+		for _, k := range keys {
+			println("key", k)
+			for i, v := range client.ZRangeByLex(context.Background(), k, &redis.ZRangeBy{
+				Min:    "-",
+				Max:    "+",
+			}).Val() {
+				println(" ", i, v)
+			}
 		}
-	}
-	 */
+	*/
 }
 
 func xBenchmarkNameList(b *testing.B) {
@@ -205,6 +205,6 @@ func xBenchmarkRedis(b *testing.B) {
 	})
 
 	for i := 0; i < b.N; i++ {
-		client.ZAddNX(context.Background(),"/xxx/bin", &redis.Z{Score: 0, Member: fmt.Sprintf("name %8d", i)})
+		client.ZAddNX(context.Background(), "/xxx/bin", &redis.Z{Score: 0, Member: fmt.Sprintf("name %8d", i)})
 	}
 }
diff --git a/weed/filer/redis3/skiplist_element_store.go b/weed/filer/redis3/skiplist_element_store.go
index bcad356dd..8c101d006 100644
--- a/weed/filer/redis3/skiplist_element_store.go
+++ b/weed/filer/redis3/skiplist_element_store.go
@@ -49,7 +49,7 @@ func (m *SkipListElementStore) LoadElement(id int64) (*skiplist.SkipListElement,
 	t := &skiplist.SkipListElement{}
 	err = proto.Unmarshal([]byte(data), t)
 	if err == nil {
-		for i:=0;i<len(t.Next);i++{
+		for i := 0; i < len(t.Next); i++ {
 			if t.Next[i].IsNil() {
 				t.Next[i] = nil
 			}
diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go
index dfc3957f8..a70e9aec9 100644
--- a/weed/topology/volume_layout.go
+++ b/weed/topology/volume_layout.go
@@ -323,7 +323,7 @@ func (vl *VolumeLayout) AddGrowRequest() {
 	vl.growRequestCount++
 }
 func (vl *VolumeLayout) DoneGrowRequest() {
-	vl.growRequestTime = time.Unix(0,0)
+	vl.growRequestTime = time.Unix(0, 0)
 	vl.growRequestCount = 0
 }
 
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")