dm: refine instrunction (#8556)

ref #4287
pingcap · Mar 17, 2023 · 745fe12 · 745fe12
1 parent a59888c
commit 745fe12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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)