Skip to content

Fix: Convert column value in binlog events to bytes instead of utf8 encoded unicode #1158

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

Merged
7 commits merged into from
Sep 6, 2022
Merged

Fix: Convert column value in binlog events to bytes instead of utf8 encoded unicode #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
113094b
Convert character to bytes and insert into table using latin1
wangzihuacool Aug 3, 2022
8a193e0
delete junk files
wangzihuacool Aug 3, 2022
c93060e
restore connection charset to utf8mb4
wangzihuacool Aug 11, 2022
2ad614a
Merge branch 'master' into fix-charset
timvaillancourt Aug 18, 2022
a17389e
Some fix to unit tests.
wangzihuacool Aug 19, 2022
e9cb4a2
convert to bytes if character string without charsetConversion.
wangzihuacool Aug 27, 2022
9c2c7ba
Merge branch 'master' into fix-charset
Sep 6, 2022
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
3 changes: 3 additions & 0 deletions go/logic/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ func (this *Inspector) inspectOriginalAndGhostTables() (err error) {
this.migrationContext.MappedSharedColumns.SetEnumToTextConversion(column.Name)
this.migrationContext.MappedSharedColumns.SetEnumValues(column.Name, column.EnumValues)
}
if column.Name == mappedColumn.Name && column.Charset != mappedColumn.Charset {
this.migrationContext.SharedColumns.SetCharsetConversion(column.Name, column.Charset, mappedColumn.Charset)
}
}

for _, column := range this.migrationContext.UniqueKey.Columns.Columns() {
Expand Down
22 changes: 18 additions & 4 deletions go/sql/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ type TimezoneConversion struct {
ToTimezone string
}

type CharacterSetConversion struct {
ToCharset string
FromCharset string
}

type Column struct {
Name string
IsUnsigned bool
Expand All @@ -43,17 +48,22 @@ type Column struct {
// add Octet length for binary type, fix bytes with suffix "00" get clipped in mysql binlog.
// https://github.com/github/gh-ost/issues/909
BinaryOctetLength uint
charsetConversion *CharacterSetConversion
}

func (this *Column) convertArg(arg interface{}, isUniqueKeyColumn bool) interface{} {
if s, ok := arg.(string); ok {
// string, charset conversion
if encoding, ok := charsetEncodingMap[this.Charset]; ok {
arg, _ = encoding.NewDecoder().String(s)
arg2Bytes := []byte(s)
// convert to bytes if character string without charsetConversion.
if this.Charset != "" && this.charsetConversion == nil {
arg = arg2Bytes
} else {
if encoding, ok := charsetEncodingMap[this.Charset]; ok {
arg, _ = encoding.NewDecoder().String(s)
}
}

if this.Type == BinaryColumnType && isUniqueKeyColumn {
arg2Bytes := []byte(arg.(string))
size := len(arg2Bytes)
if uint(size) < this.BinaryOctetLength {
buf := bytes.NewBuffer(arg2Bytes)
Expand Down Expand Up @@ -238,6 +248,10 @@ func (this *ColumnList) Len() int {
return len(this.columns)
}

func (this *ColumnList) SetCharsetConversion(columnName string, fromCharset string, toCharset string) {
this.GetColumn(columnName).charsetConversion = &CharacterSetConversion{FromCharset: fromCharset, ToCharset: toCharset}
}

// UniqueKey is the combination of a key's name and columns
type UniqueKey struct {
Name string
Expand Down