Skip to content

tests: use global tidb_enable_clustered_index variable#1525

Merged
ti-srebot merged 6 commits into
pingcap:masterfrom
amyangfei:non-clustered
Mar 19, 2021
Merged

tests: use global tidb_enable_clustered_index variable#1525
ti-srebot merged 6 commits into
pingcap:masterfrom
amyangfei:non-clustered

Conversation

@amyangfei
Copy link
Copy Markdown
Contributor

@amyangfei amyangfei commented Mar 18, 2021 •
edited
Loading

What problem does this PR solve?

Fix error in integration test

[2021-03-18T10:59:15.078Z] ERROR 1105 (HY000) at line 5: Variable 'tidb_enable_clustered_index' is a GLOBAL variable and should be set with SET GLOBAL

What is changed and how it works?

ref: pingcap/tidb#23270

  • alter-primary-key is deprecated, use nonclustered keyword instead, to keep backward compatibility (tidb 5.0.0-rc), we don't remove this configuration. Besides, the nonclustered keyword can't be used either, but since int primary key is using nonclustered by default, we can omit it.
  • tidb_enable_clustered_index is global variable only

Check List

Tests

  • Unit test
  • Integration test

Release note

  • No release note

@amyangfei amyangfei added the component/test Unit tests and integration tests component. label Mar 18, 2021
@amyangfei amyangfei added this to the v5.0.0 milestone Mar 18, 2021
@amyangfei
Copy link
Copy Markdown
Contributor Author

amyangfei commented Mar 18, 2021

/run-all-tests

@amyangfei
Copy link
Copy Markdown
Contributor Author

amyangfei commented Mar 18, 2021

/run-integration-tests

@amyangfei
Copy link
Copy Markdown
Contributor Author

amyangfei commented Mar 18, 2021

/run-all-tests

@amyangfei amyangfei added status/ptal Could you please take a look? release-blocker This issue blocks a release. Please solve it ASAP. labels Mar 18, 2021
@liuzix
Copy link
Copy Markdown
Contributor

liuzix commented Mar 19, 2021

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 19, 2021
@amyangfei
Copy link
Copy Markdown
Contributor Author

amyangfei commented Mar 19, 2021

/run-all-tests

@amyangfei amyangfei changed the title tests: remove alter-primary-key, use global tidb_enable_clustered_index tests: use global tidb_enable_clustered_index variable Mar 19, 2021
tangenta
tangenta reviewed Mar 19, 2021
View reviewed changes
Comment thread tests/clustered_index/data/test.sql Outdated
@amyangfei
Copy link
Copy Markdown
Contributor Author

amyangfei commented Mar 19, 2021

/run-all-tests

tangenta
tangenta reviewed Mar 19, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@tangenta tangenta 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-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Mar 19, 2021

@tangenta, Thanks for your review. The bot only counts LGTMs from Reviewers and higher roles, but you're still welcome to leave your comments. See the corresponding SIG page for more information. Related SIG: migrate(slack).

@zier-one
Copy link
Copy Markdown
Contributor

zier-one commented Mar 19, 2021

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Mar 19, 2021
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Mar 19, 2021
@amyangfei
Copy link
Copy Markdown
Contributor Author

amyangfei commented Mar 19, 2021

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 19, 2021
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Mar 19, 2021

/run-all-tests

@ti-srebot ti-srebot merged commit 3b8fb42 into pingcap:master Mar 19, 2021
@amyangfei amyangfei deleted the non-clustered branch March 19, 2021 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ti-srebot ti-srebot ti-srebot approved these changes

+1 more reviewer

@tangenta tangenta tangenta left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

component/test Unit tests and integration tests component. release-blocker This issue blocks a release. Please solve it ASAP. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/ptal Could you please take a look?

Projects

None yet

Milestone

v5.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@amyangfei @liuzix @ti-srebot @zier-one @tangenta