update slave_binlog (#380)

pingcap · Aug 5, 2020 · 02a16e0 · 02a16e0
1 parent 6a36d48
commit 02a16e0
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/pkg/dbutil/common.go b/pkg/dbutil/common.go
@@ -561,7 +561,7 @@ func GetTidbLatestTSO(ctx context.Context, db *sql.DB) (int64, error) {
 		}
 		return ts, nil
 	}
-	return 0, errors.New("get slave cluster's ts failed")
+	return 0, errors.New("get secondary cluster's ts failed")
 }
 
 // GetDBVersion returns the database's version

diff --git a/tidb-binlog/driver/example/mysql/mysql.go b/tidb-binlog/driver/example/mysql/mysql.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/parser/ast"
 	"github.com/pingcap/tidb-tools/pkg/dbutil"
 	"github.com/pingcap/tidb-tools/tidb-binlog/driver/reader"
-	pb "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
+	pb "github.com/pingcap/tidb-tools/tidb-binlog/proto/go-binlog"
 	_ "github.com/pingcap/tidb/types/parser_driver" // for parser driver
 	"go.uber.org/zap"
 )

diff --git a/tidb-binlog/driver/reader/offset.go b/tidb-binlog/driver/reader/offset.go
@@ -19,7 +19,7 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	pb "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
+	pb "github.com/pingcap/tidb-tools/tidb-binlog/proto/go-binlog"
 	"go.uber.org/zap"
 )
 

diff --git a/tidb-binlog/driver/reader/offset_test.go b/tidb-binlog/driver/reader/offset_test.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/Shopify/sarama"
 	. "github.com/pingcap/check"
-	pb "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
+	pb "github.com/pingcap/tidb-tools/tidb-binlog/proto/go-binlog"
 )
 
 func TestClient(t *testing.T) {

diff --git a/tidb-binlog/driver/reader/reader.go b/tidb-binlog/driver/reader/reader.go
@@ -19,7 +19,7 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	pb "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
+	pb "github.com/pingcap/tidb-tools/tidb-binlog/proto/go-binlog"
 	"go.uber.org/zap"
 )
 

diff --git a/...log/slave_binlog_proto/generate-binlog.sh → tidb-binlog/proto/generate-binlog.sh b/...log/slave_binlog_proto/generate-binlog.sh → tidb-binlog/proto/generate-binlog.sh
diff --git a/...slave_binlog_proto/go-binlog/binlog.pb.go → tidb-binlog/proto/go-binlog/binlog.pb.go b/...slave_binlog_proto/go-binlog/binlog.pb.go → tidb-binlog/proto/go-binlog/binlog.pb.go
diff --git a/...log/slave_binlog_proto/proto/binlog.proto → tidb-binlog/proto/proto/binlog.proto b/...log/slave_binlog_proto/proto/binlog.proto → tidb-binlog/proto/proto/binlog.proto