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

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

Merged
merged 6 commits into from
Mar 18, 2021
Merged

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

merged 6 commits into from
Mar 18, 2021

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Mar 18, 2021 •
edited by jackysp
Loading

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

@XuHuaiyu XuHuaiyu requested a review from a team as a code owner March 18, 2021 07:50
@XuHuaiyu XuHuaiyu requested review from qw4990 and removed request for a team March 18, 2021 07:50
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 18, 2021
@XuHuaiyu XuHuaiyu mentioned this pull request Mar 18, 2021
Merged
11 tasks
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 18, 2021
@github-actions github-actions bot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra labels 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 Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 48f2027

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

/merge

@XuHuaiyu
Copy link
Contributor Author

The failed test has nothing to do with this commit:

[2021-03-18T08:53:38.469Z] WARNING: DATA RACE
[2021-03-18T08:53:38.469Z] Read at 0x00c0b7aa6c20 by goroutine 654:
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/session.(*session).StoreQueryFeedback()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/session/session.go:372 +0x92e
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/executor.(*TableReaderExecutor).Close()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/table_reader.go:226 +0x121
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/executor.(*ParallelNestedLoopApplyExec).Close()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/parallel_apply.go:162 +0xa8
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/executor.(*baseExecutor).Close()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/executor.go:172 +0xad
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/executor.(*ProjectionExec).Close()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/projection.go:320 +0x255
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/executor.(*recordSet).Close()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/adapter.go:165 +0x59
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/session.(*execStmtResult).Close()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/session/session.go:1570 +0x7b
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/util/testkit.(*TestKit).QueryToErr()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/util/testkit/testkit.go:306 +0x56a
[2021-03-18T08:53:38.469Z]   github.com/pingcap/tidb/executor_test.(*testSuite).TestApplyGoroutinePanic()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/parallel_apply_test.go:587 +0x546
[2021-03-18T08:53:38.469Z]   runtime.call32()
[2021-03-18T08:53:38.469Z]       /usr/local/go/src/runtime/asm_amd64.s:539 +0x3a
[2021-03-18T08:53:38.469Z]   reflect.Value.Call()
[2021-03-18T08:53:38.469Z]       /usr/local/go/src/reflect/value.go:321 +0xd3
[2021-03-18T08:53:38.469Z]   github.com/pingcap/check.(*suiteRunner).forkTest.func1()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/github.com/pingcap/check@v0.0.0-20200212061837-5e12011dc712/check.go:850 +0x9aa
[2021-03-18T08:53:38.469Z]   github.com/pingcap/check.(*suiteRunner).forkCall.func1()
[2021-03-18T08:53:38.469Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/github.com/pingcap/check@v0.0.0-20200212061837-5e12011dc712/check.go:739 +0x113
[2021-03-18T08:53:38.470Z] 
[2021-03-18T08:53:38.470Z] Previous write at 0x00c0b7aa6c20 by goroutine 876:
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/statistics.(*QueryFeedback).Update()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/statistics/feedback.go:256 +0x8e4
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/distsql.(*selectResult).fetchResp()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/distsql/select_result.go:153 +0xaae
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/distsql.(*selectResult).Next()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/distsql/select_result.go:180 +0x2b3
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/executor.(*tableResultHandler).nextChunk()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/table_reader.go:329 +0xaa
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/executor.(*TableReaderExecutor).Next()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/table_reader.go:206 +0x21e
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/executor.Next()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/executor.go:277 +0x27d
[2021-03-18T08:53:38.470Z]   github.com/pingcap/tidb/executor.(*ParallelNestedLoopApplyExec).outerWorker()
[2021-03-18T08:53:38.470Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/executor/parallel_apply.go:202 +0x5a9

@XuHuaiyu XuHuaiyu merged commit 901891a into pingcap:master Mar 18, 2021
@XuHuaiyu XuHuaiyu deleted the hide_config branch March 18, 2021 09:09
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 18, 2021
@XuHuaiyu @ti-srebot
cherry pick pingcap#23395 to release-5.0
b148eb6 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 18, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #23407

XuHuaiyu pushed a commit that referenced this pull request Mar 18, 2021
@ti-srebot
*: hide the config global-kill and session var `tidb_enable_index_m…
bcf1e37 
…erge_join` (#23395) (#23407)
@ti-srebot ti-srebot mentioned this pull request Mar 19, 2021
Merged
11 tasks
SabaPing pushed a commit to SabaPing/tidb that referenced this pull request Mar 25, 2021
@XuHuaiyu @SabaPing
*: hide the config global-kill and session var `tidb_enable_index_m…
b39f6bb 
…erge_join` (pingcap#23395)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

@qw4990 qw4990 Awaiting requested review from qw4990

Assignees
No one assigned
Labels
component/config needs-cherry-pick-release-5.0 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@XuHuaiyu @jackysp @ti-chi-bot @ti-srebot @lzmhhh123