Add checkfields test and fix issue

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
vitessio · Apr 30, 2024 · 08dd851 · 08dd851
1 parent eaacee9
commit 08dd851
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/go/test/endtoend/utils/mysql.go b/go/test/endtoend/utils/mysql.go
@@ -242,7 +242,7 @@ func compareVitessAndMySQLResults(t TestingT, query string, vtConn *mysql.Conn,
 	return errors.New(errStr)
 }
 
-var checkFeildsRegExpr = regexp.MustCompile(`(.*)(\d*)`)
+var checkFeildsRegExpr = regexp.MustCompile(`([a-zA-Z]*)(\d*)`)
 
 func checkFields(t TestingT, columnName string, vtField, myField *querypb.Field) {
 	t.Helper()
@@ -257,14 +257,17 @@ func checkFields(t TestingT, columnName string, vtField, myField *querypb.Field)
 
 		if len(vtMatches) != 3 || len(vtMatches) != len(myMatches) || vtMatches[1] != myMatches[1] {
 			fail()
+			return
 		}
 		vtVal, vtErr := strconv.Atoi(vtMatches[2])
-		myVal, myErr := strconv.Atoi(vtMatches[2])
+		myVal, myErr := strconv.Atoi(myMatches[2])
 		if vtErr != nil || myErr != nil {
 			fail()
+			return
 		}
 		if vtVal <= myVal {
 			fail()
+			return
 		}
 	}
 

diff --git a/go/test/endtoend/utils/mysql_test.go b/go/test/endtoend/utils/mysql_test.go
@@ -30,6 +30,7 @@ import (
 	"vitess.io/vitess/go/mysql/replication"
 	"vitess.io/vitess/go/test/endtoend/cluster"
 	"vitess.io/vitess/go/vt/mysqlctl"
+	querypb "vitess.io/vitess/go/vt/proto/query"
 )
 
 var (
@@ -67,6 +68,47 @@ func TestMain(m *testing.M) {
 	os.Exit(exitCode)
 }
 
+func TestCheckFields(t *testing.T) {
+	createField := func(typ querypb.Type) *querypb.Field {
+		return &querypb.Field{
+			Type: typ,
+		}
+	}
+
+	cases := []struct {
+		fail    bool
+		vtField querypb.Type
+		myField querypb.Type
+	}{
+		{
+			vtField: querypb.Type_INT32,
+			myField: querypb.Type_INT32,
+		},
+		{
+			vtField: querypb.Type_INT64,
+			myField: querypb.Type_INT32,
+		},
+		{
+			fail:    true,
+			vtField: querypb.Type_FLOAT32,
+			myField: querypb.Type_INT32,
+		},
+		{
+			fail:    true,
+			vtField: querypb.Type_TIMESTAMP,
+			myField: querypb.Type_TUPLE,
+		},
+	}
+
+	for _, c := range cases {
+		t.Run(fmt.Sprintf("%s_%s", c.vtField.String(), c.myField.String()), func(t *testing.T) {
+			tt := &testing.T{}
+			checkFields(tt, "col", createField(c.vtField), createField(c.myField))
+			require.Equal(t, c.fail, tt.Failed())
+		})
+	}
+}
+
 func TestCreateMySQL(t *testing.T) {
 	ctx := context.Background()
 	conn, err := mysql.Connect(ctx, &mysqlParams)