This is an automated cherry-pick of pingcap#1103

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Dec 23, 2021 · 90f137d · 90f137d
1 parent 679d62d
commit 90f137d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/reparo/syncer/util.go b/reparo/syncer/util.go
@@ -46,7 +46,8 @@ func formatValue(value types.Datum, tp byte) types.Datum {
 	case mysql.TypeSet:
 		value = types.NewDatum(value.GetMysqlSet().Value)
 	case mysql.TypeBit:
-		value = types.NewDatum(value.GetMysqlBit())
+		// see drainer/translator/mysql.go formatData
+		value = types.NewDatum(value.GetUint64())
 	}
 
 	return value

diff --git a/reparo/syncer/util_test.go b/reparo/syncer/util_test.go
@@ -15,8 +15,7 @@ var _ = check.Suite(&testUtilSuite{})
 func (s *testUtilSuite) TestFormatValue(c *check.C) {
 	datetime, err := time.Parse("20060102150405", "20190415121212")
 	c.Assert(err, check.IsNil)
-	bitVal, err2 := types.NewBitLiteral("b'10010'")
-	c.Assert(err2, check.IsNil)
+	bitVal := uint64(12)
 
 	testCases := []struct {
 		value     interface{}
@@ -81,8 +80,8 @@ func (s *testUtilSuite) TestFormatValue(c *check.C) {
 		{
 			value:     bitVal,
 			tp:        mysql.TypeBit,
-			expectStr: "0x12",
-			expectVal: types.BinaryLiteral([]byte{0x12}),
+			expectStr: "12",
+			expectVal: uint64(12),
 		},
 	}
 

diff --git a/tests/dailytest/db.go b/tests/dailytest/db.go
@@ -23,7 +23,12 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
+<<<<<<< HEAD
 	"github.com/pingcap/parser/mysql"
+=======
+	"github.com/pingcap/tidb/parser/mysql"
+
+>>>>>>> d8288e02 (reparo: fix can't decode bit type data (#1103))
 	"github.com/pingcap/tidb-binlog/tests/util"
 )
 
@@ -221,6 +226,11 @@ func genColumnData(table *table, column *column) (string, error) {
 	isUnsigned := mysql.HasUnsignedFlag(tp.Flag)
 
 	switch tp.Tp {
+	case mysql.TypeBit:
+		if randInt(0, 1) == 0 {
+			return "b'0'", nil
+		}
+		return "b'1'", nil
 	case mysql.TypeTiny:
 		var data int64
 		if isUnique {

diff --git a/tests/reparo/binlog.go b/tests/reparo/binlog.go
@@ -20,6 +20,7 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
+
 	"github.com/pingcap/tidb-binlog/tests/dailytest"
 	"github.com/pingcap/tidb-binlog/tests/util"
 )
@@ -70,6 +71,14 @@ func main() {
 		c varchar(10) NOT NULL,
 		d time unique
 	);
+	`,
+		`
+	create table ntest2(
+		a int,
+		b double NOT NULL DEFAULT 2.0,
+		c varchar(10) NOT NULL,
+		d bit(20)
+	);
 	`}
 
 	dailytest.RunDailyTest(sourceDB, tableSQLs, cfg.WorkerCount, cfg.JobCount, cfg.Batch)