redis-port, rename zset.Value to zset.Member

houbl · Nov 12, 2014 · dbe01b8 · dbe01b8
1 parent 94eec37
commit dbe01b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ext/redis-port/cmd/decode.go b/ext/redis-port/cmd/decode.go
@@ -108,7 +108,7 @@ func Decode(ncpu int, input, output string) {
 					}
 				case rdb.ZSet:
 					for _, x := range obj {
-						mem := toHexString(x.Value)
+						mem := toHexString(x.Member)
 						fmt.Fprintf(&b, "db=%d type=%s expireat=%d key=%s member=%s score=%f\n", e.DB, "zset", e.ExpireAt, key, mem, x.Score)
 					}
 				}

diff --git a/ext/redis-port/rdb/decode.go b/ext/redis-port/rdb/decode.go
@@ -106,8 +106,8 @@ func (d *decoder) Zadd(key []byte, score float64, member []byte) {
 		d.err = fmt.Errorf("invalid object, not a zset")
 	case ZSet:
 		v := struct {
-			Value []byte
-			Score float64
+			Member []byte
+			Score  float64
 		}{
 			member,
 			score,
@@ -123,6 +123,6 @@ type HashMap []struct {
 }
 type Set [][]byte
 type ZSet []struct {
-	Value []byte
-	Score float64
+	Member []byte
+	Score  float64
 }
diff --git a/ext/redis-port/rdb/decode_test.go b/ext/redis-port/rdb/decode_test.go
@@ -204,7 +204,7 @@ func TestDecodeZSet(t *testing.T) {
 	}
 	zset := make(map[string]float64)
 	for _, ent := range val {
-		zset[string(ent.Value)] = ent.Score
+		zset[string(ent.Member)] = ent.Score
 	}
 	if len(zset) != 32 || len(zset) != len(val) {
 		t.Fatalf("len(zset) = %d/%d, expect = 32", len(zset), len(val))

diff --git a/ext/redis-port/rdb/loader_test.go b/ext/redis-port/rdb/loader_test.go
@@ -374,7 +374,7 @@ func TestLoadZSetAndZSetZiplist(t *testing.T) {
 	val1 := obj1.(ZSet)
 	zset1 := make(map[string]float64)
 	for _, ent := range val1 {
-		zset1[string(ent.Value)] = ent.Score
+		zset1[string(ent.Member)] = ent.Score
 	}
 	if len(zset1) != 16 || len(zset1) != len(val1) {
 		t.Fatalf("len(zset1) = %d/%d, expect = 16", len(zset1), len(val1))
@@ -390,7 +390,7 @@ func TestLoadZSetAndZSetZiplist(t *testing.T) {
 	val2 := obj2.(ZSet)
 	zset2 := make(map[string]float64)
 	for _, ent := range val2 {
-		zset2[string(ent.Value)] = ent.Score
+		zset2[string(ent.Member)] = ent.Score
 	}
 	if len(zset2) != 32 || len(zset2) != len(val2) {
 		t.Fatalf("len(zset2) = %d/%d, expect = 32", len(zset2), len(val2))