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

*: hide the config global-kill and session var tidb_enable_index_merge_join (#23395) #23407

Merged
merged 5 commits into from
Mar 18, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 18, 2021

cherry-pick #23395 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/23407

After apply modifications, you can push your change to this PR via:

git push [email protected]:ti-srebot/tidb.git pr/23407:release-5.0-901891ae1f44

What problem does this PR solve?

Problem Summary:

What is changed and how it works?

What's Changed:

The features global-kill and index merge join are experimental features, thus we need to hide the config and session variables.

How it Works:

Related changes

Check List

Tests

  • Unit test

Side effects

N/A

Release note

  • N/A

@ti-srebot ti-srebot requested a review from a team as a code owner March 18, 2021 09:10
@ti-srebot ti-srebot requested review from wshwsh12 and removed request for a team March 18, 2021 09:10
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added component/config sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.0-cherry-pick labels Mar 18, 2021
@ti-srebot ti-srebot requested review from lzmhhh123 and qw4990 March 18, 2021 09:10
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Mar 18, 2021
@ti-srebot
Copy link
Contributor Author

@XuHuaiyu you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 18, 2021
@jackysp
Copy link
Member

jackysp commented Mar 18, 2021

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • jackysp
  • lzmhhh123

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 18, 2021
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 57e7df8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 18, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@XuHuaiyu
Copy link
Contributor

The unit-test failed because of the following case, it has nothing to do with this commit

1-03-18T11:45:45.598Z] FAIL: simple_test.go:606: testSuite3.TestDropPartitionStats
[2021-03-18T11:45:45.598Z] 
[2021-03-18T11:45:45.598Z] simple_test.go:631:
[2021-03-18T11:45:45.598Z]     tk.MustExec("analyze table t")
[2021-03-18T11:45:45.598Z] /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/util/testkit/testkit.go:217:
[2021-03-18T11:45:45.598Z]     tk.c.Assert(err, check.IsNil, check.Commentf("sql:%s, %v, error stack %v", sql, args, errors.ErrorStack(err)))
[2021-03-18T11:45:45.598Z] ... value *errors.withStack = [stats]: some partition level statistics are not in statistics version 2, please set tidb_analyze_version to 2 and analyze the this table ("[stats]: some partition level statistics are not in statistics version 2, please set tidb_analyze_version to 2 and analyze the this table")
[2021-03-18T11:45:45.598Z] ... sql:analyze table t, [], error stack [stats]: some partition level statistics are not in statistics version 2, please set tidb_analyze_version to 2 and analyze the this table

@XuHuaiyu XuHuaiyu merged commit bcf1e37 into pingcap:release-5.0 Mar 18, 2021
@XuHuaiyu XuHuaiyu deleted the release-5.0-901891ae1f44 branch March 18, 2021 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/config sig/execution SIG execution sig/sql-infra SIG: SQL Infra 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/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants