lightning: add PK to internal tables #57912

lance6716 · 2024-12-03T06:08:52Z

What problem does this PR solve?

Issue Number: close #57479

Problem Summary:

What changed and how does it work?

manually cherry-pick #57480

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Signed-off-by: lance6716 <lance6716@gmail.com>

tiprow · 2024-12-03T06:09:08Z

Hi @lance6716. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

lance6716 · 2024-12-03T06:10:14Z

/test ?

ti-chi-bot · 2024-12-03T06:10:17Z

@lance6716: The following commands are available to trigger required jobs:

/test build

/test check-dev

/test check-dev2

/test mysql-test

/test unit-test

The following commands are available to trigger optional jobs:

/test pull-br-integration-test

/test pull-common-test

/test pull-e2e-test

/test pull-integration-binlog-test

/test pull-integration-common-test

/test pull-integration-copr-test

/test pull-integration-ddl-test

/test pull-integration-jdbc-test

/test pull-integration-mysql-test

/test pull-integration-tidb-tools-test

/test pull-sqllogic-test

/test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/release-6.5/ghpr_build

pingcap/tidb/release-6.5/ghpr_check

pingcap/tidb/release-6.5/ghpr_check2

pingcap/tidb/release-6.5/ghpr_mysql_test

pingcap/tidb/release-6.5/ghpr_unit_test

In response to this:

/test ?

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.

tiprow · 2024-12-03T06:10:35Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test ?

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.

tiprow · 2024-12-03T06:10:38Z

@ti-chi-bot[bot]: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

@lance6716: The following commands are available to trigger required jobs:
/test build
/test check-dev
/test check-dev2
/test mysql-test
/test unit-test
The following commands are available to trigger optional jobs:
/test pull-br-integration-test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-binlog-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-ddl-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-tidb-tools-test
/test pull-sqllogic-test
/test pull-tiflash-test
Use /test all to run the following jobs that were automatically triggered:
pingcap/tidb/release-6.5/ghpr_build
pingcap/tidb/release-6.5/ghpr_check
pingcap/tidb/release-6.5/ghpr_check2
pingcap/tidb/release-6.5/ghpr_mysql_test
pingcap/tidb/release-6.5/ghpr_unit_test
In response to this:

/test ?

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.

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.

lance6716 · 2024-12-03T06:10:59Z

/test pull-br-integration-test

tiprow · 2024-12-03T06:11:19Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-br-integration-test

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.

lance6716 · 2024-12-03T06:17:08Z

/retest

tiprow · 2024-12-03T06:17:28Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2024-12-03T06:42:45Z

/test pull-br-integration-test

tiprow · 2024-12-03T06:43:09Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-br-integration-test

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.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2024-12-03T06:49:55Z

/test pull-br-integration-test

tiprow · 2024-12-03T06:50:16Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-br-integration-test

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.

codecov · 2024-12-03T07:08:47Z

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Please upload report for BASE (release-6.5-20241112-v6.5.11@043986d). Learn more about missing BASE report.

Additional details and impacted files

@@                        Coverage Diff                        @@
##             release-6.5-20241112-v6.5.11     #57912   +/-   ##
=================================================================
  Coverage                                ?   73.6106%           
=================================================================
  Files                                   ?       1097           
  Lines                                   ?     352927           
  Branches                                ?          0           
=================================================================
  Hits                                    ?     259792           
  Misses                                  ?      76405           
  Partials                                ?      16730

lance6716 · 2024-12-03T08:26:58Z

/retest

tiprow · 2024-12-03T08:27:18Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

lance6716 · 2024-12-03T09:07:12Z

/retest

tiprow · 2024-12-03T09:07:32Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

lance6716 · 2024-12-03T10:09:55Z

/retest

tiprow · 2024-12-03T10:10:17Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

lance6716 · 2024-12-03T12:02:25Z

/retest

tiprow · 2024-12-03T12:02:46Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

lance6716 · 2024-12-03T13:24:01Z

/retest

tiprow · 2024-12-03T13:24:24Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2024-12-04T02:33:24Z

/test pull-br-integration-test

