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

planner: fix data race in the TestInlineProjection4HashJoinIssue15316 #37014

Merged
merged 4 commits into from
Aug 11, 2022

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Aug 10, 2022

What problem does this PR solve?

Issue Number: close #37009

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 10, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • 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/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Aug 10, 2022
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 10, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 10, 2022

@@ -1327,11 +1328,12 @@ loopOtherConds:
}

// removeUselessEqAndInFunc removes the useless eq/in conditions. It's designed for the following case:
// t1 join t2 on t1.a=t2.a and t1.c=t2.c where t1.b > t2.b-10 and t1.b < t2.b+10 there's index(a, b, c) on t1.
Copy link
Member Author

Choose a reason for hiding this comment

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

I think it is related to go1.19's gofmt.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 10, 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 Aug 11, 2022
@xhebox
Copy link
Contributor

xhebox commented Aug 11, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4793f46

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 11, 2022
@ti-chi-bot ti-chi-bot merged commit 4fd3d0b into pingcap:master Aug 11, 2022
@hawkingrei hawkingrei deleted the planner_data_Race_test15316 branch August 11, 2022 04:25
morgo added a commit to morgo/tidb that referenced this pull request Aug 11, 2022
…verage

* upstream/master: (98 commits)
  planner: provide a unified interface to set and get user variables and types (pingcap#37046)
  *: fix check-2 to bazel (pingcap#37055)
  distsql: revert 37019 (pingcap#37048)
  planner: introduce new functions for the general statement in session interface (pingcap#37024)
  session: make BenchmarkCompileExecutePreparedStmt update to date (pingcap#36960)
  server: Change proxyprotocol to lazy mode (pingcap#36301)
  test: fix `TestDDLSchedulingMultiTimes` and `TestConcurrentDDLSwitch` timeout (pingcap#37043)
  makefile: add bazel realtikvtest (pingcap#37042)
  distsql: make analyze request SI (pingcap#37019)
  *: gofmt code for adapting go 1.19 (pingcap#36832)
  planner: fix data race in the TestInlineProjection4HashJoinIssue15316 (pingcap#37014)
  planner: introduce Session.CacheGeneralStmt for general plan cache (pingcap#37028)
  server: revise scheme code (pingcap#37021)
  planner: fix unstable test TestPushDownSelectionForMPP (pingcap#37038)
  executor: more precise memory tracking (pingcap#35785)
  executor: add privilege check for prepare stmt (pingcap#36933)
  *: optimize temptable.SessionSnapshotInterceptor (pingcap#36999)
  statistics: batch insert topn and buckets to storage to speed up loading stats (pingcap#36948)
  planner: remove keyword `prepared` in plan cache backend (pingcap#37023)
  util: fix unstable test TestCheckCN (pingcap#37016)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

DATA RACE in the TestInlineProjection4HashJoinIssue15316
6 participants