From 745fe12f2d640bc9ffb1a579bb92dbabc9320747 Mon Sep 17 00:00:00 2001 From: D3Hunter Date: Fri, 17 Mar 2023 11:38:39 +0800 Subject: [PATCH] dm: refine instrunction (#8556) ref pingcap/tiflow#4287 --- dm/pkg/checker/table_structure.go | 4 +++- dm/pkg/checker/table_structure_test.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dm/pkg/checker/table_structure.go b/dm/pkg/checker/table_structure.go index 44765895c3f..ed8dfa52414 100644 --- a/dm/pkg/checker/table_structure.go +++ b/dm/pkg/checker/table_structure.go @@ -279,9 +279,11 @@ func (c *TablesChecker) handleOpts(r *Result) (func(options []*incompatibilityOp } } }, func() { + instructionSlice := make([]string, 0, len(resultInstructions)) for k := range resultInstructions { - r.Instruction += k + "; " + instructionSlice = append(instructionSlice, k) } + r.Instruction += strings.Join(instructionSlice, "; ") } } diff --git a/dm/pkg/checker/table_structure_test.go b/dm/pkg/checker/table_structure_test.go index dc1c0a9b444..812705387df 100644 --- a/dm/pkg/checker/table_structure_test.go +++ b/dm/pkg/checker/table_structure_test.go @@ -15,6 +15,7 @@ package checker import ( "context" + "strings" "testing" "github.com/DATA-DOG/go-sqlmock" @@ -217,6 +218,7 @@ func TestTablesChecker(t *testing.T) { require.Len(t, result.Errors, 2) require.NoError(t, mock.ExpectationsWereMet()) require.NoError(t, downMock.ExpectationsWereMet()) + require.False(t, strings.HasSuffix(result.Instruction, "; ")) // 3. test #5759 @@ -311,6 +313,7 @@ func TestTablesChecker(t *testing.T) { result.Errors[4].ShortErr) require.NoError(t, mock.ExpectationsWereMet()) require.NoError(t, downMock.ExpectationsWereMet()) + require.False(t, strings.HasSuffix(result.Instruction, "; ")) // 5. check extended columns commonMock() @@ -346,6 +349,7 @@ func TestTablesChecker(t *testing.T) { result = checker.Check(ctx) require.Equal(t, StateFailure, result.State) require.Len(t, result.Errors, 2) + require.False(t, strings.HasSuffix(result.Instruction, "; ")) require.Equal(t, "table `test-db`.`test-table-1` upstream table must not contain extended column [ext1]", result.Errors[0].ShortErr)