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

move tunnel_map to MPPTunnelSet #5123

Merged
merged 4 commits into from
Jun 10, 2022
Merged

move tunnel_map to MPPTunnelSet #5123

merged 4 commits into from
Jun 10, 2022

Conversation

windtalker
Copy link
Contributor

Signed-off-by: xufei xufeixw@mail.ustc.edu.cn

What problem does this PR solve?

Issue Number: ref #5095

Problem Summary:

Currently, there 2 tunnel related components in MPPTask

This pr move tunnel_map to MPPTunnelSet, and all the tunnel releated operate are handled in MPPTunnelSet

What is changed and how it works?

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 Jun 10, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bestwoody
  • fuzhe1989

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 10, 2022
@windtalker
move tunnel_map to MPPTunnelSet
193de75 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
fix
d4ed888 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@bestwoody bestwoody self-requested a review June 10, 2022 07:12
fuzhe1989
fuzhe1989 approved these changes Jun 10, 2022
View reviewed changes
dbms/src/Flash/Mpp/MPPTunnelSet.h Outdated

uint16_t getPartitionNum() const { return tunnels.size(); }

void addTunnel(const TunnelPtr & tunnel)
void registerTunnel(const MPPTaskId & id, const TunnelPtr & tunnel)
Copy link
Contributor

Choose a reason for hiding this comment

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

how about hide the implementation in .cpp file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 10, 2022
bestwoody
bestwoody reviewed Jun 10, 2022
View reviewed changes
dbms/src/Flash/Mpp/MPPTunnelSet.cpp
catch (...)
{
tryLogCurrentException(log, "Failed to write error " + msg + " to tunnel: " + tunnel->id());
tunnel->close("Failed to write error msg to tunnel");
Copy link
Contributor

Choose a reason for hiding this comment

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

in original code, tunnel->close is the 1st statement, are they same?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let's keep the original implementation.

bestwoody
bestwoody approved these changes Jun 10, 2022
View reviewed changes
Copy link
Contributor

@bestwoody bestwoody 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 Jun 10, 2022
yibin87
yibin87 approved these changes Jun 10, 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.

LGTM

@windtalker
fix clang-tidy error
40e1a17 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
address comments
873e982 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
SeaRise
SeaRise reviewed Jun 10, 2022
View reviewed changes
dbms/src/Flash/Mpp/MPPTunnelSet.h
@@ -71,6 +72,8 @@ class MPPTunnelSetBase : private boost::noncopyable

private:
std::vector<TunnelPtr> tunnels;
std::unordered_map<MPPTaskId, size_t> id_to_index_map;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
std::unordered_map<MPPTaskId, size_t> id_to_index_map;
std::unordered_map<MPPTaskId, size_t> target_id_to_index_map;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, but the pr was already merged :(

@windtalker
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@windtalker: 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: 873e982

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 10, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jun 10, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
MPPTask.cpp                       455               455     0.00%          21                21     0.00%         333               333     0.00%         198               198     0.00%
MPPTask.h                           3                 3     0.00%           3                 3     0.00%           3                 3     0.00%           0                 0         -
MPPTunnelSet.cpp                   63                63     0.00%          12                12     0.00%         104               104     0.00%          40                40     0.00%
MPPTunnelSet.h                      4                 4     0.00%           4                 4     0.00%           6                 6     0.00%           0                 0         -
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             525               525     0.00%          40                40     0.00%         446               446     0.00%         238               238     0.00%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18333      9662             47.30%    205699  96747        52.97%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 8916afe into pingcap:master Jun 10, 2022
@windtalker windtalker deleted the refine_mpp_tunnel_set branch January 30, 2023 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SeaRise SeaRise SeaRise left review comments

@fuzhe1989 fuzhe1989 fuzhe1989 approved these changes

@yibin87 yibin87 yibin87 approved these changes

@bestwoody bestwoody bestwoody approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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.
7 participants
@windtalker @ti-chi-bot @sre-bot @fuzhe1989 @yibin87 @SeaRise @bestwoody