This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 289608cc20 [fixbug]fix bug for OLAP_SUCCESS with Status (#9427)
289608cc20 is described below
commit 289608cc20703257043cbe1d4210a848b096fc30
Author: pengxiangyu <[email protected]>
AuthorDate: Wed May 11 20:04:06 2022 +0800
[fixbug]fix bug for OLAP_SUCCESS with Status (#9427)
---
be/src/olap/storage_migration_v2.cpp | 7 ++++---
be/src/olap/tablet_manager.cpp | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/be/src/olap/storage_migration_v2.cpp
b/be/src/olap/storage_migration_v2.cpp
index 7c45be6b6d..5ba4f4b659 100644
--- a/be/src/olap/storage_migration_v2.cpp
+++ b/be/src/olap/storage_migration_v2.cpp
@@ -352,9 +352,10 @@ Status
StorageMigrationV2Handler::_convert_historical_rowsets(
goto PROCESS_ALTER_EXIT;
}
- if ((res =
_generate_rowset_writer(sm_params.base_tablet->tablet_path_desc(),
-
sm_params.new_tablet->tablet_path_desc(), rs_reader,
- rowset_writer.get(), new_tablet))
!= OLAP_SUCCESS) {
+ if (!(res =
_generate_rowset_writer(sm_params.base_tablet->tablet_path_desc(),
+
sm_params.new_tablet->tablet_path_desc(), rs_reader,
+ rowset_writer.get(), new_tablet))
+ .ok()) {
LOG(WARNING) << "failed to add_rowset. version=" <<
rs_reader->version().first << "-"
<< rs_reader->version().second;
new_tablet->data_dir()->remove_pending_ids(ROWSET_ID_PREFIX +
diff --git a/be/src/olap/tablet_manager.cpp b/be/src/olap/tablet_manager.cpp
index 331e5e3be4..2936c9862e 100644
--- a/be/src/olap/tablet_manager.cpp
+++ b/be/src/olap/tablet_manager.cpp
@@ -1070,8 +1070,9 @@ void
TabletManager::try_delete_unused_tablet_path(DataDir* data_dir, TTabletId t
if (!tablet_uid.empty() && !storage_name.empty()) {
segment_desc.storage_name = storage_name;
StorageParamPB storage_param;
- if (StorageBackendMgr::instance()->get_storage_param(
- storage_name, &storage_param) != OLAP_SUCCESS) {
+ if (!StorageBackendMgr::instance()
+ ->get_storage_param(storage_name, &storage_param)
+ .ok()) {
LOG(WARNING) << "storage_name is invalid: " <<
storage_name;
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
