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

Try to fix proto #2803

Merged
merged 4 commits into from
Jan 6, 2025
Merged

Try to fix proto #2803

merged 4 commits into from
Jan 6, 2025

Conversation

shiyuhang0
Copy link
Member

@shiyuhang0 shiyuhang0 commented Jan 3, 2025

What problem does this PR solve?

image

What is changed and how it works?

  1. The tipb commit 4d69c6f95e683dfb5859277563bf896aca06ec34 used by TiSpark is not exist(I think it is a typo before). Thus, tispark will use the master of tipb
  2. Align protobuf package version and proto options with kvproto tipb#347 add some proto option which can not be recognized by the proto version used by tispark. This pr is included in the tipb master.

in conclusion, we can fix by

  1. upgrade the proto vesion used by tispark (need to check which dependency is responsible for parsing proto)
  2. use old commit of tipb

This PR use the second method and use commit 29e23c62eeace5912f696d1b184b63d5dc3edcce,because

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to update the tidb-ansible repository
  • Need to be included in the release note

@ti-chi-bot ti-chi-bot bot requested a review from zhangyangyu January 3, 2025 04:09
@shiyuhang0 shiyuhang0 changed the title try to fix Try to fix proto Jan 3, 2025
@ti-chi-bot ti-chi-bot bot added the size/XS label Jan 3, 2025
@shiyuhang0
Copy link
Member Author

/run-all-tests tidb=release-6.1 tikv=release-6.1 pd=release-6.1

@ti-chi-bot ti-chi-bot bot added size/S and removed size/XS labels Jan 3, 2025
@shiyuhang0
Copy link
Member Author

/run-all-tests tidb=release-6.1 tikv=release-6.1 pd=release-6.1

@shiyuhang0
Copy link
Member Author

/run-all-tests tidb=release-6.1 tikv=release-6.1 pd=release-6.1

1 similar comment
@shiyuhang0
Copy link
Member Author

/run-all-tests tidb=release-6.1 tikv=release-6.1 pd=release-6.1

@ti-chi-bot ti-chi-bot bot added the lgtm label Jan 6, 2025
Copy link

ti-chi-bot bot commented Jan 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xuanyu66, zhangyangyu

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

Copy link

ti-chi-bot bot commented Jan 6, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-01-03 06:25:49.789185 +0000 UTC m=+677285.145189532: ☑️ agreed by xuanyu66.
  • 2025-01-06 02:41:58.118774025 +0000 UTC m=+148661.407605729: ☑️ agreed by zhangyangyu.

@shiyuhang0 shiyuhang0 merged commit b00b75f into master Jan 6, 2025
14 checks passed
@shiyuhang0 shiyuhang0 deleted the fix_proto branch January 6, 2025 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants