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

Test: fix mpp test bug #6511

Merged
merged 13 commits into from
Dec 22, 2022
Merged

Test: fix mpp test bug #6511

merged 13 commits into from
Dec 22, 2022

Conversation

ywqzzy
Copy link
Contributor

@ywqzzy ywqzzy commented Dec 20, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #6442 ref #4609

Problem Summary:
In MPP Test, mockStorage didn't provide column prune functionality, so the test will use the wrong column to compute.

What is changed and how it works?

  1. Move some of the include from header files to .cpp files
  2. Refine MockStorage::getColumnsForMPPTableScan to make sure it return columns that in TiDBTableScan
  3. add mockSourceStreamForMpp method to pass TiDBTableScan to MockStorage::getColumnsForMPPTableScan, then It will split the columns into multiple streams.

Check List

Tests

  • Unit test
  • Integration test
  • 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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • yibin87

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Dec 20, 2022
@ywqzzy ywqzzy changed the title Test: fix mpp test bug [WIP]Test: fix mpp test bug Dec 21, 2022
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 21, 2022
@ywqzzy ywqzzy changed the title [WIP]Test: fix mpp test bug Test: fix mpp test bug Dec 21, 2022
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 21, 2022
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Dec 21, 2022

/run-all-tests

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Dec 21, 2022

/rebuild

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Dec 21, 2022

/run-all-tests

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Dec 21, 2022

/run-all-tests

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Dec 21, 2022

/run-unit-tests

yibin87
yibin87 approved these changes Dec 22, 2022
View reviewed changes
Copy link
Contributor

@yibin87 yibin87 left a comment

Choose a reason for hiding this comment

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

Others LGTM

dbms/src/Debug/MockStorage.cpp Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 22, 2022
ywqzzy
ywqzzy commented Dec 22, 2022
View reviewed changes
dbms/src/TestUtils/MPPTaskTestUtils.cpp
// Currenly we wait for 10 times to ensure all tasks are cancelled.
if (retry_times > 10)
// Currenly we wait for 20 times to ensure all tasks are cancelled.
if (retry_times > 20)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Make the test more stable in local.

ywqzzy
ywqzzy commented Dec 22, 2022
View reviewed changes
dbms/src/TestUtils/MPPTaskTestUtils.h
}

private:
const Int64 port_upper_bound = 65536;
std::atomic<Int64> port = 3931;
std::atomic<Int64> port = 4931;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Make the port conflict less.

SeaRise
SeaRise approved these changes Dec 22, 2022
View reviewed changes
Copy link
Contributor

@SeaRise SeaRise left a comment

Choose a reason for hiding this comment

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

lgtm

@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 Dec 22, 2022
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Dec 22, 2022

/merge

@ti-chi-bot
Copy link
Member

@ywqzzy: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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.

@ti-chi-bot
Copy link
Member

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

Commit hash: f184ae7

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 22, 2022
@ti-chi-bot ti-chi-bot merged commit 2ea6253 into pingcap:master Dec 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yibin87 yibin87 yibin87 approved these changes

@SeaRise SeaRise SeaRise approved these changes

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

MPPTask GTest might fail due to column prune
4 participants
@ywqzzy @ti-chi-bot @yibin87 @SeaRise