Merge pull request #658 from D3Hunter/json-store-as-string

store json as string in rows events

Author: lance6716

replication/row_event.go

@@ -1151,7 +1151,11 @@ func (e *RowsEvent) decodeValue(data []byte, tp byte, meta uint16) (v interface{
 		// Refer: https://github.com/shyiko/mysql-binlog-connector-java/blob/master/src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/AbstractRowsEventDataDeserializer.java#L404
 		length = int(FixedLengthInt(data[0:meta]))
 		n = length + int(meta)
-		v, err = e.decodeJsonBinary(data[meta:n])
+		var d []byte
+		d, err = e.decodeJsonBinary(data[meta:n])
+		if err == nil {
+			v = hack.String(d)
+		}
 	case MYSQL_TYPE_GEOMETRY:
 		// MySQL saves Geometry as Blob in binlog
 		// Seem that the binary format is SRID (4 bytes) + WKB, outer can use

replication/row_event_test.go

@@ -699,40 +699,40 @@ func (_ *testDecodeSuite) TestJsonCompatibility(c *C) {
 	rows.Rows = nil
 	err = rows.Decode(data)
 	c.Assert(err, IsNil)
-	c.Assert(rows.Rows[0][2], DeepEquals, []uint8("{}"))
+	c.Assert(rows.Rows[0][2], DeepEquals, "{}")
 
 	// after MySQL 5.7.22
 	data = []byte("l\x00\x00\x00\x00\x00\x01\x00\x02\x00\x04\xff\xff\xf8\x01\x00\x00\x00\x02{}\x05\x00\x00\x00\x00\x00\x00\x04\x00\xf8\x01\x00\x00\x00\n{\"a\":1234}\r\x00\x00\x00\x00\x01\x00\x0c\x00\x0b\x00\x01\x00\x05\xd2\x04a")
 	rows.Rows = nil
 	err = rows.Decode(data)
 	c.Assert(err, IsNil)
-	c.Assert(rows.Rows[1][2], DeepEquals, []uint8("{}"))
-	c.Assert(rows.Rows[2][2], DeepEquals, []uint8("{\"a\":1234}"))
+	c.Assert(rows.Rows[1][2], DeepEquals, "{}")
+	c.Assert(rows.Rows[2][2], DeepEquals, "{\"a\":1234}")
 
 	data = []byte("l\x00\x00\x00\x00\x00\x01\x00\x02\x00\x04\xff\xff\xf8\x01\x00\x00\x00\n{\"a\":1234}\r\x00\x00\x00\x00\x01\x00\x0c\x00\x0b\x00\x01\x00\x05\xd2\x04a\xf8\x01\x00\x00\x00\x02{}\x05\x00\x00\x00\x00\x00\x00\x04\x00")
 	rows.Rows = nil
 	err = rows.Decode(data)
 	c.Assert(err, IsNil)
-	c.Assert(rows.Rows[1][2], DeepEquals, []uint8("{\"a\":1234}"))
-	c.Assert(rows.Rows[2][2], DeepEquals, []uint8("{}"))
+	c.Assert(rows.Rows[1][2], DeepEquals, "{\"a\":1234}")
+	c.Assert(rows.Rows[2][2], DeepEquals, "{}")
 
 	// before MySQL 5.7.22
 	rows.ignoreJSONDecodeErr = true
 	data = []byte("l\x00\x00\x00\x00\x00\x01\x00\x02\x00\x04\xff\xff\xf8\x01\x00\x00\x00\x02{}\x05\x00\x00\x00\x00\x01\x00\x0c\x00\xf8\x01\x00\x00\x00\n{\"a\":1234}\r\x00\x00\x00\x00\x01\x00\x0c\x00\x0b\x00\x01\x00\x05\xd2\x04a")
 	rows.Rows = nil
 	err = rows.Decode(data)
 	c.Assert(err, IsNil)
-	c.Assert(rows.Rows[1][2], DeepEquals, []uint8("null"))
-	c.Assert(rows.Rows[2][2], DeepEquals, []uint8("{\"a\":1234}"))
+	c.Assert(rows.Rows[1][2], DeepEquals, "null")
+	c.Assert(rows.Rows[2][2], DeepEquals, "{\"a\":1234}")
 
 	rows.ignoreJSONDecodeErr = false
 	data = []byte("l\x00\x00\x00\x00\x00\x01\x00\x02\x00\x04\xff\xff\xf8\x01\x00\x00\x00\n{\"a\":1234}\r\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x01\x00\x05\xd2\x04a\xf8\x01\x00\x00\x00\x02{}\x05\x00\x00\x00\x00\x00\x00\x04\x00")
 	rows.Rows = nil
 	err = rows.Decode(data)
 	c.Assert(err, IsNil)
 	// this value is wrong in binlog, but can be parsed without error
-	c.Assert(rows.Rows[1][2], DeepEquals, []uint8("{}"))
-	c.Assert(rows.Rows[2][2], DeepEquals, []uint8("{}"))
+	c.Assert(rows.Rows[1][2], DeepEquals, "{}")
+	c.Assert(rows.Rows[2][2], DeepEquals, "{}")
 }
 
 func (_ *testDecodeSuite) TestDecodeDatetime2(c *C) {