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.

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

refactor/improve clarity: refactored and added more details about duplicate detection of tidb-lightning #9858

Open
wants to merge 20 commits into
base: master
Choose a base branch
from

Conversation

nova-xu
Copy link

@nova-xu nova-xu commented Jun 16, 2022

First-time contributors' checklist

What is changed, added or deleted? (Required)

之前的冲突检测杂糅在backend导入模式的配置介绍中,并且比较简略,不是太清晰。我结合现有的内容,创建了一个新的页面解释冲突检测,加入了详细的例子以及更多关于冲突检测的细节。

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v6.1 (TiDB 6.1 versions)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

[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 added contribution This PR is from a community contributor. first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. labels Jun 16, 2022
@ti-chi-bot ti-chi-bot requested a review from TomShawn June 16, 2022 02:49
@ti-chi-bot
Copy link
Member

Welcome @nova-xu!

It looks like this is your first PR to pingcap/docs-cn 🎉.

I'm the bot to help you request reviewers, add labels and more, See available commands.

We want to make sure your contribution gets all the attention it needs!



Thank you, and welcome to pingcap/docs-cn. 😃

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 16, 2022
@nova-xu nova-xu marked this pull request as draft June 16, 2022 04:08
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 16, 2022
@nova-xu nova-xu marked this pull request as ready for review June 16, 2022 04:29
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 16, 2022
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. labels Jun 16, 2022
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Jun 16, 2022
@TomShawn TomShawn added type/refactor The issue belongs to a refactor work. missing-translation-status This PR does not have translation status info. and removed missing-translation-status This PR does not have translation status info. labels Jun 16, 2022
@TomShawn TomShawn requested review from ran-huang and removed request for TomShawn June 16, 2022 11:27
@nova-xu nova-xu requested a review from sunzhaoyang June 22, 2022 22:33
@nova-xu
Copy link
Author

nova-xu commented Jun 22, 2022

@sunzhaoyang 您好,我已经根据您的feedback做了相应的修改,麻烦您帮我看看还有没有什么需要改进的地方。多谢!

@sunzhaoyang
Copy link
Contributor

LGTM 不过我建议 TOC 先不加,等重构的 PR 合并之后我再做一些合并的处理 cc @ran-huang

/cc @gozssky

@ti-chi-bot ti-chi-bot requested a review from sleepymole July 1, 2022 01:53
Copy link
Contributor

@sunzhaoyang sunzhaoyang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sunzhaoyang
Copy link
Contributor

@nova-xu please fix the error of " jenkins-docs-cn/verify "

@ran-huang we have to merge this article with current duplicate detection document

@ran-huang
Copy link
Contributor

@ran-huang we have to merge this article with current duplicate detection document

@sunzhaoyang You mean merge with this doc?

@nova-xu
Copy link
Author

nova-xu commented Jul 12, 2022

@sunzhaoyang I fixed the previous manual line break error, but Jenkins still failed for another reason. I read the detailed information, but I'm not sure if this means my doc didn't pass the markdownlint check.

@ran-huang
Copy link
Contributor

/rebase

@ran-huang
Copy link
Contributor

@nova-xu Hi, sorry for the delayed response. Could you please merge commits from the master branch so we can proceed with the review?

@ran-huang
Copy link
Contributor

/rebase

@ran-huang ran-huang force-pushed the duplicate-detection branch from 5ce4954 to 766fda7 Compare April 26, 2023 10:01
Signed-off-by: Ran <huangran.alex@gmail.com>
@ti-chi-bot ti-chi-bot 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 Apr 26, 2023
Signed-off-by: Ran <huangran.alex@gmail.com>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged the content in this doc into tidb-lightning-logical-import-mode-usage.md and tidb-lightning-physical-import-mode-usage.md.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/tidb-lightning Indicates that the Issue or PR belongs to the area of TiDB Lightning. contribution This PR is from a community contributor. first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. translation/doing This PR’s assignee is translating this PR. type/refactor The issue belongs to a refactor work.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants