Skip to content

branch-3.0: [compile](fix) mow code compile error #45134 #45146

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

Closed
github-actions wants to merge 1 commit into from
Closed

branch-3.0: [compile](fix) mow code compile error #45134 #45146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions be/src/cloud/cloud_meta_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,10 +757,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());
}
Expand Down
20 changes: 10 additions & 10 deletions be/src/cloud/cloud_storage_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,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));
}
}
Expand Down Expand Up @@ -491,13 +491,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;
Expand Down
Loading