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.

Sign up for GitHub

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

Jump to bottom

distsql: fix a bug of ranger.Range to kv.KeyRange conversion (#40204) #40549

Merged
merged 2 commits into from
Feb 16, 2023
Merged

distsql: fix a bug of ranger.Range to kv.KeyRange conversion (#40204) #40549

merged 2 commits into from
Feb 16, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #40204

What problem does this PR solve?

Issue Number: close #40158

Problem Summary:

What is changed and how it works?

The code has changed a lot since #7163 (which introduce the bug), the old bug is fixed in some other ways.
And we can now get rid of the current bug by just resetting these changes.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • 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

@ti-chi-bot ti-chi-bot mentioned this pull request Jan 13, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 13, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • hawkingrei

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/S Denotes a PR that changes 10-29 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 Jan 13, 2023
@wuhuizuo
Copy link
Contributor

/hold high priority for trunk branch

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2023
@ti-chi-bot
Copy link
Member Author

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 13, 2023
@tiancaiamao
Copy link
Contributor

/run-all-tests

@tiancaiamao
Copy link
Contributor

/run-unit-test
/run-check_dev_2

@tiancaiamao
Copy link
Contributor 

--- FAIL: TestCreateUniqueIndex (17.60s)
    common.go:310:
                Error Trace:    /home/genius/project/src/github.com/pingcap/tidb/tests/realtikvtest/addindextest/common.go:310
                                                        /home/genius/project/src/github.com/pingcap/tidb/tests/realtikvtest/addindexte
st/common.go:374
                                                        /home/genius/project/src/github.com/pingcap/tidb/tests/realtikvtest/addindexte
st/add_index_test.go:63
                Error:          Received unexpected error:
                                [admin:8003]table count 116 != index(idx19) count 0
                                github.com/pingcap/errors.AddStack
                                        /home/genius/go/pkg/mod/github.com/pingcap/errors@v0.11.5-0.20220729040631-518f63d66278/errors
.go:174
                                github.com/pingcap/errors.(*Error).GenWithStack
                                        /home/genius/go/pkg/mod/github.com/pingcap/errors@v0.11.5-0.20220729040631-518f63d66278/normal
ize.go:155
                                github.com/pingcap/tidb/util/admin.CheckIndicesCount
                                        /home/genius/project/src/github.com/pingcap/tidb/util/admin/admin.go:113
                                github.com/pingcap/tidb/executor.(*CheckTableExec).Next
                                        /home/genius/project/src/github.com/pingcap/tidb/executor/executor.go:964
                                github.com/pingcap/tidb/executor.Next
                                        /home/genius/project/src/github.com/pingcap/tidb/executor/executor.go:328
                                github.com/pingcap/tidb/executor.(*ExecStmt).next
                                        /home/genius/project/src/github.com/pingcap/tidb/executor/adapter.go:1142
                                github.com/pingcap/tidb/executor.(*ExecStmt).handleNoDelayExecutor
                                        /home/genius/project/src/github.com/pingcap/tidb/executor/adapter.go:915
                                github.com/pingcap/tidb/executor.(*ExecStmt).handleNoDelay
                                        /home/genius/project/src/github.com/pingcap/tidb/executor/adapter.go:763
                                github.com/pingcap/tidb/executor.(*ExecStmt).Exec
                                        /home/genius/project/src/github.com/pingcap/tidb/executor/adapter.go:558
                                github.com/pingcap/tidb/session.runStmt
                                        /home/genius/project/src/github.com/pingcap/tidb/session/session.go:2350
                                github.com/pingcap/tidb/session.(*session).ExecuteStmt
                                        /home/genius/project/src/github.com/pingcap/tidb/session/session.go:2214
                                github.com/pingcap/tidb/testkit.(*TestKit).ExecWithContext
                                        /home/genius/project/src/github.com/pingcap/tidb/testkit/testkit.go:318
                                github.com/pingcap/tidb/testkit.(*TestKit).Exec
                                        /home/genius/project/src/github.com/pingcap/tidb/testkit/testkit.go:291
                                github.com/pingcap/tidb/tests/realtikvtest/addindextest.checkResult
                                        /home/genius/project/src/github.com/pingcap/tidb/tests/realtikvtest/addindextest/common.go:304
                                github.com/pingcap/tidb/tests/realtikvtest/addindextest.testOneColFrame
                                        /home/genius/project/src/github.com/pingcap/tidb/tests/realtikvtest/addindextest/common.go:374
                                github.com/pingcap/tidb/tests/realtikvtest/addindextest.TestCreateUniqueIndex
                                        /home/genius/project/src/github.com/pingcap/tidb/tests/realtikvtest/addindextest/add_index_tes
t.go:63
                                testing.tRunner
                                        /home/genius/project/go/src/testing/testing.go:1576
                                runtime.goexit
                                        /home/genius/project/go/src/runtime/asm_amd64.s:1598
                Test:           TestCreateUniqueIndex
FAIL
exit status 1
FAIL    github.com/pingcap/tidb/tests/realtikvtest/addindextest 18.648s

The 6.5 branch is broken?

@tiancaiamao
Copy link
Contributor

/retest

bb7133
bb7133 approved these changes Feb 16, 2023
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added status/LGT1 Indicates that a PR has LGTM 1. status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 16, 2023
@bb7133
Copy link
Member

bb7133 commented Feb 16, 2023

/merge

1 similar comment
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: ec6d6f0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 16, 2023
@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: ec6d6f0

@ti-chi-bot ti-chi-bot merged commit 1f112f6 into pingcap:release-6.5 Feb 16, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 approved these changes

@hawkingrei hawkingrei hawkingrei approved these changes

Assignees

@tiancaiamao tiancaiamao

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @wuhuizuo @tiancaiamao @bb7133 @hawkingrei @VelocityLight