Skip to content
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

ddl(ticdc): add charset and collate to ddl event (#8723) #8764

Merged
merged 9 commits into from
Apr 12, 2023
Merged

ddl(ticdc): add charset and collate to ddl event (#8723) #8764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
080d223
This is an automated cherry-pick of #8723
3AceShowHand Apr 10, 2023
28bf966
tiny fix the conflicts.
3AceShowHand Apr 12, 2023
8680497
update tidb dependency.
3AceShowHand Apr 12, 2023
6d2bf28
Merge branch 'release-6.5' into cherry-pick-8723-to-release-6.5
3AceShowHand Apr 12, 2023
be2e283
fix make cdc
3AceShowHand Apr 12, 2023
50635e3
fix ut
3AceShowHand Apr 12, 2023
53caa18
remove ttl test case in the ddl sink
3AceShowHand Apr 12, 2023
4469690
remove sql.
3AceShowHand Apr 12, 2023
af83203
remove sql.
3AceShowHand Apr 12, 2023
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
8 changes: 8 additions & 0 deletions cdc/model/sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@ type DDLEvent struct {
PreTableInfo *TableInfo `msg:"-"`
Type model.ActionType `msg:"-"`
Done bool `msg:"-"`
Charset string `msg:"-"`
Collate string `msg:"-"`
}

// FromJob fills the values with DDLEvent from DDL job
Expand Down Expand Up @@ -665,6 +667,9 @@ func (d *DDLEvent) FromJob(job *model.Job, preTableInfo *TableInfo, tableInfo *T
d.Type = job.Type
d.PreTableInfo = preTableInfo
d.TableInfo = tableInfo

d.Charset = job.Charset
d.Collate = job.Collate
// rebuild the query if necessary
rebuildQuery()
}
Expand All @@ -687,6 +692,9 @@ func (d *DDLEvent) FromRenameTablesJob(job *model.Job,
d.Type = model.ActionRenameTable
d.PreTableInfo = preTableInfo
d.TableInfo = tableInfo

d.Charset = job.Charset
d.Collate = job.Collate
}

// SingleTableTxn represents a transaction which includes many row events in a single table
Expand Down
23 changes: 18 additions & 5 deletions cdc/owner/ddl_sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func (s *ddlSinkImpl) run(ctx context.Context) {

case ddl := <-s.ddlCh:
var err error
ddl.Query, err = addSpecialComment(ddl.Query)
ddl.Query, err = s.addSpecialComment(ddl)
if err != nil {
log.Error("Add special comment failed",
zap.String("namespace", s.changefeedID.Namespace),
Expand Down Expand Up @@ -384,13 +384,16 @@ func (s *ddlSinkImpl) isInitialized() bool {
}

// addSpecialComment translate tidb feature to comment
func addSpecialComment(ddlQuery string) (string, error) {
stms, _, err := parser.New().ParseSQL(ddlQuery)
func (s *ddlSinkImpl) addSpecialComment(ddl *model.DDLEvent) (string, error) {
stms, _, err := parser.New().Parse(ddl.Query, ddl.Charset, ddl.Collate)
if err != nil {
return "", errors.Trace(err)
}
if len(stms) != 1 {
log.Panic("invalid ddlQuery statement size", zap.String("ddlQuery", ddlQuery))
log.Panic("invalid ddlQuery statement size",
zap.String("namespace", s.changefeedID.Namespace),
zap.String("changefeed", s.changefeedID.ID),
zap.String("ddlQuery", ddl.Query))
}
var sb strings.Builder
// translate TiDB feature to special comment
Expand All @@ -406,5 +409,15 @@ func addSpecialComment(ddlQuery string) (string, error) {
if err = stms[0].Restore(format.NewRestoreCtx(restoreFlags, &sb)); err != nil {
return "", errors.Trace(err)
}
return sb.String(), nil

result := sb.String()
log.Info("add special comment to DDL",
zap.String("namespace", s.changefeedID.Namespace),
zap.String("changefeed", s.changefeedID.ID),
zap.String("DDL", ddl.Query),
zap.String("charset", ddl.Charset),
zap.String("collate", ddl.Collate),
zap.String("result", result))

return result, nil
}
Loading