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

*: fix the duplicate entry error when using BR to restore a NONCLUSTERED AUTO_ID_CACHE=1 table (#46127) #46217

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #46127

What problem does this PR solve?

Issue Number: close #46093

Problem Summary:

What is changed and how it works?

For a NONCLUSTERED table with AUTO_ID_CACHE=1, like the case in #46093,
there are both auto_increment_id and _tidb_rowid.

The model.TableInfo only get one field AutoIncID, the information is not enough to recover the table correctly.
So a AutoIncIDExtra field is added for that case. We can record _tidb_rowid in AutoIncIDExtra and recover the _tidb_rowid from it.

Check List

Tests

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

Test the case follow the steps in #46093 manually.


I'm trying to add some test but find it difficult to do that in a unit test.
For example, I tried to add it in the tests/realtikvtest/brietest but found that it does not start the server layer so the auto id service does not run and I can't test the AUTO_ID_CACHE=1
I tried to add it in the server/tests where a server is started, but it use unistore and br recover table ... can not run with unistore.

 func TestIssue46093(t *testing.T) {
        ts := createTidbTestSuite(t)

        ts.RunTestsOnNewDB(t, nil, "br", func(dbt *testkit.DBTestKit) {
                dbt.MustExec("drop table if exists t")
                dbt.MustExec("create table t (a int primary key nonclustered auto_increment, b int) auto_id_cache = 1;")
                dbt.MustExec("insert into t (b) values (1), (2), (3);")
                rows := dbt.MustQuery("show table t next_row_id;")
                ts.CheckRows(t, rows, "br t _tidb_rowid 30001 _TIDB_ROWID",
                        "br t _tidb_rowid 4 AUTO_INCREMENT")
                dbt.MustExec("backup table t to 'local:///tmp/br';")
                dbt.MustExec("drop table t;")
                dbt.MustExec("restore table t from 'local:///tmp/br';")
                rows = dbt.MustQuery("show table t next_row_id;")
                ts.CheckRows(t, rows, "1 4001")
                dbt.MustExec("insert into t (b) values (4), (5), (6);")
                dbt.MustExec("insert into t (b) values (7), (8), (9);")
                rows = dbt.MustQuery("select * from t;")
                ts.CheckRows(t, rows, "1 1", "2 2", "3 3", "4004 7", "4005 8", "4006 9")
        })
}
  • No code

Side effects

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

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

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

None

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. labels Aug 18, 2023
@ti-chi-bot ti-chi-bot added affects-7.0 affects-7.1 affects-7.2 affects-7.3 ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Aug 18, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 18, 2023
@tiancaiamao
Copy link
Contributor

/retest-required

@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@5c14437). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #46217   +/-   ##
================================================
  Coverage               ?   73.6729%           
================================================
  Files                  ?       1084           
  Lines                  ?     347923           
  Branches               ?          0           
================================================
  Hits                   ?     256325           
  Misses                 ?      75143           
  Partials               ?      16455           

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Aug 18, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3pointer, kennytm

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 lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 18, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 18, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-18 05:17:02.409677373 +0000 UTC m=+867386.958693359: ☑️ agreed by kennytm.
  • 2023-08-18 05:17:31.581887241 +0000 UTC m=+867416.130903229: ☑️ agreed by 3pointer.

@ti-chi-bot ti-chi-bot bot merged commit 1720b8d into pingcap:release-6.5 Aug 18, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects-6.4 affects-6.5 affects-7.0 affects-7.1 affects-7.2 affects-7.3 approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants