types: add one more space to make json pretty (pingcap#7389)

Author: mccxj

executor/executor_test.go

@@ -1237,7 +1237,7 @@ func (s *testSuite) TestJSON(c *C) {
 
 	var result *testkit.Result
 	result = tk.MustQuery(`select tj.a from test_json tj order by tj.id`)
-	result.Check(testkit.Rows(`{"a":[1,"2",{"aa":"bb"},4],"b":true}`, "null", "<nil>", "true", "3", "4", `"string"`))
+	result.Check(testkit.Rows(`{"a": [1, "2", {"aa": "bb"}, 4], "b": true}`, "null", "<nil>", "true", "3", "4", `"string"`))
 
 	// Check json_type function
 	result = tk.MustQuery(`select json_type(a) from test_json tj order by tj.id`)
@@ -1481,7 +1481,7 @@ func (s *testSuite) TestGeneratedColumnRead(c *C) {
 	tk.MustExec(`CREATE TABLE test_gc_read_cast_2( a JSON, b JSON AS (a->>'$.a'))`)
 	tk.MustExec(`INSERT INTO test_gc_read_cast_2(a) VALUES ('{"a": "{    \\\"key\\\": \\\"\\u6d4b\\\"    }"}')`)
 	result = tk.MustQuery(`SELECT b FROM test_gc_read_cast_2`)
-	result.Check(testkit.Rows(`{"key":"测"}`))
+	result.Check(testkit.Rows(`{"key": "测"}`))
 
 	_, err := tk.Exec(`INSERT INTO test_gc_read_cast_1 (a, b) VALUES ('{"a": "invalid"}', '$.a')`)
 	c.Assert(err, NotNil)

executor/write_test.go

@@ -1049,7 +1049,7 @@ func (s *testSuite) TestUpdateCastOnlyModifiedValues(c *C) {
 	r.Check(testkit.Rows("300"))
 	tk.MustExec(`UPDATE update_with_diff_type SET b = '{"a":   "\\u6d4b\\u8bd5"}'`)
 	r = tk.MustQuery("SELECT b FROM update_with_diff_type")
-	r.Check(testkit.Rows(`{"a":"测试"}`))
+	r.Check(testkit.Rows(`{"a": "测试"}`))
 }
 
 func (s *testSuite) fillMultiTableForUpdate(tk *testkit.TestKit) {
@@ -1782,13 +1782,13 @@ func (s *testSuite) TestInsertCalculatedValue(c *C) {
 	tk.MustExec("insert into t (b) value (a->'$.a'+1)")
 	tk.MustQuery("select * from t").Check(testkit.Rows("<nil> <nil> <nil>", "<nil> <nil> <nil>"))
 	tk.MustExec(`insert into t (a, b) value ('{"a": 1}', a->'$.a'+1)`)
-	tk.MustQuery("select * from t where c = 1").Check(testkit.Rows(`{"a":1} 2 1`))
+	tk.MustQuery("select * from t where c = 1").Check(testkit.Rows(`{"a": 1} 2 1`))
 	tk.MustExec("truncate table t")
 	tk.MustExec("insert t set b = c + 1")
 	tk.MustQuery("select * from t").Check(testkit.Rows("<nil> <nil> <nil>"))
 	tk.MustExec("truncate table t")
 	tk.MustExec(`insert t set a = '{"a": 1}', b = c`)
-	tk.MustQuery("select * from t").Check(testkit.Rows(`{"a":1} <nil> 1`))
+	tk.MustQuery("select * from t").Check(testkit.Rows(`{"a": 1} <nil> 1`))
 
 	tk.MustExec("drop table if exists t")
 	tk.MustExec("create table t(a int auto_increment key, b int)")

types/json/binary.go

@@ -245,7 +245,7 @@ func (bj BinaryJSON) marshalArrayTo(buf []byte) ([]byte, error) {
 	buf = append(buf, '[')
 	for i := 0; i < elemCount; i++ {
 		if i != 0 {
-			buf = append(buf, ',')
+			buf = append(buf, ", "...)
 		}
 		var err error
 		buf, err = bj.arrayGetElem(i).marshalTo(buf)
@@ -261,10 +261,10 @@ func (bj BinaryJSON) marshalObjTo(buf []byte) ([]byte, error) {
 	buf = append(buf, '{')
 	for i := 0; i < elemCount; i++ {
 		if i != 0 {
-			buf = append(buf, ',')
+			buf = append(buf, ", "...)
 		}
 		buf = marshalStringTo(buf, bj.objectGetKey(i))
-		buf = append(buf, ':')
+		buf = append(buf, ": "...)
 		var err error
 		buf, err = bj.objectGetVal(i).marshalTo(buf)
 		if err != nil {

types/json/binary_test.go

@@ -29,9 +29,9 @@ func TestT(t *testing.T) {
 
 func (s *testJSONSuite) TestBinaryJSONMarshalUnmarshal(c *C) {
 	strs := []string{
-		`{"a":[1,"2",{"aa":"bb"},4,null],"b":true,"c":null}`,
-		`{"aaaaaaaaaaa":[1,"2",{"aa":"bb"},4.1],"bbbbbbbbbb":true,"ccccccccc":"d"}`,
-		`[{"a":1,"b":true},3,3.5,"hello, world",null,true]`,
+		`{"a": [1, "2", {"aa": "bb"}, 4, null], "b": true, "c": null}`,
+		`{"aaaaaaaaaaa": [1, "2", {"aa": "bb"}, 4.1], "bbbbbbbbbb": true, "ccccccccc": "d"}`,
+		`[{"a": 1, "b": true}, 3, 3.5, "hello, world", null, true]`,
 	}
 	for _, str := range strs {
 		parsedBJ := mustParseBinaryFromString(c, str)
@@ -115,7 +115,7 @@ func (s *testJSONSuite) TestBinaryJSONUnquote(c *C) {
 		{j: "\"\\u4f60\"", unquoted: "你"},
 		{j: `true`, unquoted: "true"},
 		{j: `null`, unquoted: "null"},
-		{j: `{"a": [1, 2]}`, unquoted: `{"a":[1,2]}`},
+		{j: `{"a": [1, 2]}`, unquoted: `{"a": [1, 2]}`},
 		{j: `"\""`, unquoted: `"`},
 		{j: `"'"`, unquoted: `'`},
 		{j: `"''"`, unquoted: `''`},