Use charset literals in partial JSON expression

Signed-off-by: Matt Lord <[email protected]>
vitessio · Dec 9, 2024 · 181d05e · 181d05e
1 parent 2aed1aa
commit 181d05e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/go/mysql/binlog/binlog_json.go b/go/mysql/binlog/binlog_json.go
@@ -105,7 +105,10 @@ func ParseBinaryJSONDiff(data []byte) (sqltypes.Value, error) {
 	path := data[pos : uint64(pos)+pathLen]
 	pos += int(pathLen)
 	log.Errorf("DEBUG: json diff path: %s", string(path))
-	diff.WriteString(fmt.Sprintf("'%s', ", path))
+	// We have to specify the unicode character set for the strings we
+	// use in the expression as the connection can be using a different
+	// character set (e.g. vreplication always uses set names binary).
+	diff.WriteString(fmt.Sprintf("_utf8mb4'%s', ", path))
 
 	if opType == jsonDiffOpRemove { // No value for remove
 		diff.WriteString(")")
@@ -124,6 +127,9 @@ func ParseBinaryJSONDiff(data []byte) (sqltypes.Value, error) {
 		return sqltypes.Value{}, fmt.Errorf("cannot read JSON diff value for path %s: %w", path, err)
 	}
 	log.Errorf("DEBUG: json diff value: %v", value)
+	if value.Type() == json.TypeString {
+		diff.WriteString("_utf8mb4")
+	}
 	diff.WriteString(fmt.Sprintf("%s)", value))
 
 	return sqltypes.MakeTrusted(sqltypes.Expression, diff.Bytes()), nil

diff --git a/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go b/go/vt/vttablet/tabletmanager/rpc_vreplication_test.go
@@ -1753,7 +1753,7 @@ func addInvariants(dbClient *binlogplayer.MockDBClient, vreplID, sourceTabletUID
 		fmt.Sprintf("%s||0|0|Stopped|1|%s|0|0", position, workflow),
 	))
 	dbClient.AddInvariant(setSessionTZ, &sqltypes.Result{})
-	//dbClient.AddInvariant(setNames, &sqltypes.Result{})
+	dbClient.AddInvariant(setNames, &sqltypes.Result{})
 	dbClient.AddInvariant(setNetReadTimeout, &sqltypes.Result{})
 	dbClient.AddInvariant(setNetWriteTimeout, &sqltypes.Result{})
 

diff --git a/go/vt/vttablet/tabletmanager/vreplication/controller.go b/go/vt/vttablet/tabletmanager/vreplication/controller.go
@@ -215,6 +215,11 @@ func setDBClientSettings(dbClient binlogplayer.DBClient, workflowConfig *vttable
 	if _, err := dbClient.ExecuteFetch("set @@session.time_zone = '+00:00'", maxRows); err != nil {
 		return err
 	}
+	// Tables may have varying character sets. To ship the bits without interpreting them
+	// we set the character set to be binary.
+	if _, err := dbClient.ExecuteFetch("set names 'binary'", maxRows); err != nil {
+		return err
+	}
 	if _, err := dbClient.ExecuteFetch(fmt.Sprintf("set @@session.net_read_timeout = %v",
 		workflowConfig.NetReadTimeout), maxRows); err != nil {
 		return err