Fix panic on unsigned tinyint (#2649) (#2654)

pingcap · Aug 29, 2021 · b9e5a1f · b9e5a1f
1 parent ab1b693
commit b9e5a1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cdc/sink/codec/avro.go b/cdc/sink/codec/avro.go
@@ -484,6 +484,9 @@ func columnToAvroNativeData(col *model.Column, tz *time.Location) (interface{},
 	case mysql.TypeBit:
 		return handleUnsignedInt64()
 	case mysql.TypeTiny, mysql.TypeShort, mysql.TypeInt24:
+		if col.Flag.IsUnsigned() {
+			return int32(col.Value.(uint64)), "int", nil
+		}
 		return int32(col.Value.(int64)), "int", nil
 	case mysql.TypeLong:
 		if col.Flag.IsUnsigned() {

diff --git a/cdc/sink/codec/avro_test.go b/cdc/sink/codec/avro_test.go
@@ -195,6 +195,7 @@ func (s *avroBatchEncoderSuite) TestAvroEncode(c *check.C) {
 			{Name: "id", Type: mysql.TypeLong, Flag: model.HandleKeyFlag, Value: int64(1)},
 			{Name: "name", Type: mysql.TypeVarchar, Value: "Bob"},
 			{Name: "tiny", Type: mysql.TypeTiny, Value: int64(255)},
+			{Name: "utiny", Type: mysql.TypeTiny, Flag: model.UnsignedFlag, Value: uint64(100)},
 			{Name: "comment", Type: mysql.TypeBlob, Value: []byte("测试")},
 		},
 	}