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

[shuffle](fix) Do not use copy assignment for TUniqueId #32969

Merged
merged 1 commit into from
Mar 29, 2024
Merged

[shuffle](fix) Do not use copy assignment for TUniqueId #32969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions be/src/pipeline/exec/exchange_sink_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,27 +186,27 @@ Status ExchangeSinkBuffer<Parent>::add_block(TransmitInfo<Parent>&& request) {
if (_is_finishing) {
return Status::OK();
}
TUniqueId ins_id = request.channel->_fragment_instance_id;
if (_is_receiver_eof(ins_id.lo)) {
auto ins_id = request.channel->_fragment_instance_id.lo;
if (_is_receiver_eof(ins_id)) {
return Status::EndOfFile("receiver eof");
}
bool send_now = false;
{
std::unique_lock<std::mutex> lock(*_instance_to_package_queue_mutex[ins_id.lo]);
std::unique_lock<std::mutex> lock(*_instance_to_package_queue_mutex[ins_id]);
// Do not have in process rpc, directly send
if (_rpc_channel_is_idle[ins_id.lo]) {
if (_rpc_channel_is_idle[ins_id]) {
send_now = true;
_rpc_channel_is_idle[ins_id.lo] = false;
_rpc_channel_is_idle[ins_id] = false;
_busy_channels++;
}
_instance_to_package_queue[ins_id.lo].emplace(std::move(request));
_instance_to_package_queue[ins_id].emplace(std::move(request));
_total_queue_size++;
if (_queue_dependency && _total_queue_size > _queue_capacity) {
_queue_dependency->block();
}
}
if (send_now) {
RETURN_IF_ERROR(_send_rpc(ins_id.lo));
RETURN_IF_ERROR(_send_rpc(ins_id));
}

return Status::OK();
Expand All @@ -217,23 +217,23 @@ Status ExchangeSinkBuffer<Parent>::add_block(BroadcastTransmitInfo<Parent>&& req
if (_is_finishing) {
return Status::OK();
}
TUniqueId ins_id = request.channel->_fragment_instance_id;
if (_is_receiver_eof(ins_id.lo)) {
auto ins_id = request.channel->_fragment_instance_id.lo;
if (_is_receiver_eof(ins_id)) {
return Status::EndOfFile("receiver eof");
}
bool send_now = false;
{
std::unique_lock<std::mutex> lock(*_instance_to_package_queue_mutex[ins_id.lo]);
std::unique_lock<std::mutex> lock(*_instance_to_package_queue_mutex[ins_id]);
// Do not have in process rpc, directly send
if (_rpc_channel_is_idle[ins_id.lo]) {
if (_rpc_channel_is_idle[ins_id]) {
send_now = true;
_rpc_channel_is_idle[ins_id.lo] = false;
_rpc_channel_is_idle[ins_id] = false;
_busy_channels++;
}
_instance_to_broadcast_package_queue[ins_id.lo].emplace(request);
_instance_to_broadcast_package_queue[ins_id].emplace(request);
}
if (send_now) {
RETURN_IF_ERROR(_send_rpc(ins_id.lo));
RETURN_IF_ERROR(_send_rpc(ins_id));
}

return Status::OK();
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/sink/vdata_stream_sender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class Channel {
Parent* _parent = nullptr;

const RowDescriptor& _row_desc;
TUniqueId _fragment_instance_id;
const TUniqueId _fragment_instance_id;
PlanNodeId _dest_node_id;

// the number of RowBatch.data bytes sent successfully
Expand Down
Loading