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.

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

TSO: fix pre-v7.4 #15607

Merged
merged 2 commits into from
Dec 7, 2023
Merged

TSO: fix pre-v7.4 #15607

merged 2 commits into from
Dec 7, 2023

Conversation

dveeden
Copy link
Contributor

@dveeden dveeden commented Dec 6, 2023

First-time contributors' checklist

What is changed, added or deleted? (Required)

As indicated on https://docs.pingcap.com/tidb/stable/release-7.4.0#behavior-changes the TIDB_PARSE_TSO_LOGICAL() was added in v7.4.0. This means documents for earlier versions shouldn't reference it.

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)
  • v7.6 (TiDB 7.6 versions)
  • v7.5 (TiDB 7.5 versions)
  • [] v7.4 (TiDB 7.4 versions)
  • v7.3 (TiDB 7.3 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)
  • 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)?

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

@dveeden dveeden requested review from ran-huang and qiancai December 6, 2023 06:41
@ti-chi-bot ti-chi-bot bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 6, 2023
tso.md Outdated Show resolved Hide resolved
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.

Rest LGTM

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 6, 2023
@qiancai qiancai added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. translation/doing This PR's assignee is translating this PR. labels Dec 6, 2023
@ti-chi-bot ti-chi-bot bot removed the missing-translation-status This PR does not have translation status info. label Dec 6, 2023
Co-authored-by: Grace Cai <qqzczy@126.com>
@qiancai qiancai mentioned this pull request Dec 6, 2023
17 tasks
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 6, 2023
Copy link

ti-chi-bot bot commented Dec 6, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-06 06:48:17.557240521 +0000 UTC m=+1596526.222466717: ☑️ agreed by qiancai.
  • 2023-12-06 07:02:53.873384891 +0000 UTC m=+1597402.538611081: ☑️ agreed by hfxsd.

@qiancai qiancai requested review from mjonss and removed request for ran-huang December 6, 2023 07:03
Copy link
Contributor

@mjonss mjonss left a comment

Choose a reason for hiding this comment

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

We can replace the TIDB_PARSE_TSO_LOGICAL with <tso> & 0x3FFFF which should give the same result.

Are there any documentation of the format of the TSO timestamp we can link to as well, like https://docs.pingcap.com/tidbcloud/tso ?

The suggested change is OK, but I think keeping the information about the logical part would be nice.

tso.md Show resolved Hide resolved
Copy link

ti-chi-bot bot commented Dec 6, 2023

@mjonss: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

We can replace the TIDB_PARSE_TSO_LOGICAL with <tso> & 0x3FFFF which should give the same result.

Are there any documentation of the format of the TSO timestamp we can link to as well, like https://docs.pingcap.com/tidbcloud/tso ?

The suggested change is OK, but I think keeping the information about the logical part would be nice.

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/test-infra repository.

@qiancai
Copy link
Collaborator

qiancai commented Dec 7, 2023

/approve

Copy link

ti-chi-bot bot commented Dec 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiancai

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

The pull request process is described here

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 Dec 7, 2023
@ti-chi-bot ti-chi-bot bot merged commit c6d3ff9 into pingcap:release-7.1 Dec 7, 2023
6 checks passed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Dec 7, 2023
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Dec 7, 2023
@qiancai qiancai 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 Dec 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants