fix comment

pingcap · Mar 14, 2022 · ceca0b3 · ceca0b3
1 parent 0028a5a
commit ceca0b3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/dm/dm/worker/subtask.go b/dm/dm/worker/subtask.go
@@ -268,7 +268,6 @@ func (st *SubTask) StartValidator(expect pb.Stage) {
 	}
 	st.Lock()
 	defer st.Unlock()
-	// refetch the validation config
 
 	if st.cfg.ValidatorCfg.Mode != config.ValidationFast && st.cfg.ValidatorCfg.Mode != config.ValidationFull {
 		return

diff --git a/dm/syncer/data_validator.go b/dm/syncer/data_validator.go
@@ -120,7 +120,6 @@ type DataValidator struct {
 
 	// such as table without primary key
 	unsupportedTable map[string]string
-	mode             string
 }
 
 func NewContinuousDataValidator(cfg *config.SubTaskConfig, syncerObj *Syncer) *DataValidator {
@@ -416,7 +415,7 @@ func (v *DataValidator) Stage() pb.Stage {
 func (v *DataValidator) startValidateWorkers() {
 	v.wg.Add(v.workerCnt)
 	for i := 0; i < v.workerCnt; i++ {
-		worker := newValidateWorker(v, i, v.mode)
+		worker := newValidateWorker(v, i)
 		v.workers[i] = worker
 		go func() {
 			v.wg.Done()

diff --git a/dm/syncer/validate_worker.go b/dm/syncer/validate_worker.go
@@ -68,11 +68,9 @@ type validateWorker struct {
 	pendingRowCount   atomic.Int64
 	batchSize         int
 	sync.Mutex
-
-	mode string
 }
 
-func newValidateWorker(v *DataValidator, id int, mode string) *validateWorker {
+func newValidateWorker(v *DataValidator, id int) *validateWorker {
 	workerLog := v.L.WithFields(zap.Int("id", id))
 	return &validateWorker{
 		cfg:               v.cfg.ValidatorCfg,
@@ -84,7 +82,6 @@ func newValidateWorker(v *DataValidator, id int, mode string) *validateWorker {
 		rowChangeCh:       make(chan *rowChange, workerChannelSize),
 		pendingChangesMap: make(map[string]*tableChange),
 		batchSize:         maxBatchSize,
-		mode:              mode,
 	}
 }
 
@@ -260,7 +257,7 @@ func (vw *validateWorker) validateInsertAndUpdateRows(rows []*rowChange, cond *C
 			failedRows[key] = &validateFailedRow{tp: rowNotExist}
 			continue
 		}
-		if vw.mode == config.ValidationFull {
+		if vw.cfg.Mode == config.ValidationFull {
 			// only compare the whole row in full mode
 			eq, err := vw.compareData(sourceRow, targetRow, tableInfo.Columns[:cond.ColumnCnt])
 			if err != nil {

diff --git a/dm/syncer/validate_worker_test.go b/dm/syncer/validate_worker_test.go
@@ -48,6 +48,7 @@ func TestValidatorWorkerRunInsertUpdate(t *testing.T) {
 			"create table tbl3(a varchar(100) primary key, b varchar(100))")
 
 		cfg := genSubtaskConfig(t)
+		cfg.ValidatorCfg.Mode = mode
 		_, mock, err := conn.InitMockDBFull()
 		mock.MatchExpectationsInOrder(false)
 		require.NoError(t, err)
@@ -60,7 +61,7 @@ func TestValidatorWorkerRunInsertUpdate(t *testing.T) {
 		defer validator.cancel()
 
 		// insert & update same table, both row are validated failed
-		worker := newValidateWorker(validator, 0, mode)
+		worker := newValidateWorker(validator, 0)
 		worker.updateRowChange(&rowChange{
 			table:      tableInfo1,
 			key:        "1",