github-actions[bot] commented on code in PR #28757:
URL: https://github.com/apache/doris/pull/28757#discussion_r1439299134
##########
be/src/olap/wal/wal_manager.cpp:
##########
@@ -511,4 +520,68 @@ std::string WalManager::_get_base_wal_path(const
std::string& wal_path_str) {
return wal_path.string();
}
+Status WalManager::add_wal_cv_map(int64_t wal_id, std::shared_ptr<std::mutex>
lock,
Review Comment:
warning: method 'add_wal_cv_map' can be made static
[readability-convert-member-functions-to-static]
```suggestion
static Status WalManager::add_wal_cv_map(int64_t wal_id,
std::shared_ptr<std::mutex> lock,
```
##########
be/src/olap/wal/wal_manager.cpp:
##########
@@ -511,4 +520,68 @@
return wal_path.string();
}
+Status WalManager::add_wal_cv_map(int64_t wal_id, std::shared_ptr<std::mutex>
lock,
+ std::shared_ptr<std::condition_variable> cv)
{
+ std::lock_guard<std::shared_mutex> wrlock(_wal_cv_lock);
+ auto it = _wal_cv_map.find(wal_id);
+ if (it != _wal_cv_map.end()) {
+ return Status::InternalError("wal {} is already in _wal_cv_map ",
wal_id);
+ }
+ auto pair = std::make_pair(lock, cv);
+ _wal_cv_map.emplace(wal_id, pair);
+ LOG(INFO) << "add " << wal_id << " to _wal_cv_map";
+ return Status::OK();
+}
+
+Status WalManager::erase_wal_cv_map(int64_t wal_id) {
Review Comment:
warning: method 'erase_wal_cv_map' can be made static
[readability-convert-member-functions-to-static]
be/src/olap/wal/wal_manager.h:97:
```diff
- Status erase_wal_cv_map(int64_t wal_id);
+ static Status erase_wal_cv_map(int64_t wal_id);
```
##########
be/src/olap/wal/wal_manager.cpp:
##########
@@ -511,4 +520,68 @@
return wal_path.string();
}
+Status WalManager::add_wal_cv_map(int64_t wal_id, std::shared_ptr<std::mutex>
lock,
+ std::shared_ptr<std::condition_variable> cv)
{
+ std::lock_guard<std::shared_mutex> wrlock(_wal_cv_lock);
+ auto it = _wal_cv_map.find(wal_id);
+ if (it != _wal_cv_map.end()) {
+ return Status::InternalError("wal {} is already in _wal_cv_map ",
wal_id);
+ }
+ auto pair = std::make_pair(lock, cv);
+ _wal_cv_map.emplace(wal_id, pair);
+ LOG(INFO) << "add " << wal_id << " to _wal_cv_map";
+ return Status::OK();
+}
+
+Status WalManager::erase_wal_cv_map(int64_t wal_id) {
+ std::lock_guard<std::shared_mutex> wrlock(_wal_cv_lock);
+ if (_wal_cv_map.erase(wal_id)) {
+ LOG(INFO) << "erase " << wal_id << " from _wal_cv_map";
+ } else {
+ return Status::InternalError("fail to erase wal {} from wal_cv_map",
wal_id);
+ }
+ return Status::OK();
+}
+
+Status WalManager::wait_relay_wal_finish(int64_t wal_id) {
+ std::shared_ptr<std::mutex> lock = nullptr;
+ std::shared_ptr<std::condition_variable> cv = nullptr;
+ auto st = get_lock_and_cv(wal_id, lock, cv);
+ if (st.ok()) {
+ std::unique_lock l(*(lock));
+ LOG(INFO) << "start wait " << wal_id;
+ if (cv->wait_for(l, std::chrono::seconds(180)) ==
std::cv_status::timeout) {
+ LOG(WARNING) << "wait for " << wal_id << " is time out";
+ }
+ LOG(INFO) << "get wal " << wal_id << ",finish wait";
+ RETURN_IF_ERROR(erase_wal_cv_map(wal_id));
+ LOG(INFO) << "erase wal " << wal_id;
+ }
+ return Status::OK();
+}
+
+Status WalManager::notify_relay_wal(int64_t wal_id) {
+ std::shared_ptr<std::mutex> lock = nullptr;
+ std::shared_ptr<std::condition_variable> cv = nullptr;
+ auto st = get_lock_and_cv(wal_id, lock, cv);
+ if (st.ok()) {
+ std::unique_lock l(*(lock));
+ cv->notify_all();
+ LOG(INFO) << "get wal " << wal_id << ",notify all";
+ }
+ return Status::OK();
+}
+
+Status WalManager::get_lock_and_cv(int64_t wal_id,
std::shared_ptr<std::mutex>& lock,
Review Comment:
warning: method 'get_lock_and_cv' can be made static
[readability-convert-member-functions-to-static]
```suggestion
static Status WalManager::get_lock_and_cv(int64_t wal_id,
std::shared_ptr<std::mutex>& lock,
```
##########
be/src/olap/wal/wal_manager.cpp:
##########
@@ -511,4 +520,68 @@
return wal_path.string();
}
+Status WalManager::add_wal_cv_map(int64_t wal_id, std::shared_ptr<std::mutex>
lock,
+ std::shared_ptr<std::condition_variable> cv)
{
+ std::lock_guard<std::shared_mutex> wrlock(_wal_cv_lock);
+ auto it = _wal_cv_map.find(wal_id);
+ if (it != _wal_cv_map.end()) {
+ return Status::InternalError("wal {} is already in _wal_cv_map ",
wal_id);
+ }
+ auto pair = std::make_pair(lock, cv);
+ _wal_cv_map.emplace(wal_id, pair);
+ LOG(INFO) << "add " << wal_id << " to _wal_cv_map";
+ return Status::OK();
+}
+
+Status WalManager::erase_wal_cv_map(int64_t wal_id) {
+ std::lock_guard<std::shared_mutex> wrlock(_wal_cv_lock);
+ if (_wal_cv_map.erase(wal_id)) {
+ LOG(INFO) << "erase " << wal_id << " from _wal_cv_map";
+ } else {
+ return Status::InternalError("fail to erase wal {} from wal_cv_map",
wal_id);
+ }
+ return Status::OK();
+}
+
+Status WalManager::wait_relay_wal_finish(int64_t wal_id) {
+ std::shared_ptr<std::mutex> lock = nullptr;
+ std::shared_ptr<std::condition_variable> cv = nullptr;
+ auto st = get_lock_and_cv(wal_id, lock, cv);
+ if (st.ok()) {
+ std::unique_lock l(*(lock));
+ LOG(INFO) << "start wait " << wal_id;
+ if (cv->wait_for(l, std::chrono::seconds(180)) ==
std::cv_status::timeout) {
+ LOG(WARNING) << "wait for " << wal_id << " is time out";
+ }
+ LOG(INFO) << "get wal " << wal_id << ",finish wait";
+ RETURN_IF_ERROR(erase_wal_cv_map(wal_id));
+ LOG(INFO) << "erase wal " << wal_id;
+ }
+ return Status::OK();
+}
+
+Status WalManager::notify_relay_wal(int64_t wal_id) {
Review Comment:
warning: method 'notify_relay_wal' can be made static
[readability-convert-member-functions-to-static]
be/src/olap/wal/wal_manager.h:101:
```diff
- Status notify_relay_wal(int64_t wal_id);
+ static Status notify_relay_wal(int64_t wal_id);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
