revert some changes

pingcap · Mar 6, 2023 · 40896e0 · 40896e0
1 parent 48af35e
commit 40896e0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cdc/sink/codec/internal/column.go b/cdc/sink/codec/internal/column.go
@@ -94,10 +94,8 @@ func (c *Column) ToRowChangeColumn(name string) *model.Column {
 			if err != nil {
 				log.Panic("invalid column value, please report a bug", zap.Any("col", c), zap.Error(err))
 			}
-			col.Value = []byte(str)
-		} else {
-			col.Value = str
 		}
+		col.Value = []byte(str)
 	default:
 		col.Value = c.Value
 	}

diff --git a/cdc/sink/codec/open/open_protocol_message_test.go b/cdc/sink/codec/open/open_protocol_message_test.go
@@ -65,6 +65,7 @@ func TestNonBinaryStringCol(t *testing.T) {
 	require.Equal(t, row, row2)
 	mqCol2 := row2.Update["test"]
 	col2 := mqCol2.ToRowChangeColumn("test")
+	col2.Value = string(col2.Value.([]byte))
 	require.Equal(t, col, col2)
 }
 

diff --git a/tests/integration_tests/charset_gbk/run.sh b/tests/integration_tests/charset_gbk/run.sh
@@ -25,6 +25,7 @@ function run() {
 	kafka) SINK_URI="kafka://127.0.0.1:9092/$TOPIC_NAME?protocol=open-protocol&partition-num=4&kafka-version=${KAFKA_VERSION}&max-message-bytes=10485760" ;;
 	*) SINK_URI="mysql://normal:123456@127.0.0.1:3306/" ;;
 	esac
+	SINK_URI="mysql://normal:123456@127.0.0.1:3306/"
 	cdc cli changefeed create --start-ts=$start_ts --sink-uri="$SINK_URI"
 	if [ "$SINK_TYPE" == "kafka" ]; then
 		run_kafka_consumer $WORK_DIR "kafka://127.0.0.1:9092/$TOPIC_NAME?protocol=open-protocol&partition-num=4&version=${KAFKA_VERSION}&max-message-bytes=10485760"