This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new f49722163ed [pipelineX](bug) Fix query timeout due to broadcast
(#27398)
f49722163ed is described below
commit f49722163ed7b779afcc0db331715159cefeaade
Author: Gabriel <[email protected]>
AuthorDate: Wed Nov 22 19:25:04 2023 +0800
[pipelineX](bug) Fix query timeout due to broadcast (#27398)
---
be/src/pipeline/exec/exchange_sink_operator.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/be/src/pipeline/exec/exchange_sink_operator.h
b/be/src/pipeline/exec/exchange_sink_operator.h
index c27681738a0..89b024a6c6e 100644
--- a/be/src/pipeline/exec/exchange_sink_operator.h
+++ b/be/src/pipeline/exec/exchange_sink_operator.h
@@ -83,13 +83,20 @@ public:
void return_available_block() {
if (_available_block.fetch_add(1) == 0) {
+ std::lock_guard<std::mutex> lock(_lock);
+ if (_available_block == 0) {
+ return;
+ }
Dependency::set_ready();
}
}
void take_available_block() {
if (_available_block.fetch_sub(1) == 1) {
- Dependency::block();
+ std::lock_guard<std::mutex> lock(_lock);
+ if (_available_block == 0) {
+ Dependency::block();
+ }
}
}
@@ -97,6 +104,7 @@ public:
private:
std::atomic<int> _available_block;
+ std::mutex _lock;
};
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