tiprow · 2024-12-04T02:33:45Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-br-integration-test

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.

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 · 2024-12-04T02:40:34Z

/test pull-br-integration-test

tiprow · 2024-12-04T02:40:54Z

@lance6716: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-br-integration-test

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.

lance6716 · 2024-12-04T03:33:19Z

br/pkg/backup/client.go

@@ -1001,6 +1001,9 @@ func (bc *Client) findRegionLeader(ctx context.Context, key []byte, isRawKv bool
 	// in order to find the correct region.
 	key = codec.EncodeBytesExt([]byte{}, key, isRawKv)
 	for i := 1; i < 100; i++ {
+		if err := ctx.Err(); err != nil {


to fix a BR unstable CI

Leavrth

LGTM for BR

lance6716 · 2024-12-04T03:34:45Z

br/pkg/lightning/errormanager/errormanager.go

 	// ConflictErrorTableName is the table name for duplicate detection.
-	ConflictErrorTableName = "conflict_error_v1"
+	ConflictErrorTableName = "conflict_error_v1_2"


Because the table structure diverse with master branch, it's not the same as conflict_error_v4. So I use conflict_error_v1_2 here

Benjamin2037

LGTM

ti-chi-bot · 2024-12-04T03:35:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, Leavrth

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:

~~OWNERS~~ [Leavrth]

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 · 2024-12-04T03:35:48Z

[LGTM Timeline notifier]

Timeline:

2024-12-04 03:33:43.251675361 +0000 UTC m=+1212210.871329876: ☑️ agreed by Leavrth.
2024-12-04 03:35:47.498557609 +0000 UTC m=+1212335.118212125: ☑️ agreed by Benjamin2037.

lightning: add PK to internal tables

5a1d046

Signed-off-by: lance6716 <lance6716@gmail.com>

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 3, 2024

remove invalid cache

d6e5289

Signed-off-by: lance6716 <lance6716@gmail.com>

fix UT

9577740

Signed-off-by: lance6716 <lance6716@gmail.com>

fix BR CI

525d84f

Signed-off-by: lance6716 <lance6716@gmail.com>

make fmt

f320356

Signed-off-by: lance6716 <lance6716@gmail.com>

lance6716 commented Dec 4, 2024

View reviewed changes

Leavrth approved these changes Dec 4, 2024

View reviewed changes

ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 4, 2024

lance6716 commented Dec 4, 2024

View reviewed changes

Benjamin2037 approved these changes Dec 4, 2024

View reviewed changes

ti-chi-bot bot added the lgtm label Dec 4, 2024

ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 4, 2024

ti-chi-bot bot merged commit 28585c8 into pingcap:release-6.5-20241112-v6.5.11 Dec 4, 2024
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lightning: add PK to internal tables #57912

lightning: add PK to internal tables #57912

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

ti-chi-bot bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

codecov bot commented Dec 3, 2024 •

edited

Loading

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 4, 2024

tiprow bot commented Dec 4, 2024

lance6716 commented Dec 4, 2024

tiprow bot commented Dec 4, 2024

lance6716 Dec 4, 2024

Leavrth left a comment

lance6716 Dec 4, 2024

Benjamin2037 left a comment

ti-chi-bot bot commented Dec 4, 2024

ti-chi-bot bot commented Dec 4, 2024

lightning: add PK to internal tables #57912

lightning: add PK to internal tables #57912

Conversation

lance6716 commented Dec 3, 2024

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

ti-chi-bot bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

codecov bot commented Dec 3, 2024 • edited Loading

Codecov Report

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

lance6716 commented Dec 4, 2024

tiprow bot commented Dec 4, 2024

lance6716 commented Dec 4, 2024

tiprow bot commented Dec 4, 2024

lance6716 Dec 4, 2024

Choose a reason for hiding this comment

Leavrth left a comment

Choose a reason for hiding this comment

lance6716 Dec 4, 2024

Choose a reason for hiding this comment

Benjamin2037 left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Dec 4, 2024

ti-chi-bot bot commented Dec 4, 2024

[LGTM Timeline notifier]

codecov bot commented Dec 3, 2024 •

edited

Loading