From 495abac47d6bb4366d09b76a647a350fa1cda540 Mon Sep 17 00:00:00 2001 From: xuhuleon Date: Thu, 2 Jan 2025 04:44:44 +0000 Subject: [PATCH] change-todos-of-jinyu --- deps/oblib/src/lib/string/ob_string.h | 8 ++++---- src/rootserver/backup/ob_backup_clean_scheduler.cpp | 2 +- src/rootserver/backup/ob_backup_clean_task_mgr.cpp | 6 +++--- src/rootserver/backup/ob_backup_service.cpp | 4 ++-- src/share/backup/ob_backup_clean_struct.h | 4 ++-- src/share/backup/ob_backup_connectivity.cpp | 6 +++--- src/share/backup/ob_backup_io_adapter.cpp | 3 +-- src/share/backup/ob_log_restore_config.cpp | 2 +- .../compaction/ob_partition_parallel_merge_ctx.cpp | 1 - src/storage/high_availability/ob_tablet_backfill_tx.cpp | 1 + src/storage/high_availability/ob_transfer_struct.cpp | 1 - src/storage/tablet/ob_tablet.cpp | 2 +- src/storage/tablet/ob_tablet_mds_data.cpp | 2 +- 13 files changed, 20 insertions(+), 22 deletions(-) diff --git a/deps/oblib/src/lib/string/ob_string.h b/deps/oblib/src/lib/string/ob_string.h index ad6cec2b5..f835ad98f 100644 --- a/deps/oblib/src/lib/string/ob_string.h +++ b/deps/oblib/src/lib/string/ob_string.h @@ -170,7 +170,7 @@ public: * DO NOT USE THIS ANY MORE */ - inline void assign(char *bytes, const int64_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.3 + inline void assign(char *bytes, const int64_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.4 { if (length > INT32_MAX) { LIB_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "invalid length for assign", K(length)); @@ -207,7 +207,7 @@ public: } } - inline void assign_ptr(const char *bytes, const int64_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.3 + inline void assign_ptr(const char *bytes, const int64_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.4 { if (length < 0 || length > INT32_MAX) { LIB_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "invalid length for assign ptr", K(length)); @@ -215,7 +215,7 @@ public: assign_ptr(bytes, static_cast(length)); } - inline void assign_ptr(const char *bytes, const uint64_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.3 + inline void assign_ptr(const char *bytes, const uint64_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.4 { if (length < 0 || length > INT32_MAX) { LIB_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "invalid length for assign ptr", K(length)); @@ -223,7 +223,7 @@ public: assign_ptr(bytes, static_cast(length)); } - inline void assign_ptr(const char *bytes, const uint32_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.3 + inline void assign_ptr(const char *bytes, const uint32_t length) //TODO(yongle.xh): for -Wshorten-64-to-32, delete it later 4.4 { if (length > INT32_MAX) { LIB_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "invalid length for assign ptr", K(length)); diff --git a/src/rootserver/backup/ob_backup_clean_scheduler.cpp b/src/rootserver/backup/ob_backup_clean_scheduler.cpp index d28cc56c9..40e768341 100644 --- a/src/rootserver/backup/ob_backup_clean_scheduler.cpp +++ b/src/rootserver/backup/ob_backup_clean_scheduler.cpp @@ -1250,7 +1250,7 @@ int ObUserTenantBackupDeleteMgr::get_delete_backup_set_infos_(ObArray &piece_list) { int ret = OB_SUCCESS; - // TODO(wenjinyu.wjy) 4.3 support + // TODO(xingzhi) 4.4 support return ret; } diff --git a/src/rootserver/backup/ob_backup_clean_task_mgr.cpp b/src/rootserver/backup/ob_backup_clean_task_mgr.cpp index 17da2181b..3511ff59a 100644 --- a/src/rootserver/backup/ob_backup_clean_task_mgr.cpp +++ b/src/rootserver/backup/ob_backup_clean_task_mgr.cpp @@ -101,7 +101,7 @@ int ObBackupCleanTaskMgr::init( backup_service_ = &backup_service; is_inited_ = true; } - // TODO(wenjinyu.wjy): integrate sql_proxy and lease_service 4.3 + // TODO(xingzhi): integrate sql_proxy and lease_service 4.4 return ret; } @@ -604,7 +604,7 @@ int ObBackupCleanTaskMgr::get_ls_ids_from_traverse_(const ObBackupPath &path, Ob LOG_WARN("failed to set log stream prefix", K(ret)); } else if (OB_FAIL(prefix_op.init(logstream_prefix, strlen(logstream_prefix)))) { LOG_WARN("failed to init dir prefix", K(ret), K(logstream_prefix)); - // TODO(wenjinyu.wjy) iterate dir sequentially 4.3 + // TODO(xingzhi) iterate dir sequentially 4.4 } else if (OB_FAIL(util.list_directories(path.get_obstr(), backup_dest_.get_storage_info(), prefix_op))) { LOG_WARN("failed to list files", K(ret)); } else { @@ -816,7 +816,7 @@ int ObBackupCleanTaskMgr::delete_data_info_turn_files_(const ObBackupPath &infos ObDirPrefixEntryNameFilter prefix_op(d_entrys); if (OB_FAIL(prefix_op.init(info_turn_prefix, strlen(info_turn_prefix)))) { LOG_WARN("failed to init dir prefix", K(ret), K(info_turn_prefix)); - // TODO(wenjinyu.wjy) iterate dir sequentially 4.3 + // TODO(xingzhi) iterate dir sequentially 4.4 } else if (OB_FAIL(util.list_directories(infos_path.get_obstr(), backup_dest_.get_storage_info(), prefix_op))) { LOG_WARN("failed to list directories", K(ret)); } else { diff --git a/src/rootserver/backup/ob_backup_service.cpp b/src/rootserver/backup/ob_backup_service.cpp index 6be9bd44f..51a28c5ff 100644 --- a/src/rootserver/backup/ob_backup_service.cpp +++ b/src/rootserver/backup/ob_backup_service.cpp @@ -325,7 +325,7 @@ int ObBackupCleanService::handle_backup_delete(const obrpc::ObBackupCleanArg &ar }; case ObNewBackupCleanType::DELETE_BACKUP_SET: case ObNewBackupCleanType::DELETE_BACKUP_PIECE: { - // TODO(wenjinyu.wjy) 4.3 support delete backup set/piece + // TODO(xingzhi) 4.4 support delete backup set/piece ret = OB_NOT_SUPPORTED; break; }; @@ -337,7 +337,7 @@ int ObBackupCleanService::handle_backup_delete(const obrpc::ObBackupCleanArg &ar break; }; case ObNewBackupCleanType::DELETE_BACKUP_ALL: { - // TODO(wenjinyu.wjy) 4.3 support delete backup all function + // TODO(xingzhi) 4.4 support delete backup all function ret = OB_NOT_SUPPORTED; break; }; diff --git a/src/share/backup/ob_backup_clean_struct.h b/src/share/backup/ob_backup_clean_struct.h index 9f8d1e865..a8808e573 100644 --- a/src/share/backup/ob_backup_clean_struct.h +++ b/src/share/backup/ob_backup_clean_struct.h @@ -146,7 +146,7 @@ public: int64_t task_count_; int64_t success_task_count_; }; - // TODO(wenjinyu.wjy) 4.3 Split the structure of set and piece + // TODO(xingzhi) 4.4 Split the structure of set and piece struct ObBackupCleanTaskAttr final { @@ -233,4 +233,4 @@ struct ObDeletePolicyAttr final }//share }//oceanbase -#endif /* OCEANBASE_SHARE_OB_BACKUP_CEALN_STRUCT_H_ */ \ No newline at end of file +#endif /* OCEANBASE_SHARE_OB_BACKUP_CEALN_STRUCT_H_ */ diff --git a/src/share/backup/ob_backup_connectivity.cpp b/src/share/backup/ob_backup_connectivity.cpp index 55da133bb..c79ff68fd 100644 --- a/src/share/backup/ob_backup_connectivity.cpp +++ b/src/share/backup/ob_backup_connectivity.cpp @@ -65,7 +65,7 @@ int ObBackupConnectivityCheckManager::schedule_connectivity_check_( const share::ObBackupPath &path) { int ret = OB_SUCCESS; - // TODO(wenjinyu.wjy) in 4.3, this code logic needs to be rewritten. Since server_mgr needs to be removed, first comment the code + // TODO(mingqiao) in 4.3, this code logic needs to be rewritten. Since server_mgr needs to be removed, first comment the code // obrpc::ObCheckBackupConnectivityArg args; // args.tenant_id_ = tenant_id_; // common::ObArray server_list; @@ -205,7 +205,7 @@ int ObBackupConnectivityCheckManager::check_backup_dest_connectivity( LOG_WARN("failed to check oss/cos io permission", K(ret), K_(tenant_id), K(backup_dest)); } else if (OB_FAIL(set_connectivity_check_path_(backup_dest, path))) { LOG_WARN("failed to get check file", K(ret), K_(tenant_id), K(backup_dest)); - // TODO(wenjinyu.wjy) in 4.3, support check connectivity + // TODO(mingqiao) in 4.3, support check connectivity //} else if (OB_FAIL(schedule_connectivity_check_(backup_dest, path))) { // LOG_WARN("failed to schedule connectivity check", K(ret), K_(tenant_id)); } else if (OB_FAIL(set_last_check_time_(backup_dest))) { @@ -1278,4 +1278,4 @@ int ObBackupStorageInfoOperator::get_backup_dest( return ret; } }//share -}//oceanbase \ No newline at end of file +}//oceanbase diff --git a/src/share/backup/ob_backup_io_adapter.cpp b/src/share/backup/ob_backup_io_adapter.cpp index 055f619fe..d4c12274b 100644 --- a/src/share/backup/ob_backup_io_adapter.cpp +++ b/src/share/backup/ob_backup_io_adapter.cpp @@ -1218,8 +1218,7 @@ int ObCheckDirEmptOp::func(const dirent *entry) file_cnt_++; return OB_ERR_EXIST_OBJECT; } - // TODO(wenjinyu.wjy) need to be refactored 4.3 - // can be optimized, object storage no need do extra list_dir + int ObBackupIoAdapter::is_empty_directory(const common::ObString &uri, const share::ObBackupStorageInfo *storage_info, bool &is_empty_directory) diff --git a/src/share/backup/ob_log_restore_config.cpp b/src/share/backup/ob_log_restore_config.cpp index 08b73f63b..eb2504e47 100644 --- a/src/share/backup/ob_log_restore_config.cpp +++ b/src/share/backup/ob_log_restore_config.cpp @@ -95,7 +95,7 @@ int ObLogRestoreSourceLocationConfigParser::check_before_update_inner_config( LOG_USER_ERROR(OB_INVALID_ARGUMENT, "set standby itself as log restore source"); } } - //TODO (wenjinyu.wjy) need support access permission check + //TODO (mingqiao) need support access permission check // return ret; } diff --git a/src/storage/compaction/ob_partition_parallel_merge_ctx.cpp b/src/storage/compaction/ob_partition_parallel_merge_ctx.cpp index ad57cb689..f65cfef96 100644 --- a/src/storage/compaction/ob_partition_parallel_merge_ctx.cpp +++ b/src/storage/compaction/ob_partition_parallel_merge_ctx.cpp @@ -84,7 +84,6 @@ int ObParallelMergeCtx::init(compaction::ObBasicTabletMergeCtx &merge_ctx) STORAGE_LOG(WARN, "Invalid argument to init parallel merge", K(ret), K(merge_ctx)); } else if (FALSE_IT(tablet_size = merge_ctx.get_schema()->get_tablet_size())) { } else if (!merge_ctx.get_need_parallel_minor_merge()) { - //TODO(jinyu) backfill need using same code with minor merge in 4.2 RC3. enable_parallel_minor_merge = false; } else { omt::ObTenantConfigGuard tenant_config(TENANT_CONF(MTL_ID())); diff --git a/src/storage/high_availability/ob_tablet_backfill_tx.cpp b/src/storage/high_availability/ob_tablet_backfill_tx.cpp index 3d234b80c..6aeeca544 100644 --- a/src/storage/high_availability/ob_tablet_backfill_tx.cpp +++ b/src/storage/high_availability/ob_tablet_backfill_tx.cpp @@ -1973,6 +1973,7 @@ int ObTabletMdsTableBackfillTXTask::prepare_mds_table_merge_ctx_( static_param.version_range_.multi_version_start_ = tablet_handle_.get_obj()->get_multi_version_start(); static_param.merge_scn_ = backfill_tx_ctx_->backfill_scn_; static_param.create_snapshot_version_ = 0; + //TODO(muwei): backfill need using same code with minor merge in 4.4. static_param.need_parallel_minor_merge_ = false; // double set insurance static_param.tablet_transfer_seq_ = dest_transfer_seq_; diff --git a/src/storage/high_availability/ob_transfer_struct.cpp b/src/storage/high_availability/ob_transfer_struct.cpp index ddc711c48..64bb4ab66 100644 --- a/src/storage/high_availability/ob_transfer_struct.cpp +++ b/src/storage/high_availability/ob_transfer_struct.cpp @@ -530,7 +530,6 @@ int ObTXTransferUtils::get_tablet_status_( return ret; } -// TODO(wenjinyu.wjy) (4.3)It needs to be added to trigger the tablet freezing operation int ObTXTransferUtils::set_tablet_freeze_flag(storage::ObLS &ls, ObTablet *tablet) { MDS_TG(10_ms); diff --git a/src/storage/tablet/ob_tablet.cpp b/src/storage/tablet/ob_tablet.cpp index 8c83b4266..66b3a2c43 100644 --- a/src/storage/tablet/ob_tablet.cpp +++ b/src/storage/tablet/ob_tablet.cpp @@ -4000,7 +4000,7 @@ int ObTablet::get_read_tables( return ret; } -// TODO (wenjinyu.wjy) need to be moved to ObLSTableService in 4.3 +// TODO (mwuei): need to be moved to ObLSTableService in 4.4 int ObTablet::get_src_tablet_read_tables_( const int64_t snapshot_version, const bool allow_no_ready_read, diff --git a/src/storage/tablet/ob_tablet_mds_data.cpp b/src/storage/tablet/ob_tablet_mds_data.cpp index bcd75f356..4c85e3f81 100644 --- a/src/storage/tablet/ob_tablet_mds_data.cpp +++ b/src/storage/tablet/ob_tablet_mds_data.cpp @@ -704,7 +704,7 @@ int ObTabletMdsData::init_for_merge_with_full_mds_data( const ObTabletFullMediumInfo &full_memory_medium_info_list, const int64_t finish_medium_scn) { - //TODO(xianzhi)/(muwei.ym) check it for migration/transfer + //TODO(muwei.ym) check it for migration/transfer int ret = OB_SUCCESS; if (OB_UNLIKELY(is_inited_)) {