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

Jump to bottom

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

Merged
merged 5 commits into from
Dec 22, 2021
Merged

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

merged 5 commits into from
Dec 22, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3845

What problem does this PR solve?

close #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.

@sdojjy @ti-chi-bot
This is an automated cherry-pick of pingcap#3845
ac4fbc8 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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.

@ti-chi-bot ti-chi-bot mentioned this pull request Dec 20, 2021
Merged
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved component/ddl DDL component. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. labels Dec 20, 2021
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 20, 2021
@sdojjy
Merge remote-tracking branch 'upstream/master' into sink-node-actor-r…
6247f3f 
…efactor

# Conflicts:
#	cdc/processor/pipeline/sink.go
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 20, 2021
@sdojjy
Copy link
Member

sdojjy commented Dec 20, 2021

/run-all-tests

@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 21, 2021
@overvenus
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 589c0a2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 22, 2021
@amyangfei amyangfei added this to the v5.2.4 milestone Dec 22, 2021
@ti-chi-bot ti-chi-bot merged commit 024f7ce into pingcap:release-5.2 Dec 22, 2021
3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
@ti-chi-bot @3AceShowHand
ticdc/owner: Fix ddl special comment syntax error (pingcap#3845) (pin…
4915083 
…gcap#3977)
overvenus pushed a commit that referenced this pull request Jan 18, 2022
@ti-chi-bot @zhaoxinyu
@amyangfei @asddongmen @3AceShowHand
metrics(cdc): fix mq sink write row count metrics. (#4192) (#4322)
a5ce862 
* 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 <ti-community-prow-bot@tidb.io>

* 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 <ti-community-prow-bot@tidb.io>

* fix conflicts.

* This is an automated cherry-pick of #3682

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix import.

* fix failpoint path.

* try to fix initialize.

* remove table_sink.

* remove initialization.

* remove owner.

* fix mq.

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

* 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 <ti-community-prow-bot@tidb.io>

* fix conflicts.

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com>
Co-authored-by: amyangfei <yangfei@pingcap.com>
Co-authored-by: dongmen <20351731+asddongmen@users.noreply.github.com>
Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@sdojjy sdojjy

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/ddl DDL component. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR.
Projects
None yet
Milestone
v5.2.4
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @sdojjy @overvenus @amyangfei @nongfushanquan