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

executor: fix a nil point when @@tidb_enable_collect_execution_info is off and cop cache is on #35839

Merged
merged 3 commits into from
Jun 30, 2022
Merged

executor: fix a nil point when @@tidb_enable_collect_execution_info is off and cop cache is on #35839

merged 3 commits into from
Jun 30, 2022

Conversation

tiancaiamao
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #35829

Problem Summary:

What is changed and how it works?

When @@tidb_enable_collect_execution_info is off, the resp.detail is nil
And when cop cache code use it in resp.detail.TimeDetail.ProcessTime, tidb get a nil point panic.

Check List

Tests

  • Unit test
  • Integration test
    Run the test case with real tikv
  • 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.

Fix a nil point panic when @@tidb_enable_collect_execution_info is off and cop cache feature is on. This combination is not the default setting, so most of the time a user would not meet it.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 30, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • xhebox

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 30, 2022
@tiancaiamao tiancaiamao marked this pull request as ready for review June 30, 2022 02:13
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 30, 2022
@tiancaiamao tiancaiamao mentioned this pull request Jun 30, 2022
Closed
24 tasks
@sre-bot
Copy link
Contributor

sre-bot commented Jun 30, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/07bd00b6ea8e116400c425920bdc59181778beaa

xhebox
xhebox approved these changes Jun 30, 2022
View reviewed changes
Copy link
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

LGTM

store/copr/coprocessor.go
TimeStamp: worker.req.StartTs,
RegionID: task.region.GetID(),
RegionDataVersion: resp.pbResp.CacheLastVersion,
if resp.detail != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we can move resp.detail != nil into L960?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 30, 2022
@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 Jun 30, 2022
@tiancaiamao
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1ba2a9f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 30, 2022
@tiancaiamao
Copy link
Contributor Author

/run-mysql-test

1 similar comment
@tiancaiamao
Copy link
Contributor Author

/run-mysql-test

@tiancaiamao
Copy link
Contributor Author

/run-build

@tiancaiamao
Copy link
Contributor Author

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit d26ee00 into pingcap:master Jun 30, 2022
@tiancaiamao tiancaiamao deleted the issue-35829 branch June 30, 2022 08:07
@sre-bot
Copy link
Contributor

sre-bot commented Jun 30, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 2, success 9, total 11 26 min Existing failure
idc-jenkins-ci-tidb/common-test ✅ all 12 tests passed 9 min 46 sec Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 35 tests passed 26 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 7 min 16 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 17 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 52 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 52 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 56 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

you06 added a commit to you06/tidb that referenced this pull request Jul 1, 2022
@you06
track request source
8534aa1 
Signed-off-by: you06 <[email protected]>

fix tests

Signed-off-by: you06 <[email protected]>

fix test

Signed-off-by: you06 <[email protected]>

update

Signed-off-by: you06 <[email protected]>

update bazel

Signed-off-by: you06 <[email protected]>

fix test

Signed-off-by: you06 <[email protected]>

fix test

Signed-off-by: you06 <[email protected]>

update

Signed-off-by: you06 <[email protected]>

update client-go

Signed-off-by: you06 <[email protected]>

update client-go

Signed-off-by: you06 <[email protected]>

update grafana

Signed-off-by: you06 <[email protected]>

update bazel

Signed-off-by: you06 <[email protected]>

display by stack

Signed-off-by: you06 <[email protected]>

set request source for ctx of

Signed-off-by: you06 <[email protected]>

address comment

Signed-off-by: you06 <[email protected]>

address comment

Signed-off-by: you06 <[email protected]>

parser, ddl: support decoding binary literal in set/enum (pingcap#35822)

close pingcap#31338

executor: fix a nil point when @@tidb_enable_collect_execution_info is off and cop cache is on (pingcap#35839)

close pingcap#35829

ddl: support drop columns for multi-schema change (pingcap#35737)

ref pingcap#14766

planner: don't push down predicates over table dual (pingcap#35669)

close pingcap#35527

*: Remove some useless staleness code (pingcap#35849)

close pingcap#35848

ddl: fix potential wrong column definition when setting default value (pingcap#35845)

close pingcap#35846

*: add timeout for test cases (pingcap#35844)

ddl: remove `onDropColumns` and `onAddColumns` (pingcap#35862)

ref pingcap#14766

*: Fix Dockerfile (pingcap#35835)

close pingcap#35828

server: refactor TestConnExecutionTimeout (pingcap#35865)

close pingcap#35868

fix test

Signed-off-by: you06 <[email protected]>

fix lint

Signed-off-by: you06 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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.

Unit test case 'executor TestIndexMergeRuntimeStats' fail on real TiKV
5 participants
@tiancaiamao @ti-chi-bot @sre-bot @xhebox @XuHuaiyu