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

ambiguous-words: clarify ambiguous words #9206

Merged
merged 5 commits into from
Jun 23, 2022
Merged

ambiguous-words: clarify ambiguous words #9206

merged 5 commits into from
Jun 23, 2022

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Jun 22, 2022 •
edited
Loading

What is changed, added or deleted? (Required)

ambiguous-words: clarify ambiguous words

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.

  • master (the latest development version)
  • v6.2 (TiDB 6.2 versions)
  • v6.1 (TiDB 6.1 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)

What is the related PR or file 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

ti-chi-bot commented Jun 22, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Oreoxmt
  • shichun-0415

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 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 22, 2022
@TomShawn TomShawn added ambiguous-words type/enhancement The issue or PR belongs to an enhancement. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. and removed missing-translation-status This PR does not have translation status info. labels Jun 22, 2022
TomShawn
TomShawn commented Jun 22, 2022
View reviewed changes
@TomShawn TomShawn requested review from Oreoxmt and shichun-0415 June 22, 2022 08:28
Oreoxmt
Oreoxmt reviewed Jun 22, 2022
View reviewed changes
dumpling-overview.md
@@ -318,9 +318,9 @@ When Dumpling is exporting a large single table from TiDB, Out of Memory (OOM) m
+ Reduce the value of `--tidb-mem-quota-query` to `8589934592` (8 GB) or lower. `--tidb-mem-quota-query` controls the memory usage of a single query statement in TiDB.
+ Adjust the `--params "tidb_distsql_scan_concurrency=5"` parameter. [`tidb_distsql_scan_concurrency`](/system-variables.md#tidb_distsql_scan_concurrency) is a session variable which controls the concurrency of the scan operations in TiDB.

### TiDB GC settings when exporting a large volume of data
### TiDB GC settings when exporting a large volume of data (more than 1 TB)
Copy link
Collaborator

Choose a reason for hiding this comment

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

faq/manage-cluster-faq.md L430 is not aligned with docs-cn/9907.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done in 329cc36

Oreoxmt
Oreoxmt approved these changes Jun 22, 2022
View reviewed changes
Copy link
Collaborator

@Oreoxmt Oreoxmt left a comment

Choose a reason for hiding this comment

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

LGTM 🎉

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 22, 2022
shichun-0415
shichun-0415 approved these changes Jun 23, 2022
View reviewed changes
Copy link
Contributor

@shichun-0415 shichun-0415 left a comment

Choose a reason for hiding this comment

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

Rest LGTM. Great job!

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 23, 2022
@TomShawn
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0819f98

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 23, 2022
@ti-chi-bot ti-chi-bot merged commit b2f55be into pingcap:master Jun 23, 2022
ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Jun 23, 2022
@TomShawn @ti-chi-bot
This is an automated cherry-pick of pingcap#9206
6eed39f 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 23, 2022
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Jun 23, 2022
@TomShawn @ti-chi-bot
This is an automated cherry-pick of pingcap#9206
4f2841a 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 23, 2022
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

@TomShawn TomShawn deleted the ambiguou-words-all-en branch June 23, 2022 03:23
ti-chi-bot added a commit that referenced this pull request Jun 23, 2022
@ti-chi-bot
ambiguous-words: clarify ambiguous words (#9206) (#9297)
210b45f
ti-chi-bot added a commit that referenced this pull request Jun 23, 2022
@ti-chi-bot
ambiguous-words: clarify ambiguous words (#9206) (#9298)
04f8479
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Oreoxmt Oreoxmt Oreoxmt approved these changes

@shichun-0415 shichun-0415 shichun-0415 approved these changes

Assignees
No one assigned
Labels
ambiguous-words needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. 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. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TomShawn @ti-chi-bot @Oreoxmt @shichun-0415