refactoring for protobuf

actiontech · Jun 4, 2019 · ca82fb1 · ca82fb1
1 parent 093f696
commit ca82fb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/internal/client/driver/mysql/dumper.go b/internal/client/driver/mysql/dumper.go
@@ -7,7 +7,6 @@
 package mysql
 
 import (
-	"bytes"
 	"fmt"
 	"os"
 	"strings"
@@ -90,8 +89,7 @@ type DumpEntry struct {
 	ValuesX    [][]*interface{}
 	TotalCount int64
 	RowsCount  int64
-	colBuffer  bytes.Buffer
-	err        error
+	Err        error
 	Table      *config.Table
 }
 
@@ -195,7 +193,7 @@ func (d *dumper) getChunkData() (nRows int64, err error) {
 	// TODO use PS
 	// TODO escape schema/table/column name once and save
 	defer func() {
-		entry.err = err
+		entry.Err = err
 		if err == nil && entry.RowsCount == 0 {
 			return
 		}

diff --git a/internal/client/driver/mysql/extractor.go b/internal/client/driver/mysql/extractor.go
@@ -1290,8 +1290,8 @@ func (e *Extractor) mysqlDump() error {
 			e.dumpers = append(e.dumpers, d)
 			// Scan the rows in the table ...
 			for entry := range d.resultsChannel {
-				if entry.err != nil {
-					e.onError(TaskStateDead, entry.err)
+				if entry.Err != nil {
+					e.onError(TaskStateDead, entry.Err)
 				} else {
 					if e.needToSendTabelDef() {
 						entry.Table = d.table