This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new db5299d [fix] fix compile error (#8688)
db5299d is described below
commit db5299d63e7795af154f628b091dec962530ca93
Author: Mingyu Chen <[email protected]>
AuthorDate: Mon Mar 28 11:53:42 2022 +0800
[fix] fix compile error (#8688)
Introduced from PR #8643
The condition_variable can only wait unique_lock
---
be/src/runtime/data_stream_recvr.cc | 2 +-
be/src/vec/runtime/vdata_stream_recvr.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/be/src/runtime/data_stream_recvr.cc
b/be/src/runtime/data_stream_recvr.cc
index b825390..837a6eb 100644
--- a/be/src/runtime/data_stream_recvr.cc
+++ b/be/src/runtime/data_stream_recvr.cc
@@ -269,7 +269,7 @@ void DataStreamRecvr::SenderQueue::add_batch(const
PRowBatch& pb_batch, int be_n
}
void DataStreamRecvr::SenderQueue::add_batch(RowBatch* batch, bool use_move) {
- lock_guard<mutex> l(_lock);
+ unique_lock<mutex> l(_lock);
if (_is_cancelled) {
return;
}
diff --git a/be/src/vec/runtime/vdata_stream_recvr.cpp
b/be/src/vec/runtime/vdata_stream_recvr.cpp
index eebe115..4767127 100644
--- a/be/src/vec/runtime/vdata_stream_recvr.cpp
+++ b/be/src/vec/runtime/vdata_stream_recvr.cpp
@@ -140,7 +140,7 @@ void VDataStreamRecvr::SenderQueue::add_block(const PBlock&
pblock, int be_numbe
}
void VDataStreamRecvr::SenderQueue::add_block(Block* block, bool use_move) {
- std::lock_guard<std::mutex> l(_lock);
+ std::unique_lock<std::mutex> l(_lock);
if (_is_cancelled) {
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
