Skip to content

[fix](auditlog) fix without lock in QueryStatisticsRecvr find #26441

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

Merged
xiaokang merged 2 commits into from
Nov 6, 2023
Merged

[fix](auditlog) fix without lock in QueryStatisticsRecvr find #26441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b748ce2
fix
Mryange Nov 6, 2023
44d72eb
upd
Mryange Nov 6, 2023
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
16 changes: 13 additions & 3 deletions be/src/runtime/query_statistics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,10 @@ void QueryStatistics::merge(QueryStatisticsRecvr* recvr) {
}

void QueryStatistics::merge(QueryStatisticsRecvr* recvr, int sender_id) {
auto it = recvr->_query_statistics.find(sender_id);
if (it != recvr->_query_statistics.end()) {
merge(*it->second);
DCHECK(recvr != nullptr);
auto QueryStatisticsptr = recvr->find(sender_id);
if (QueryStatisticsptr) {
merge(*QueryStatisticsptr);
}
}

Expand Down Expand Up @@ -120,4 +121,13 @@ void QueryStatisticsRecvr::insert(QueryStatisticsPtr statistics, int sender_id)
_query_statistics[sender_id] = statistics;
}

QueryStatisticsPtr QueryStatisticsRecvr::find(int sender_id) {
std::lock_guard<SpinLock> l(_lock);
auto it = _query_statistics.find(sender_id);
if (it != _query_statistics.end()) {
return it->second;
}
return nullptr;
}

} // namespace doris
2 changes: 2 additions & 0 deletions be/src/runtime/query_statistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ class QueryStatisticsRecvr {
// using local_exchange for transmission, only need to hold a shared pointer.
void insert(QueryStatisticsPtr statistics, int sender_id);

QueryStatisticsPtr find(int sender_id);

private:
friend class QueryStatistics;

Expand Down
5 changes: 4 additions & 1 deletion be/src/vec/exec/vexchange_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ Status VExchangeNode::collect_query_statistics(QueryStatistics* statistics) {
}
Status VExchangeNode::collect_query_statistics(QueryStatistics* statistics, int sender_id) {
RETURN_IF_ERROR(ExecNode::collect_query_statistics(statistics));
statistics->merge(_sub_plan_query_statistics_recvr.get(), sender_id);
DCHECK(statistics != nullptr);
if (_sub_plan_query_statistics_recvr) {
statistics->merge(_sub_plan_query_statistics_recvr.get(), sender_id);
}
return Status::OK();
}
Status VExchangeNode::close(RuntimeState* state) {
Expand Down