Skip to content

Commit 3e38983

Browse files
author
ffffwh
committed
cleanup: remove TaskStateRestart
and TaskStateComplete
1 parent 6926df6 commit 3e38983

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

driver/common/common.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ const (
2828
)
2929

3030
const (
31-
TaskStateComplete int = iota
32-
TaskStateRestart
33-
TaskStateDead
31+
TaskStateDead = 2
3432
)
3533

3634
const (

driver/kafka/kafka3.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -641,9 +641,7 @@ func (kr *KafkaRunner) onError(state int, err error) {
641641
}
642642

643643
switch state {
644-
case common.TaskStateComplete:
645-
kr.logger.Info("Done migrating")
646-
case common.TaskStateRestart, common.TaskStateDead:
644+
case common.TaskStateDead:
647645
msg := &common.ControlMsg{
648646
Msg: err.Error(),
649647
Type: common.ControlMsgError,

driver/mysql/applier.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -1025,9 +1025,7 @@ func (a *Applier) onError(state int, err error) {
10251025
}
10261026

10271027
switch state {
1028-
case common.TaskStateComplete:
1029-
a.logger.Info("Done migrating")
1030-
case common.TaskStateRestart, common.TaskStateDead:
1028+
case common.TaskStateDead:
10311029
msg := &common.ControlMsg{
10321030
Msg: err.Error(),
10331031
Type: common.ControlMsgError,

driver/mysql/extractor.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ func (e *Extractor) sendSysVarAndSqlMode() error {
11401140
SqlMode: setSqlMode,
11411141
}
11421142
if err := e.encodeAndSendDumpEntry(entry); err != nil {
1143-
e.onError(common.TaskStateRestart, err)
1143+
e.onError(common.TaskStateDead, err)
11441144
}
11451145

11461146
return nil
@@ -1318,7 +1318,7 @@ func (e *Extractor) mysqlDump() error {
13181318
if db.TableSchemaRename != "" {
13191319
dbSQL, err = base.RenameCreateSchemaAddINE(db.CreateSchemaString, db.TableSchemaRename)
13201320
if err != nil {
1321-
e.onError(common.TaskStateRestart, err)
1321+
e.onError(common.TaskStateDead, err)
13221322
}
13231323
} else {
13241324
dbSQL = db.CreateSchemaString
@@ -1331,7 +1331,7 @@ func (e *Extractor) mysqlDump() error {
13311331
atomic.AddInt64(&e.mysqlContext.RowsEstimate, 1)
13321332
atomic.AddInt64(&e.TotalRowsCopied, 1)
13331333
if err := e.encodeAndSendDumpEntry(entry); err != nil {
1334-
e.onError(common.TaskStateRestart, err)
1334+
e.onError(common.TaskStateDead, err)
13351335
}
13361336

13371337
for _, tbCtx := range db.TableMap {
@@ -1377,7 +1377,7 @@ func (e *Extractor) mysqlDump() error {
13771377
atomic.AddInt64(&e.mysqlContext.RowsEstimate, 1)
13781378
atomic.AddInt64(&e.TotalRowsCopied, 1)
13791379
if err := e.encodeAndSendDumpEntry(entry); err != nil {
1380-
e.onError(common.TaskStateRestart, err)
1380+
e.onError(common.TaskStateDead, err)
13811381
}
13821382
}
13831383
e.tableCount += len(db.TableMap)
@@ -1427,7 +1427,7 @@ func (e *Extractor) mysqlDump() error {
14271427
}
14281428
}
14291429
if err = e.encodeAndSendDumpEntry(entry); err != nil {
1430-
e.onError(common.TaskStateRestart, err)
1430+
e.onError(common.TaskStateDead, err)
14311431
}
14321432
atomic.AddInt64(&e.TotalRowsCopied, int64(len(entry.ValuesX)))
14331433
atomic.AddInt64(d.Memory, -memSize)

driver/oracle/extractor/extractor_oracle.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ func (e *ExtractorOracle) oracleDump() error {
909909
DbSQL: dbSQL,
910910
}
911911
if err := e.encodeAndSendDumpEntry(entry); err != nil {
912-
e.onError(common.TaskStateRestart, err)
912+
e.onError(common.TaskStateDead, err)
913913
}
914914

915915
for _, tb := range db.Tables {
@@ -938,7 +938,7 @@ func (e *ExtractorOracle) oracleDump() error {
938938
// TotalCount: tb.Counter,
939939
}
940940
if err := e.encodeAndSendDumpEntry(entry); err != nil {
941-
e.onError(common.TaskStateRestart, err)
941+
e.onError(common.TaskStateDead, err)
942942
}
943943
}
944944
}
@@ -966,7 +966,7 @@ func (e *ExtractorOracle) oracleDump() error {
966966
e.onError(common.TaskStateDead, fmt.Errorf(entry.Err))
967967
} else {
968968
if err := e.encodeAndSendDumpEntry(entry); err != nil {
969-
e.onError(common.TaskStateRestart, err)
969+
e.onError(common.TaskStateDead, err)
970970
}
971971
}
972972
}

0 commit comments

Comments
 (0)