.

wcfs/δbtail_test.go

@@ -429,13 +429,13 @@ func TestIntSets(t *testing.T) {
 
 
 // kvdiff returns differens in between kv1 and kv2.
-var DEL = "ø"
-type kvdelta1 struct {
-	k Key
-	v string // DEL means delete
-}
-func kvdiff(kv1, kv2 map[Key]string) []kvdelta1 {
-	delta := []kvdelta1{}
+var DEL = "ø" // DEL means key deletion
+//type kvdelta1 struct {
+//	k Key
+//	v string // DEL means delete
+//}
+func kvdiff(kv1, kv2 map[Key]string) map[Key]string {
+	delta := map[Key]string{}
 	keys := SetKey{}
 	for k := range kv1 { keys.Add(k) }
 	for k := range kv2 { keys.Add(k) }
@@ -451,9 +451,20 @@ func kvdiff(kv1, kv2 map[Key]string) []kvdelta1 {
 		v2, ok := kv2[k]
 		if !ok { v2 = DEL }
 		if v1 != v2 {
-			delta = append(delta, kvdelta1{k,v2})
+			delta[k] = v2
 		}
 	}
 
 	return delta
 }
+
+
+func TestKVDiff(t *testing.T) {
+	kv1 := map[Key]string{1:"a", 3:"c", 4:"d"}
+	kv2 := map[Key]string{1:"b",        4:"d", 5:"e"}
+	got  := kvdiff(kv1, kv2)
+	want := map[Key]string{1:"b", 3:DEL, 5:"e"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("error:\ngot:  %v\nwant: %v", got, want)
+	}
+}