This is an automated email from the ASF dual-hosted git repository.
hellostephen 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 5f7a4a89ac8 [compile](fix) mow code compile error (#45134)
5f7a4a89ac8 is described below
commit 5f7a4a89ac8a945fdb038390eebaf38ff8c22667
Author: huanghaibin <huanghai...@selectdb.com>
AuthorDate: Sat Dec 7 10:56:34 2024 +0800
[compile](fix) mow code compile error (#45134)
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #44439
---
be/src/cloud/cloud_meta_mgr.cpp | 4 ++--
be/src/cloud/cloud_storage_engine.cpp | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/be/src/cloud/cloud_meta_mgr.cpp b/be/src/cloud/cloud_meta_mgr.cpp
index 477cc802910..835e74ca7d5 100644
--- a/be/src/cloud/cloud_meta_mgr.cpp
+++ b/be/src/cloud/cloud_meta_mgr.cpp
@@ -758,10 +758,10 @@ Status CloudMetaMgr::prepare_rowset(const RowsetMeta&
rs_meta,
Status st = retry_rpc("prepare rowset", req, &resp,
&MetaService_Stub::prepare_rowset);
if (!st.ok() && resp.status().code() == MetaServiceCode::ALREADY_EXISTED) {
if (existed_rs_meta != nullptr && resp.has_existed_rowset_meta()) {
- RowsetMetaPB doris_rs_meta =
+ RowsetMetaPB doris_rs_meta_tmp =
cloud_rowset_meta_to_doris(std::move(*resp.mutable_existed_rowset_meta()));
*existed_rs_meta = std::make_shared<RowsetMeta>();
- (*existed_rs_meta)->init_from_pb(doris_rs_meta);
+ (*existed_rs_meta)->init_from_pb(doris_rs_meta_tmp);
}
return Status::AlreadyExist("failed to prepare rowset: {}",
resp.status().msg());
}
diff --git a/be/src/cloud/cloud_storage_engine.cpp
b/be/src/cloud/cloud_storage_engine.cpp
index 2944ccf21f2..b66a9cfbdb2 100644
--- a/be/src/cloud/cloud_storage_engine.cpp
+++ b/be/src/cloud/cloud_storage_engine.cpp
@@ -352,11 +352,11 @@ void CloudStorageEngine::sync_storage_vault() {
for (auto& [id, vault_info, path_format] : vault_infos) {
auto fs = get_filesystem(id);
- auto st = (fs == nullptr)
- ? std::visit(VaultCreateFSVisitor {id, path_format},
vault_info)
- : std::visit(RefreshFSVaultVisitor {id,
std::move(fs), path_format},
- vault_info);
- if (!st.ok()) [[unlikely]] {
+ auto status = (fs == nullptr)
+ ? std::visit(VaultCreateFSVisitor {id,
path_format}, vault_info)
+ : std::visit(RefreshFSVaultVisitor {id,
std::move(fs), path_format},
+ vault_info);
+ if (!status.ok()) [[unlikely]] {
LOG(WARNING) << vault_process_error(id, vault_info, std::move(st));
}
}
@@ -506,13 +506,13 @@ void
CloudStorageEngine::_compaction_tasks_producer_callback() {
/// If it is not cleaned up, the reference count of the tablet
will always be greater than 1,
/// thus cannot be collected by the garbage collector.
(TabletManager::start_trash_sweep)
for (const auto& tablet : tablets_compaction) {
- Status st = submit_compaction_task(tablet, compaction_type);
- if (st.ok()) continue;
- if ((!st.is<ErrorCode::BE_NO_SUITABLE_VERSION>() &&
- !st.is<ErrorCode::CUMULATIVE_NO_SUITABLE_VERSION>()) ||
+ Status status = submit_compaction_task(tablet,
compaction_type);
+ if (status.ok()) continue;
+ if ((!status.is<ErrorCode::BE_NO_SUITABLE_VERSION>() &&
+ !status.is<ErrorCode::CUMULATIVE_NO_SUITABLE_VERSION>())
||
VLOG_DEBUG_IS_ON) {
LOG(WARNING) << "failed to submit compaction task for
tablet: "
- << tablet->tablet_id() << ", err: " << st;
+ << tablet->tablet_id() << ", err: " << status;
}
}
interval = config::generate_compaction_tasks_interval_ms;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
