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

*: merge experimental-feature.md to basic-features.md #12687

Merged
merged 5 commits into from
Jan 19, 2023
Merged

*: merge experimental-feature.md to basic-features.md #12687

merged 5 commits into from
Jan 19, 2023

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Jan 17, 2023 •
edited
Loading

What is changed, added or deleted? (Required)

Merge experimental-features.md to basic-features.md because they have much in common and need extra efforts for update. Some features in experimental-features.md are missing in basic-features.md, and these features are added to basic-features.md.

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.6 (TiDB 6.6 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.4 (TiDB 6.4 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)?

  • 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

ti-chi-bot commented Jan 17, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qiancai

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.

@TomShawn TomShawn self-assigned this Jan 17, 2023
@ti-chi-bot ti-chi-bot requested a review from qiancai January 17, 2023 08:52
@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 Jan 17, 2023
@TomShawn TomShawn added type/enhancement The issue or PR belongs to an enhancement. translation/doing This PR’s assignee is translating this PR. area/general Relates to TiDB overview, architecture, and other general descriptions. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. and removed missing-translation-status This PR does not have translation status info. labels Jan 17, 2023
@TomShawn TomShawn removed the request for review from qiancai January 17, 2023 08:53
TomShawn
TomShawn commented Jan 18, 2023
View reviewed changes
basic-features.md Outdated Show resolved Hide resolved
TomShawn
TomShawn commented Jan 18, 2023
View reviewed changes
basic-features.md Outdated Show resolved Hide resolved
TomShawn
TomShawn commented Jan 18, 2023
View reviewed changes
basic-features.md Outdated Show resolved Hide resolved
TomShawn
TomShawn commented Jan 18, 2023
View reviewed changes
basic-features.md
@@ -193,9 +205,12 @@ aliases: ['/docs-cn/dev/basic-features/']
| [`SET CONFIG`](/dynamic-config.md) | Y | Y | Y | Y | Y | 实验特性 | 实验特性 | 实验特性 | 实验特性 | 实验特性 | 实验特性 | 实验特性 | 实验特性 |
| [DM WebUI](/dm/dm-webui-guide.md) | 实验特 | 实验特 | 实验特性 | 实验特性 | 实验特性 | 实验特性 | N | N | N | N | N | N |
| [前台限流](/tikv-configuration-file.md#前台限流) | Y | Y | Y | Y | 实验特性 | 实验特性 | N | N | N | N | N | N |
| [后台限流](/tikv-configuration-file.md#后台限流) | 实验特性 | 实验特性 | 实验特性 | 实验特性 | N | N | N | N | N | N | N | N |
Copy link
Contributor Author

Choose a reason for hiding this comment

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

如果有「存储」，放存储下更好

TomShawn
TomShawn commented Jan 18, 2023
View reviewed changes
basic-features.md Outdated Show resolved Hide resolved
@easonn7
Copy link
Contributor

easonn7 commented Jan 18, 2023

LGTM

@TomShawn TomShawn requested a review from qiancai January 18, 2023 10:29
qiancai
qiancai reviewed Jan 18, 2023
View reviewed changes
basic-features.md Outdated
@@ -1,7 +1,7 @@
---
title: TiDB 基本功能
summary: 了解 TiDB 的基本功能。
aliases: ['/docs-cn/dev/basic-features/']
aliases: ['/docs-cn/dev/basic-features/','/docs-cn/dev/experimental-features-4.0/','/zh/tidb/dev/experimental-features-4.0/','/zh/tidb/dev/experimental-features']
---

# TiDB 基本功能
Copy link
Collaborator

@qiancai qiancai Jan 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

因为实验特性文档移除了，所以可以考虑在这篇文档里说明下实验特性的特殊之处，比如在正文第一句话后，加一个说明。 例如：

警告：

针对本文中列出的实验特性，请注意使用场景限制。实验特性会在未事先通知的情况下发生变化或删除。语法和实现可能会在 GA 前发生变化。如果遇到问题，请在 GitHub 上提交 issue 反馈。

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 18, 2023
qiancai
qiancai approved these changes Jan 18, 2023
View reviewed changes
Copy link
Collaborator

@qiancai qiancai 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 Jan 18, 2023
@TomShawn
Copy link
Contributor Author

/remove-status LGT1
/status LGT2

@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 Jan 19, 2023
@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: 750e0c4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 19, 2023
@ti-chi-bot ti-chi-bot merged commit 1167f56 into pingcap:master Jan 19, 2023
@TomShawn TomShawn deleted the merge-experimental-basic-features branch January 19, 2023 02:41
@ti-chi-bot ti-chi-bot mentioned this pull request Jan 19, 2023
Merged
14 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #12761.

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jan 19, 2023
@TomShawn @ti-chi-bot
This is an automated cherry-pick of pingcap#12687
80547c7 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Jan 19, 2023
@ti-chi-bot
*: merge experimental-feature.md to basic-features.md (#12687) (#12761)
42dbece
@TomShawn TomShawn mentioned this pull request Jan 19, 2023
Merged
14 tasks
@TomShawn TomShawn 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 Jan 19, 2023
@TomShawn TomShawn mentioned this pull request Jan 19, 2023
Merged
14 tasks
This was referenced Jan 19, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiancai qiancai qiancai approved these changes

Assignees

@TomShawn TomShawn

Labels
area/general Relates to TiDB overview, architecture, and other general descriptions. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 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/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. 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 @easonn7 @qiancai