Skip to content

Conversation

@winoros
Copy link
Member

@winoros winoros commented Jun 27, 2020

What is changed, added or deleted? (Required)

Translating pingcap/docs-cn#3253

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

  • master (the latest development version)
  • 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)?

@winoros winoros added needs-cherry-pick-4.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Jun 27, 2020
@winoros winoros force-pushed the blacklist branch 2 times, most recently from 67bae38 to bc5664b Compare June 27, 2020 19:51
@yikeke yikeke requested review from lzmhhh123 and yikeke June 28, 2020 02:07
@yikeke yikeke added the status/PTAL This PR is ready for reviewing. label Jun 28, 2020
@yikeke
Copy link
Contributor

yikeke commented Jun 28, 2020

The docs-cn PR pingcap/docs-cn#3253 was also cherry-picked to the 3.0 and 3.1 branches. And we
need to align this behavior for this PR? @winoros

@winoros
Copy link
Member Author

winoros commented Jun 28, 2020

@yikeke ok, i updated the status.

@wwar
Copy link

wwar commented Jun 28, 2020

May I suggest renaming from blacklist to block or deny list? See: rails/rails#33677 and https://go-review.googlesource.com/c/go/+/236857/

I realize it might be hard to rename the table mysql.opt_rule_blacklist without causing incompatibility, but the documentation could be a little bit more sensitive.

@ilovesoup
Copy link
Contributor

May I suggest renaming from blacklist to block or deny list? See: rails/rails#33677 and https://go-review.googlesource.com/c/go/+/236857/

I realize it might be hard to rename the table mysql.opt_rule_blacklist without causing incompatibility, but the documentation could be a little bit more sensitive.

I agree that we can change document description to blocklist but leave keyword aside for compatibility.

Co-authored-by: Feng Liyuan <darktemplar.f@gmail.com>
Co-authored-by: Feng Liyuan <darktemplar.f@gmail.com>
@yikeke yikeke requested review from lilin90 and removed request for yikeke June 30, 2020 03:26
@ti-srebot
Copy link
Contributor

@SunRunAway, @lzmhhh123, @lilin90, PTAL.

@lilin90 lilin90 added the size/large Changes of a large size. label Jul 2, 2020
@ti-srebot
Copy link
Contributor

@SunRunAway, @lzmhhh123, @lilin90, PTAL.

1 similar comment
@ti-srebot
Copy link
Contributor

@SunRunAway, @lzmhhh123, @lilin90, PTAL.

@SE-Bin SE-Bin mentioned this pull request Jul 8, 2020
5 tasks
@yikeke yikeke changed the title SQL Tuning: add the page blacklist-control-plan.md SQL Tuning: add the page blocklist-control-plan.md Jul 13, 2020
@ti-srebot
Copy link
Contributor

@lzmhhh123,Thanks for your review. However, LGTM is restricted to Reviewers or higher roles.See the corresponding SIG page for more information. Related SIGs: docs(slack).

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 15, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 15, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2020
@yikeke
Copy link
Contributor

yikeke commented Jul 15, 2020

LGTM

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit e1688b1 into pingcap:master Jul 15, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #3276

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #3277

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3278

lilin90 pushed a commit that referenced this pull request Jul 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Yiding Cui <winoros@gmail.com>
lilin90 added a commit that referenced this pull request Jul 16, 2020
* cherry pick #3043 to release-3.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Resolve a TOC conflict and add the new file

Co-authored-by: Yiding Cui <winoros@gmail.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
lilin90 added a commit that referenced this pull request Jul 16, 2020
* cherry pick #3043 to release-3.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Resolve a TOC conflict and add the new file

Co-authored-by: Yiding Cui <winoros@gmail.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/large Changes of a large size. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/PTAL This PR is ready for reviewing. status/require-change Needs the author to address comments. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants