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

update the description related to clustered indexes #5834

Merged
merged 4 commits into from
Mar 26, 2021
Merged

update the description related to clustered indexes #5834

merged 4 commits into from
Mar 26, 2021

Conversation

tangenta
Copy link
Contributor

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 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 ti-chi-bot added missing-translation-status This PR does not have translation status info. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 25, 2021
@qiancai
Copy link
Collaborator

qiancai commented Mar 25, 2021

/cc @coocood @lysu

@ti-chi-bot ti-chi-bot requested review from coocood and lysu March 25, 2021 05:48
@TomShawn
Copy link
Contributor

/label needs-cherry-pick-5.0
/status PTAL
/translation doing
/assign @CharLotteiu
/label v5.0

@ti-chi-bot ti-chi-bot added status/PTAL This PR is ready for reviewing. translation/doing This PR’s assignee is translating this PR. needs-cherry-pick-5.0 v5.0 This PR/issue applies to TiDB v5.0 and removed missing-translation-status This PR does not have translation status info. labels Mar 25, 2021
@lysu
Copy link
Contributor

lysu commented Mar 25, 2021

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lysu

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 25, 2021
@lysu lysu mentioned this pull request Mar 25, 2021
Merged
TomShawn
TomShawn reviewed Mar 25, 2021
View reviewed changes
clustered-indexes.md Outdated Show resolved Hide resolved
TomShawn
TomShawn reviewed Mar 25, 2021
View reviewed changes
system-variables.md Outdated Show resolved Hide resolved
@TomShawn
Copy link
Contributor

Rest /lgtm

tangenta and others added 2 commits March 26, 2021 10:58
@TomShawn
Copy link
Contributor

/label require-LGT1

@ti-chi-bot ti-chi-bot added the require-LGT1 Indicates that the PR requires an LGTM. label Mar 26, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 07a26b6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 26, 2021
TomShawn
TomShawn reviewed Mar 26, 2021
View reviewed changes
tidb-configuration-file.md
@@ -98,7 +98,7 @@ TiDB 配置文件比命令行参数支持更多的选项。你可以在 [config/

> **注意：**
>
> 该配置项不再生效。如果需要增删主键，请使用 `NONCLUSTERED` 代替。要了解关于 `CLUSTERED` 主键的详细信息，请参考[聚簇索引](/clustered-indexes.md)。
> 该配置项已被废弃，目前仅在 `@@tidb_enable_clustered_index` 取值为 `INT_ONLY` 时生效。如果需要增删主键，请在建表时使用 `NONCLUSTERED` 关键字代替。要了解关于 `CLUSTERED` 主键的详细信息，请参考[聚簇索引](/clustered-indexes.md)。
Copy link
Contributor

Choose a reason for hiding this comment

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

This line has been translated by @Joyinqin in pingcap/docs#5105.

@ti-chi-bot ti-chi-bot merged commit 9c7ddf0 into pingcap:master Mar 26, 2021
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Mar 26, 2021
@ti-srebot
cherry pick pingcap#5834 to release-5.0
1d1778d 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 26, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5858

ti-chi-bot pushed a commit that referenced this pull request Mar 26, 2021
@ti-srebot
update the description related to clustered indexes (#5834) (#5858)
80380b0
@Joyinqin Joyinqin mentioned this pull request Mar 26, 2021
Merged
11 tasks
CharLotteiu
CharLotteiu reviewed Mar 26, 2021
View reviewed changes
br/backup-and-restore-tool.md
@@ -76,7 +76,7 @@ BR 和 TiDB 集群的兼容性问题分为以下两方面：

| 功能 | 相关 issue | 解决方式 |
| ---- | ---- | ----- |
| 聚簇索引 | [#565](https://github.com/pingcap/br/issues/565) | 确保备份时 tidb_enable_clustered_index 变量和恢复时一致，否则会导致数据不一致的问题，例如 `default not found` 和数据索引不一致。 |
| 聚簇索引 | [#565](https://github.com/pingcap/br/issues/565) | 确保备份时 tidb_enable_clustered_index 全局变量和恢复时一致，否则会导致数据不一致的问题，例如 `default not found` 和数据索引不一致。 |
Copy link
Contributor

Choose a reason for hiding this comment

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

This line is assigned to @TomShawn to translate together with #5224.

@CharLotteiu CharLotteiu mentioned this pull request Mar 26, 2021
Merged
10 tasks
This was referenced Mar 26, 2021
Merged
Merged
@tangenta tangenta mentioned this pull request Mar 29, 2021
Merged
11 tasks
This was referenced Mar 29, 2021
Merged
Merged
@TomShawn
Copy link
Contributor

TomShawn commented Apr 6, 2021

/remove-translation doing
/translation done

@ti-chi-bot ti-chi-bot added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CharLotteiu CharLotteiu CharLotteiu left review comments

@TomShawn TomShawn TomShawn left review comments

@coocood coocood Awaiting requested review from coocood

@lysu lysu Awaiting requested review from lysu

Assignees

@CharLotteiu CharLotteiu

Labels
require-LGT1 Indicates that the PR requires an LGTM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v5.0 This PR/issue applies to TiDB v5.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tangenta @qiancai @TomShawn @lysu @ti-chi-bot @ti-srebot @CharLotteiu