Skip to content

change expressions related to statement summary tables to ensure co… (#6928)#6993

Merged
ti-chi-bot merged 4 commits into
pingcap:release-4.0from
ti-chi-bot:cherry-pick-6928-to-release-4.0
Aug 30, 2021
Merged

change expressions related to statement summary tables to ensure co… (#6928)#6993
ti-chi-bot merged 4 commits into
pingcap:release-4.0from
ti-chi-bot:cherry-pick-6928-to-release-4.0

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

@ti-chi-bot ti-chi-bot commented Aug 26, 2021 •
edited by Liuxiaozhen12
Loading

This is an automated cherry-pick of #6928

…nsistency

First-time contributors' checklist

What is changed, added or deleted? (Required)

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)
  • v5.1 (TiDB 5.1 versions)
  • 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)?

  • 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
Copy Markdown
Member Author

ti-chi-bot commented Aug 26, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

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.

Details

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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. type/enhancement The issue or PR belongs to an enhancement. labels Aug 26, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 26, 2021
Merged
13 tasks
@ti-chi-bot ti-chi-bot requested a review from TomShawn August 26, 2021 10:56
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 26, 2021
@Liuxiaozhen12 @ti-chi-bot
This is an automated cherry-pick of pingcap#6928
6f9ff21 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-6928-to-release-4.0 branch from 231915d to 6f9ff21 Compare August 26, 2021 12:20
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 27, 2021
TomShawn
TomShawn reviewed Aug 30, 2021
View reviewed changes
Comment thread tidb-configuration-file.md Outdated
+ `events_statement_summary_by_digest` 表中保存的 SQL 种类的最大数量。
+ 默认值：100
+ 系统表 [statement summary tables](/statement-summary-tables.md) 中保存的 SQL 种类的最大数量。
+ 默认值：3000
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Aug 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

@crazycs520 @djshow832 Please help confirm from which v4.0 version this new default value takes effect. Thanks! This is important in user document.

Copy link
Copy Markdown
Contributor

@Liuxiaozhen12 Liuxiaozhen12 Aug 30, 2021

Choose a reason for hiding this comment

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

Comment addressed and fixed. PTAL~

Liuxiaozhen12
Liuxiaozhen12 reviewed Aug 30, 2021
View reviewed changes
Comment thread tidb-configuration-file.md Outdated
@Liuxiaozhen12 Liuxiaozhen12 requested a review from TomShawn August 30, 2021 03:44
djshow832
djshow832 reviewed Aug 30, 2021
View reviewed changes
Comment thread tidb-configuration-file.md
+ `events_statement_summary_by_digest` 表中保存的 SQL 种类的最大数量。
+ 默认值：100
+ 系统表 [statement summary tables](/statement-summary-tables.md) 中保存的 SQL 种类的最大数量。
+ 默认值：v4.0.14 前为 200，自 v4.0.14 起为 3000
Copy link
Copy Markdown
Contributor

@djshow832 djshow832 Aug 30, 2021

Choose a reason for hiding this comment

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

You need to update the version for 5.0 and 5.1 docs separately.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 30, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Aug 30, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member Author

ti-chi-bot commented Aug 30, 2021

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

DetailsCommit hash: e9540ae

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 30, 2021
@ti-chi-bot ti-chi-bot merged commit d957d63 into pingcap:release-4.0 Aug 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@djshow832 djshow832 djshow832 left review comments

+2 more reviewers

@Liuxiaozhen12 Liuxiaozhen12 Liuxiaozhen12 left review comments

@TomShawn TomShawn TomShawn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Liuxiaozhen12 Liuxiaozhen12

Labels

size/S Denotes a PR that changes 10-29 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. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source 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

@ti-chi-bot @TomShawn @djshow832 @Liuxiaozhen12