Skip to content

convert 2PC in TiDB sequence diagram from PNG to Mermaid code (#22560)#22561

Merged
ti-chi-bot[bot] merged 2 commits intopingcap:release-8.5from
ti-chi-bot:cherry-pick-22560-to-release-8.5
Mar 13, 2026
Merged

convert 2PC in TiDB sequence diagram from PNG to Mermaid code (#22560)#22561
ti-chi-bot[bot] merged 2 commits intopingcap:release-8.5from
ti-chi-bot:cherry-pick-22560-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #22560

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.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

@ti-chi-bot ti-chi-bot added lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Mar 13, 2026
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello, 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!

This pull request aims to enhance the documentation for TiDB's optimistic transactions by converting a critical sequence diagram from a static PNG image to a dynamic Mermaid code block. This change improves the diagram's maintainability, version control, and accessibility, making it easier for contributors to understand and update the visual representation of the two-phase commit process.

Highlights

  • Diagram Format Conversion: The existing PNG image for the 2PC sequence diagram in TiDB documentation has been replaced with a Mermaid code block. This improves maintainability and allows for easier updates to the diagram directly within the markdown.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • optimistic-transaction.md
    • Replaced the static PNG image of the 2PC sequence diagram with an embedded Mermaid code block.
Activity
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 by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

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 pull request 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 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. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

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
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 successfully converts the 2PC sequence diagram from a static PNG image to Mermaid code, which is a great improvement for maintainability and accessibility. I've suggested some refinements to the Mermaid diagram's text to improve clarity, correct minor typos, and align it more closely with the documentation style guide, making it easier for users to understand.

Comment on lines +20 to +69
```mermaid
---
title: 2PC in TiDB
---
sequenceDiagram
participant client
participant TiDB
participant PD
participant TiKV

client->>TiDB: begin
TiDB->>PD: get ts as start_ts

loop excute SQL
alt do read
TiDB->>PD: get region from PD or cache
TiDB->>TiKV: get data from TiKV or cache with start_ts
TiDB-->>client: return read result
end
alt do write
TiDB-->>TiDB: write in cache
TiDB-->>client: return write result
end
end

client->>TiDB: commit

opt start 2PC
TiDB-->>TiDB: for all keys need to write,choose first one as primary
TiDB->>PD: locate each key
TiDB-->>TiDB: group keys by region to [](region,keys)

opt prewrite with start_ts
TiDB->>TiKV: prewrite(primary_key,start_ts)
loop prewrite to each region in [](region,keys) parallelly
TiDB->>TiKV: prewrite(keys,primary_key,start_ts)
end
end

opt commit
TiDB-->>PD: get ts as commit_ts
TiDB-->>TiKV: commit primary with commit_ts
loop send commit to each region in [](region,keys) parallelly
TiDB->>TiKV: commit(keys,commit_ts)
end
end
end

TiDB-->>client: success
```
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

The Mermaid diagram is a great addition. To enhance clarity and align with the documentation style guide, I've made several improvements:

  • Corrected a typo from excute to execute.
  • Improved the descriptions to be more formal and descriptive (e.g., do read to Read operation).
  • Used consistent capitalization for actions.
  • Simplified complex descriptions to make the flow easier to follow (e.g., for all keys need to write,choose first one as primary to Select a primary key from all keys to be written).
  • Made the two phases of the commit process more explicit (Phase 1: Prewrite, Phase 2: Commit).
  • Corrected arrow types for requests to PD and TiKV to better reflect synchronous operations.

These changes make the diagram more professional and easier for new users to understand, as per the style guide's principle of clarity.

---
title: 2PC in TiDB
---
sequenceDiagram
    participant client
    participant TiDB
    participant PD
    participant TiKV

    client->>TiDB: BEGIN
    TiDB->>PD: Get timestamp as start_ts

    loop Execute SQL statements
        alt Read operation
            TiDB->>PD: Get region from PD (or cache)
            TiDB->>TiKV: Get data from TiKV (or cache) with start_ts
            TiDB-->>client: Return read result
        end
        alt Write operation
            TiDB-->>TiDB: Write to TiDB memory buffer
            TiDB-->>client: Return write result
        end
    end

    client->>TiDB: COMMIT

    opt 2PC (Two-Phase Commit)
        TiDB-->>TiDB: Select a primary key from all keys to be written
        TiDB->>PD: Locate region for each key
        TiDB-->>TiDB: Group keys by region

        opt Phase 1: Prewrite
            TiDB->>TiKV: Prewrite primary key with start_ts
            loop For each region
                TiDB->>TiKV: Prewrite secondary keys in parallel
            end
        end

        opt Phase 2: Commit
            TiDB->>PD: Get timestamp as commit_ts
            TiDB->>TiKV: Commit primary key with commit_ts
            loop For each region
                TiDB->>TiKV: Commit secondary keys in parallel
            end
        end
    end

    TiDB-->>client: Success
References
  1. The documentation should be clear, simple, and easy to understand for users. The suggested changes improve the clarity and readability of the sequence diagram. (link)
  2. The documentation should have a logical flow and clear sentence structure. The suggested changes improve the descriptions of the steps in the diagram. (link)
  3. If something might confuse a new user, suggest a reword. The original diagram's text was somewhat cryptic and could be confusing. The suggested changes make it more accessible. (link)

@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Mar 13, 2026

/approve

@ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Oreoxmt

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 Mar 13, 2026
@ti-chi-bot ti-chi-bot bot merged commit 540361b into pingcap:release-8.5 Mar 13, 2026
11 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-22560-to-release-8.5 branch March 13, 2026 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants