ticdc/owner: Fix ddl special comment syntax error #3845

sdojjy · 2021-12-13T06:59:07Z

What problem does this PR solve?

close https://github.com/pingcap/ticdc/issues/3755

What is changed and how it works?

not use regex to parse and add special TiDB comments, If a DDL already has special comment like /*!90000 SHARD_ROW_ID_BITS=4 PRE_SPLIT_REGIONS=3 */, it wil translate that DDL to /*!90000 /*T! SHARD_ROW_ID_BITS=4 PRE_SPLIT_REGIONS=3 */ */, TiDB will throw a syntax error.
this PR use the TiDB SQL parser to parse the SQL and the Restore it with format.RestoreStringSingleQuotes|format.RestoreNameBackQuotes|format.RestoreKeyWordUppercase|format.RestoreTiDBSpecialComment flag

Check List

Tests

Unit test

Code changes

Has exported function/method change
Has exported variable/fields change
Has interface methods change
Has persistent data change

Side effects

Possible performance regression
Increased code complexity
Breaking backward compatibility

Related changes

Need to cherry-pick to the release branch
Need to update the documentation
Need to update key monitor metrics in both TiCDC document and official document

Release note

Fix syntax error if DDL has a special comment.

ti-chi-bot · 2021-12-13T06:59:08Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

amyangfei
overvenus

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

overvenus

Rest LGTM

overvenus · 2021-12-13T07:51:49Z

cdc/owner/changefeed.go

@@ -494,3 +500,19 @@ func (c *changefeed) updateStatus(currentTs int64, checkpointTs, resolvedTs mode
 func (c *changefeed) Close(ctx context.Context) {
 	c.releaseResources(ctx)
 }
+
+// addSpecialComment translate tidb feature to comment
+func addSpecialComment(ddlQuery string) (string, error) {


Are special comments compatible with older version of TiDB (v4.0.0)?

overvenus · 2021-12-13T07:54:32Z

Please also add a release note, thanks!

…omment-syntax-error # Conflicts: # cdc/owner/changefeed_test.go

overvenus

Rest LGTM

cdc/owner/changefeed.go

…omment-syntax-error # Conflicts: # cdc/owner/changefeed.go

…omment-syntax-error # Conflicts: # cdc/owner/changefeed_test.go

ti-chi-bot · 2021-12-20T04:09:06Z

This pull request has been accepted and is ready to merge.

Commit hash: d7c0093

sdojjy · 2021-12-20T06:11:13Z

/run-leak-test

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2021-12-20T06:28:23Z

In response to a cherrypick label: new pull request created: #3977.

ti-chi-bot · 2021-12-20T06:28:59Z

In response to a cherrypick label: new pull request created: #3978.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2021-12-20T06:29:37Z

In response to a cherrypick label: new pull request created: #3979.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2021-12-20T06:30:13Z

In response to a cherrypick label: new pull request created: #3981.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2021-12-20T06:30:50Z

In response to a cherrypick label: new pull request created: #3982.

…gcap#3977)

…gcap#3978)

* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ * address comments * add comments for exported functions * fix the compiling problem * workerpool: limit the rate to output deadlock warning (#3775) (#3799) * metrics: add changefeed checkepoint catch-up ETA (#3300) (#3311) * pkg,cdc: do not use log package (#3902) (#3939) * *: rename repo from pingcap/ticdc to pingcap/tiflow (#3957) * kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3662) * tz (ticdc): fix timezone error (#3887) (#3910) * http_*: add log for http api and refine the err handle logic (#2997) (#3306) * ticdc/alert: add no owner alert rule (#3809) (#3831) * etcd_worker: batch etcd patch (#3277) (#3393) * ticdc/owner: Fix ddl special comment syntax error (#3845) (#3977) * Clean old owner and old processor in release 5.2 branch (#4019) * tests(ticdc): set up the sync diff output directory correctly (#3725) (#3745) * owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4015) * config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3782) * ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4027) * sink(ticdc): cherry pick sink bug fix to release 5.2 (#4083) (#4119) * metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4103) * kv(ticdc): reduce eventfeed rate limited log (#4072) (#4110) close #4006 * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <[email protected]> * http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4122) close #3840 * cdc/sink: adjust kafka initialization logic (#3192) (#3568) * This is an automated cherry-pick of #3192 Signed-off-by: ti-chi-bot <[email protected]> * fix conflicts. * This is an automated cherry-pick of #3682 Signed-off-by: ti-chi-bot <[email protected]> * fix import. * fix failpoint path. * try to fix initialize. * remove table_sink. * remove initialization. * remove owner. * fix mq. Co-authored-by: Ling Jin <[email protected]> Co-authored-by: 3AceShowHand <[email protected]> * sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4098) close #4055 * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <[email protected]> * fix conflicts. * fix conflicts. * fix conflicts. Co-authored-by: zhaoxinyu <[email protected]> Co-authored-by: amyangfei <[email protected]> Co-authored-by: dongmen <[email protected]> Co-authored-by: Ling Jin <[email protected]> Co-authored-by: 3AceShowHand <[email protected]>

* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ * address comments * add comments for exported functions * fix the compiling problem * workerpool: limit the rate to output deadlock warning (#3775) (#3795) * tests(ticdc): set up the sync diff output directory correctly (#3725) (#3741) * relay(dm): use binlog name comparison (#3710) (#3712) * dm/load: fix concurrent call Loader.Status (#3459) (#3468) * cdc/sorter: make unified sorter cgroup aware (#3436) (#3439) * tz (ticdc): fix timezone error (#3887) (#3906) * pkg,cdc: do not use log package (#3902) (#3940) * *: rename repo from pingcap/ticdc to pingcap/tiflow (#3959) * http_*: add log for http api and refine the err handle logic (#2997) (#3307) * etcd_worker: batch etcd patch (#3277) (#3389) * http_api (ticdc): check --cert-allowed-cn before add server common name (#3628) (#3882) * kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3663) * owner: fix owner tick block http request (#3490) (#3530) * dm/syncer: use downstream PK/UK to generate DML (#3168) (#3256) * dep(dm): update go-mysql (#3914) (#3934) * dm/syncer: multiple rows use downstream schema (#3308) (#3953) * errorutil,sink,syncer: add errorutil to handle ignorable error (#3264) (#3995) * dm/worker: don't exit when failed to read checkpoint in relay (#3345) (#4005) * syncer(dm): use an early location to reset binlog and open safemode (#3860) * ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978) * dm/scheduler: fix inconsistent of relay status (#3474) (#4009) * owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4016) * config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3783) * sink(ticdc): cherry pick sink bug fix to release 5.3 (#4083) * master(dm): clean and treat invalid load task (#4004) (#4145) * loader: fix wrong progress in query-status for loader (#4093) (#4143) close #3252 * ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4028) * dm: load table structure from dump files (#3295) (#4163) * compactor: fix duplicate entry in safemode (#3432) (#3434) (#4088) * kv(ticdc): reduce eventfeed rate limited log (#4072) (#4111) close #4006 * metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4104) * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <[email protected]> * retry(dm): align with tidb latest error message (#4172) (#4254) close #4159, close #4246 * owner(ticdc): Add bootstrap and try to fix the meta information in it (#3838) (#3865) * redolog: add a precleanup process when s3 enable (#3525) (#3878) * ddl(dm): make skipped ddl pass `SplitDDL()` (#4176) (#4227) close #4173 * cdc/sink: remove Initialize method from the sink interface (#3682) (#3765) Co-authored-by: Ling Jin <[email protected]> * http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4123) close #3840 * sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4099) close #4055 * cdc/sink: adjust kafka initialization logic (#3192) (#4162) * try fix conflicts. * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <[email protected]> * fix conflicts. * fix conflicts. Co-authored-by: zhaoxinyu <[email protected]> Co-authored-by: amyangfei <[email protected]> Co-authored-by: lance6716 <[email protected]> Co-authored-by: sdojjy <[email protected]> Co-authored-by: Ling Jin <[email protected]> Co-authored-by: 3AceShowHand <[email protected]>

sdojjy added 2 commits December 13, 2021 14:48

fix ticdc ddl special comment syntax error

4909abd

fix lint

c4e5aaa

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 13, 2021

overvenus reviewed Dec 13, 2021

View reviewed changes

sdojjy added 6 commits December 13, 2021 16:01

fix ut

102aab4

fix ut

3eefa97

fix lint

cafac04

Merge branch 'master' into fix-ddl-special-comment-syntax-error

31a344c

update restore flags

2800466

fix integration test

9f20824

ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Dec 16, 2021

Merge remote-tracking branch 'upstream/master' into fix-ddl-special-c…

a2324a1

…omment-syntax-error # Conflicts: # cdc/owner/changefeed_test.go

overvenus reviewed Dec 16, 2021

View reviewed changes

cdc/owner/changefeed.go Outdated Show resolved Hide resolved

sdojjy added 3 commits December 16, 2021 23:50

Merge remote-tracking branch 'upstream/master' into fix-ddl-special-c…

4bff488

…omment-syntax-error # Conflicts: # cdc/owner/changefeed.go

Merge remote-tracking branch 'upstream/master' into fix-ddl-special-c…

a5fda0a

…omment-syntax-error # Conflicts: # cdc/owner/changefeed_test.go

address comment

6aed328

amyangfei approved these changes Dec 17, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 17, 2021

sdojjy mentioned this pull request Dec 17, 2021

Using special comment syntax with /*!90000 */ caused TiCDC to report an error. #3755

Closed

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021

Merge branch 'master' into fix-ddl-special-comment-syntax-error

e6a2ad3

ti-chi-bot merged commit 7ccaad2 into pingcap:master Dec 20, 2021

sdojjy deleted the fix-ddl-special-comment-syntax-error branch December 20, 2021 06:28

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021

This is an automated cherry-pick of pingcap#3845

ac4fbc8

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Dec 20, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) #3977

Merged

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021

This is an automated cherry-pick of pingcap#3845

15d8ebc

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Dec 20, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) #3978

Merged

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021

This is an automated cherry-pick of pingcap#3845

0d5a6b5

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Dec 20, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) #3979

Closed

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021

This is an automated cherry-pick of pingcap#3845

9b0c1a1

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Dec 20, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) #3981

Closed

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 20, 2021

This is an automated cherry-pick of pingcap#3845

47181da

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Dec 20, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) #3982

Closed

ti-chi-bot added a commit that referenced this pull request Dec 22, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) (#3977)

024f7ce

ti-chi-bot added a commit that referenced this pull request Dec 22, 2021

ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978)

6d7e450

zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request Dec 29, 2021

ticdc/owner: Fix ddl special comment syntax error (pingcap#3845)

56396c6

bb7133 mentioned this pull request Dec 29, 2021

binlog: use node.Restore() to add TiDB-specified feature comments pingcap/tidb#31147

Closed

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022

ticdc/owner: Fix ddl special comment syntax error (pingcap#3845) (pin…

4915083

…gcap#3977)

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022

ticdc/owner: Fix ddl special comment syntax error (pingcap#3845) (pin…

d9b5b4b

…gcap#3978)

sdojjy mentioned this pull request Jan 19, 2022

ticdc/owner: Fix ddl special comment syntax error (#3845) #4415

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ticdc/owner: Fix ddl special comment syntax error #3845

ticdc/owner: Fix ddl special comment syntax error #3845

sdojjy commented Dec 13, 2021 •

edited

Loading

ti-chi-bot commented Dec 13, 2021 •

edited

Loading

overvenus left a comment

overvenus Dec 13, 2021

overvenus commented Dec 13, 2021

overvenus left a comment

ti-chi-bot commented Dec 20, 2021

sdojjy commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ticdc/owner: Fix ddl special comment syntax error #3845

ticdc/owner: Fix ddl special comment syntax error #3845

Conversation

sdojjy commented Dec 13, 2021 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Dec 13, 2021 • edited Loading

overvenus left a comment

Choose a reason for hiding this comment

overvenus Dec 13, 2021

Choose a reason for hiding this comment

overvenus commented Dec 13, 2021

overvenus left a comment

Choose a reason for hiding this comment

ti-chi-bot commented Dec 20, 2021

sdojjy commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

ti-chi-bot commented Dec 20, 2021

sdojjy commented Dec 13, 2021 •

edited

Loading

ti-chi-bot commented Dec 13, 2021 •

edited

Loading