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

util: fix data race in ListInDisk #35199

Merged
merged 4 commits into from
Jun 8, 2022
Merged

util: fix data race in ListInDisk #35199

merged 4 commits into from
Jun 8, 2022

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented Jun 7, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #35191

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
test the case TestJoinExec with --race

and
Run make race in local and passed.

  • 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
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 7, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 7, 2022 •
edited
Loading

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

@wshwsh12 wshwsh12 requested review from XuHuaiyu and guo-shaoge June 7, 2022 04:39
XuHuaiyu
XuHuaiyu reviewed Jun 7, 2022
View reviewed changes
executor/hash_table.go Outdated
@@ -86,6 +86,9 @@ type hashRowContainer struct {

rowContainer *chunk.RowContainer
memTracker *memory.Tracker

// chkBuf buffer the data if rowContainer is spilled.
Copy link
Contributor

Choose a reason for hiding this comment

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

... buffer the data reads from the disk ...

@wshwsh12 wshwsh12 requested a review from XuHuaiyu June 7, 2022 08:02
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 7, 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 7, 2022
@hawkingrei
Copy link
Member

/run-all-tests

@wshwsh12
Copy link
Contributor Author

wshwsh12 commented Jun 8, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: a8c94b0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 8, 2022
@ti-chi-bot ti-chi-bot merged commit 5eab362 into pingcap:master Jun 8, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 8, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🟥 failed 1, success 11, total 12 7 min 3 sec New failing
idc-jenkins-ci/integration-cdc-test 🟢 all 35 tests passed 33 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 12 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 54 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 23 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 12 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 2 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 4 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 2 min 52 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@guo-shaoge guo-shaoge Awaiting requested review from guo-shaoge

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. 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.

DATA RACE in the chunk.Column
5 participants
@wshwsh12 @ti-chi-bot @sre-bot @hawkingrei @XuHuaiyu