ci: simplify diffMap map reads and fix diffStrSlice edge case

- diffMap: use single map lookup with ok idiom instead of reading twice
- diffStrSlice: compare element-wise instead of joining with comma,
  so ["a,b"] and ["a", "b"] are correctly reported as different

Signed-off-by: huanghaoyuanhhy <haoyuan.huang@zilliz.com>

Author: huanghaoyuanhhy

cmd/etcd-schema-verify/diff.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"sort"
-	"strings"
 )
 
 func diffCollections(src, dst *CollectionDump) []Diff {
@@ -226,13 +225,10 @@ func diffMap(diffs *[]Diff, prefix string, src, dst map[string]string) {
 	sort.Strings(sorted)
 
 	for _, k := range sorted {
-		sv := src[k]
-		dv := dst[k]
+		sv, inSrc := src[k]
+		dv, inDst := dst[k]
 		path := prefix + "." + k
 
-		_, inSrc := src[k]
-		_, inDst := dst[k]
-
 		switch {
 		case !inSrc:
 			*diffs = append(*diffs, Diff{Path: path, Src: "<missing>", Dst: dv})
@@ -245,10 +241,15 @@ func diffMap(diffs *[]Diff, prefix string, src, dst map[string]string) {
 }
 
 func diffStrSlice(diffs *[]Diff, path string, src, dst []string) {
-	s := strings.Join(src, ",")
-	d := strings.Join(dst, ",")
-	if s != d {
-		*diffs = append(*diffs, Diff{Path: path, Src: fmt.Sprintf("[%s]", s), Dst: fmt.Sprintf("[%s]", d)})
+	if len(src) != len(dst) {
+		*diffs = append(*diffs, Diff{Path: path, Src: fmt.Sprintf("%v", src), Dst: fmt.Sprintf("%v", dst)})
+		return
+	}
+	for i := range src {
+		if src[i] != dst[i] {
+			*diffs = append(*diffs, Diff{Path: path, Src: fmt.Sprintf("%v", src), Dst: fmt.Sprintf("%v", dst)})
+			return
+		}
 	}
 }
 

cmd/etcd-schema-verify/diff_test.go

@@ -330,12 +330,25 @@ func TestDiffStrSlice(t *testing.T) {
 		assert.Empty(t, diffs)
 	})
 
-	t.Run("Different", func(t *testing.T) {
+	t.Run("DifferentLength", func(t *testing.T) {
 		var diffs []Diff
 		diffStrSlice(&diffs, "f", []string{"a"}, []string{"a", "b"})
 		assert.Len(t, diffs, 1)
 	})
 
+	t.Run("DifferentValues", func(t *testing.T) {
+		var diffs []Diff
+		diffStrSlice(&diffs, "f", []string{"a", "b"}, []string{"a", "c"})
+		assert.Len(t, diffs, 1)
+	})
+
+	t.Run("CommaEdgeCase", func(t *testing.T) {
+		// ["a,b"] and ["a", "b"] must be treated as different
+		var diffs []Diff
+		diffStrSlice(&diffs, "f", []string{"a,b"}, []string{"a", "b"})
+		assert.Len(t, diffs, 1)
+	})
+
 	t.Run("BothNil", func(t *testing.T) {
 		var diffs []Diff
 		diffStrSlice(&diffs, "f", nil, nil)