-
Notifications
You must be signed in to change notification settings - Fork 409
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
move tunnel_map
to MPPTunnelSet
#5123
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -14,6 +14,7 @@ | |||||
|
||||||
#pragma once | ||||||
|
||||||
#include <Flash/Mpp/MPPTaskId.h> | ||||||
#include <Flash/Mpp/MPPTunnel.h> | ||||||
#ifdef __clang__ | ||||||
#pragma clang diagnostic push | ||||||
|
@@ -32,6 +33,9 @@ class MPPTunnelSetBase : private boost::noncopyable | |||||
{ | ||||||
public: | ||||||
using TunnelPtr = std::shared_ptr<Tunnel>; | ||||||
explicit MPPTunnelSetBase(const String & req_id) | ||||||
: log(Logger::get("MPPTunnelSet", req_id)) | ||||||
{} | ||||||
|
||||||
void clearExecutionSummaries(tipb::SelectResponse & response); | ||||||
|
||||||
|
@@ -50,11 +54,19 @@ class MPPTunnelSetBase : private boost::noncopyable | |||||
// this is a partition writing. | ||||||
void write(tipb::SelectResponse & response, int16_t partition_id); | ||||||
void write(mpp::MPPDataPacket & packet, int16_t partition_id); | ||||||
void writeError(const String & msg); | ||||||
void close(const String & reason); | ||||||
void finishWrite(); | ||||||
TunnelPtr getTunnelById(const MPPTaskId & id); | ||||||
|
||||||
uint16_t getPartitionNum() const { return tunnels.size(); } | ||||||
|
||||||
void addTunnel(const TunnelPtr & tunnel) | ||||||
void registerTunnel(const MPPTaskId & id, const TunnelPtr & tunnel) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. how about hide the implementation in .cpp file? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||||||
{ | ||||||
if (id_to_index_map.find(id) != id_to_index_map.end()) | ||||||
throw Exception("the tunnel " + tunnel->id() + " has been registered"); | ||||||
|
||||||
id_to_index_map[id] = tunnels.size(); | ||||||
tunnels.push_back(tunnel); | ||||||
if (!tunnel->isLocal()) | ||||||
{ | ||||||
|
@@ -71,6 +83,8 @@ class MPPTunnelSetBase : private boost::noncopyable | |||||
|
||||||
private: | ||||||
std::vector<TunnelPtr> tunnels; | ||||||
std::unordered_map<MPPTaskId, size_t> id_to_index_map; | ||||||
bestwoody marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good idea, but the pr was already merged :( |
||||||
const LoggerPtr log; | ||||||
|
||||||
int remote_tunnel_cnt = 0; | ||||||
}; | ||||||
|
There was a problem hiding this comment.
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?There was a problem hiding this comment.
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.