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

sql-statement: improve consistency, fix small errors #4263

Merged
merged 14 commits into from
Sep 27, 2020
Merged

sql-statement: improve consistency, fix small errors #4263

merged 14 commits into from
Sep 27, 2020

Conversation

ran-huang
Copy link
Contributor

@ran-huang ran-huang commented Aug 13, 2020 •
edited
Loading

Signed-off-by: Ran huangran@pingcap.com

What is changed, added or deleted? (Required)

  • Improve consistency of the section ## MySQL compatibility.
  • Fix small errors

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

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Have version specific changes
  • Might cause conflicts

@ran-huang
update 65 files
bc79866 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang
update 5 files
9a85fc0 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang
update system-variables.md
a8b7a2f 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang ran-huang force-pushed the update-sql-statement branch from 239f2f9 to a8b7a2f Compare September 1, 2020 10:53
@ran-huang ran-huang marked this pull request as ready for review September 1, 2020 13:04
@ran-huang ran-huang added translation/from-docs This PR is translated from a PR in pingcap/docs. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. needs-cherry-pick-4.0 labels Sep 1, 2020
zz-jason
zz-jason reviewed Sep 2, 2020
View reviewed changes
constraints.md Outdated
@@ -59,7 +59,7 @@ Query OK, 1 row affected (0.03 sec)

## 唯一约束

在 TiDB 的乐观事务中，默认会对唯一约束进行[惰性检查](/transaction-overview.md#惰性检查)。通过在事务提交时再进行批量检查，TiDB 能够减少网络开销、提升性能。例如：
根据不同的事务模式和 `tidb_constraint_check_in_place` 的值，TiDB 可能对唯一约束进行[惰性检查](/transaction-overview.md#惰性检查)。批量检查能够减少网络开销、提升性能。例如：
Copy link
Member

Choose a reason for hiding this comment

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

默认 描述了默认行为，换成 可能 后，缺少了一层意思

Copy link
Member

Choose a reason for hiding this comment

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

@zz-jason @ran-huang 感觉这里可以就保持原来的中文？意思还比较清楚🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes reverted. PTAL~

Copy link
Member

Choose a reason for hiding this comment

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

LGTM

@lilin90 lilin90 added the status/require-change Needs the author to address comments. label Sep 3, 2020
lilin90
lilin90 reviewed Sep 4, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

It seems that changes in sql-statements/sql-statement-use.md are missed. Please check. Thanks!

sql-statements/sql-statement-begin.md Outdated Show resolved Hide resolved
sql-statements/sql-statement-commit.md Outdated Show resolved Hide resolved
sql-statements/sql-statement-create-sequence.md Outdated Show resolved Hide resolved
sql-statements/sql-statement-drop-sequence.md Outdated Show resolved Hide resolved
sql-statements/sql-statement-show-create-sequence.md Outdated Show resolved Hide resolved
system-variables.md Show resolved Hide resolved
system-variables.md Show resolved Hide resolved
@lilin90 lilin90 added the status/PTAL This PR is ready for reviewing. label Sep 4, 2020
ran-huang and others added 3 commits September 4, 2020 13:12
@ran-huang
update sql-statement-use
e60a29f 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang @lilin90
Apply suggestions from code review
059d450 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@lilin90
Merge branch 'master' into update-sql-statement
939e729
@ti-srebot
Copy link
Contributor

@zz-jason, @lilin90, PTAL.

@ti-srebot
Copy link
Contributor

@ran-huang, please update your pull request.

@ran-huang
Merge branch 'master' into update-sql-statement
94b22a8
@ran-huang
resolve conflicts
1069c5c 
Signed-off-by: Ran <huangran@pingcap.com>
@ran-huang
revert changes in constraints.md
1900fe5 
Signed-off-by: Ran <huangran@pingcap.com>
@ti-srebot
Copy link
Contributor

@ran-huang, please update your pull request.

@ti-srebot
Copy link
Contributor

@zz-jason, @lilin90, PTAL.

@ti-srebot
Copy link
Contributor

@ran-huang, please update your pull request.

@ti-srebot
Copy link
Contributor

@zz-jason, @lilin90, PTAL.

@ti-srebot
Copy link
Contributor

@ran-huang, please update your pull request.

@ti-srebot
Copy link
Contributor

No updates for a long time, close PR.

@ti-srebot
Copy link
Contributor

@zz-jason, @lilin90, PTAL.

@lilin90 lilin90 removed the status/require-change Needs the author to address comments. label Sep 27, 2020
@lilin90
Copy link
Member

lilin90 commented Sep 27, 2020 •
edited
Loading

I resolved two conflicts in 20f722a.

lilin90
lilin90 approved these changes Sep 27, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 27, 2020
@lilin90 lilin90 merged commit ff9a827 into pingcap:master Sep 27, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Sep 27, 2020
@ran-huang @ti-srebot
cherry pick pingcap#4263 to release-4.0
22ec824 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 27, 2020
Merged
9 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #4611

@ran-huang ran-huang deleted the update-sql-statement branch September 27, 2020 10:07
ran-huang added a commit that referenced this pull request Sep 27, 2020
@ti-srebot @ran-huang
cherry pick #4263 to release-4.0 (#4611)
43a9c5d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Ran <huangran@pingcap.com>
@ran-huang ran-huang mentioned this pull request Sep 28, 2020
Merged
9 tasks
This was referenced Sep 30, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lilin90 lilin90 lilin90 approved these changes

@zz-jason zz-jason zz-jason left review comments

Assignees
No one assigned
Labels
requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. translation/from-docs This PR is translated from a PR in pingcap/docs.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ran-huang @ti-srebot @lilin90 @zz-jason