Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sink: fix codec json encoding with non binary string (#2764) #2781

Merged
merged 2 commits into from
Sep 10, 2021
Merged

sink: fix codec json encoding with non binary string (#2764) #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b15501
sink: fix codec json encoding with non binary string
amyangfei Sep 7, 2021
28f5d9f
fix log
amyangfei Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion cdc/sink/codec/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,15 @@ func (c *column) FromSinkColumn(col *model.Column) {
}
switch col.Type {
case mysql.TypeString, mysql.TypeVarString, mysql.TypeVarchar:
str := string(col.Value.([]byte))
var str string
switch col.Value.(type) {
case []byte:
str = string(col.Value.([]byte))
case string:
str = col.Value.(string)
default:
log.Panic("invalid column value, please report a bug", zap.Any("col", col))
}
if c.Flag.IsBinary() {
str = strconv.Quote(str)
str = str[1 : len(str)-1]
Expand Down
22 changes: 22 additions & 0 deletions cdc/sink/codec/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,28 @@ func (s *columnSuite) TestFormatCol(c *check.C) {
c.Assert(row2, check.DeepEquals, row)
}

func (s *columnSuite) TestNonBinaryStringCol(c *check.C) {
defer testleak.AfterTest(c)()
col := &model.Column{
Name: "test",
Type: mysql.TypeString,
Value: "value",
}
jsonCol := column{}
jsonCol.FromSinkColumn(col)
row := &mqMessageRow{Update: map[string]column{"test": jsonCol}}
rowEncode, err := row.Encode()
c.Assert(err, check.IsNil)
row2 := new(mqMessageRow)
err = row2.Decode(rowEncode)
c.Assert(err, check.IsNil)
c.Assert(row2, check.DeepEquals, row)
jsonCol2 := row2.Update["test"]
col2 := jsonCol2.ToSinkColumn("test")
col2.Value = string(col2.Value.([]byte))
c.Assert(col2, check.DeepEquals, col)
}

func (s *columnSuite) TestVarBinaryCol(c *check.C) {
defer testleak.AfterTest(c)()
col := &model.Column{
Expand Down