Skip to content

delete description about special non-reserved keywords that might still require special treatment (#21116)#21136

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:release-7.5from
ti-chi-bot:cherry-pick-21116-to-release-7.5
Jun 6, 2025
Merged

delete description about special non-reserved keywords that might still require special treatment (#21116)#21136
ti-chi-bot[bot] merged 2 commits intopingcap:release-7.5from
ti-chi-bot:cherry-pick-21116-to-release-7.5

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #21116

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.

  • master (the latest development version)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.4 (TiDB 8.4 versions)
  • v8.3 (TiDB 8.3 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Jun 6, 2025
@ti-chi-bot
Copy link
Copy Markdown
Member Author

@hfxsd This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Hello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

Summary of Changes

Hello! Gemini here, providing a summary of this pull request. This PR, automatically cherry-picked from #21116, focuses on updating the documentation for keywords in TiDB. The primary intent is to remove descriptions and references to a specific category of non-reserved keywords that were previously noted as potentially requiring special treatment or escaping. This change aims to simplify the explanation of keyword classification in the documentation.

Highlights

  • Documentation Update: Removes text from the keywords.md file that described 'special non-reserved keywords that might still require special treatment'.
  • Keyword Classification Clarity: Updates the description of the keyword list to remove the mention of the (S) marker used for these 'special non-reserved keywords'.

Changelog

  • keywords.md
    • Removed the sentence explaining that there are special non-reserved keywords that might still require special treatment and the recommendation to treat them as reserved (lines 10-11 in the original text).
    • Removed the sentence mentioning the (S) marker for special non-reserved keywords in the description of the keyword list (line 62 in the original text).
    • Added links to the documentation pages for SELECT, UPDATE, and DELETE statements in the introductory paragraph (line 13 in the new text).
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request, an automated cherry-pick, aims to remove the description of special non-reserved keywords that might require special treatment, which simplifies the documentation around TiDB keywords. The change to remove the (S) marker and its description is correctly applied.

However, there's a critical issue in keywords.md where git conflict markers (<<<<<<< HEAD, =======, >>>>>>>) have been included in the file. These markers need to be resolved before this PR can be merged.

Summary of Findings

  • Git Conflict Markers: The file keywords.md contains unresolved git conflict markers (<<<<<<< HEAD, =======, >>>>>>>) which will break the document rendering. These must be resolved.

Merge Readiness

This pull request is not ready to be merged due to the presence of critical git conflict markers in keywords.md. These markers must be resolved first. Once the conflict markers are addressed, the change itself (removing the outdated keyword description and adding links) will be a good improvement. As a reviewer, I am not authorized to approve pull requests, but I recommend addressing this critical issue before seeking merge approval.

Comment thread keywords.md Outdated
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot bot commented Jun 6, 2025

@gemini-code-assist[bot]: adding LGTM is restricted to approvers and reviewers in OWNERS files.

Details

In response to this:

Code Review

This pull request, an automated cherry-pick, aims to remove the description of special non-reserved keywords that might require special treatment, which simplifies the documentation around TiDB keywords. The change to remove the (S) marker and its description is correctly applied.

However, there's a critical issue in keywords.md where git conflict markers (<<<<<<< HEAD, =======, >>>>>>>) have been included in the file. These markers need to be resolved before this PR can be merged.

Summary of Findings

  • Git Conflict Markers: The file keywords.md contains unresolved git conflict markers (<<<<<<< HEAD, =======, >>>>>>>) which will break the document rendering. These must be resolved.

Merge Readiness

This pull request is not ready to be merged due to the presence of critical git conflict markers in keywords.md. These markers must be resolved first. Once the conflict markers are addressed, the change itself (removing the outdated keyword description and adding links) will be a good improvement. As a reviewer, I am not authorized to approve pull requests, but I recommend addressing this critical issue before seeking merge approval.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Comment thread keywords.md Outdated
@hfxsd hfxsd removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 6, 2025
@hfxsd
Copy link
Copy Markdown
Collaborator

hfxsd commented Jun 6, 2025

/approve

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot bot commented Jun 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hfxsd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Jun 6, 2025
@ti-chi-bot ti-chi-bot bot merged commit 8bef114 into pingcap:release-7.5 Jun 6, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants