diff --git a/src/rootserver/backup/ob_archive_scheduler_service.cpp b/src/rootserver/backup/ob_archive_scheduler_service.cpp index ea7a21d67b..e3583db3fb 100644 --- a/src/rootserver/backup/ob_archive_scheduler_service.cpp +++ b/src/rootserver/backup/ob_archive_scheduler_service.cpp @@ -309,7 +309,7 @@ int ObArchiveSchedulerService::start_tenant_archive_(const uint64_t tenant_id) { int ret = OB_SUCCESS; ObArchiveHandler archive_handler; - // TODO: wangxiaohui.wxh, start specific dest archive. + // Only one dest is supported. const int64_t dest_no = 0; if (OB_FAIL(archive_handler.init(tenant_id, *server_mgr_, *zone_mgr_, *unit_mgr_, schema_service_, *rpc_proxy_, *sql_proxy_))) { LOG_WARN("failed to init archive_handler", K(ret)); @@ -326,7 +326,7 @@ int ObArchiveSchedulerService::stop_tenant_archive_(const uint64_t tenant_id) { int ret = OB_SUCCESS; ObArchiveHandler archive_handler; - // TODO: wangxiaohui.wxh, stop specific dest archive. + // Only one dest is supported. const int64_t dest_no = 0; if (OB_FAIL(archive_handler.init(tenant_id, *server_mgr_, *zone_mgr_, *unit_mgr_, schema_service_, *rpc_proxy_, *sql_proxy_))) { LOG_WARN("failed to init archive_handler", K(ret), K(tenant_id)); diff --git a/src/rootserver/backup/ob_tenant_archive_scheduler.cpp b/src/rootserver/backup/ob_tenant_archive_scheduler.cpp index 611df86956..1b4a601cfe 100644 --- a/src/rootserver/backup/ob_tenant_archive_scheduler.cpp +++ b/src/rootserver/backup/ob_tenant_archive_scheduler.cpp @@ -134,7 +134,7 @@ static int record_piece_checkpoint(const ObTenantArchivePieceAttr &piece_info, c && ObBackupFileStatus::STATUS::BACKUP_FILE_AVAILABLE == piece_info.file_status_)) { } else { // persist piece checkpoint - // TODO: wangxiaohui.wxh, change overwrite to append. + // TODO: change overwrite to append ObPieceCheckpointDesc checkpoint_desc; checkpoint_desc.tenant_id_ = piece_info.key_.tenant_id_; checkpoint_desc.dest_id_ = piece_info.key_.dest_id_; @@ -671,7 +671,7 @@ int ObArchiveHandler::do_checkpoint_(share::ObTenantArchiveRoundAttr &round_info int ObArchiveHandler::notify_(const ObTenantArchiveRoundAttr &round) { int ret = OB_SUCCESS; - // TODO: wangxiaohui.wxh notify each log stream. + // TODO: notify each log stream. UNUSED(round); // Get all log streams, and try the best to notify each log stream event of archive start. return ret; diff --git a/src/share/backup/ob_archive_persist_helper.cpp b/src/share/backup/ob_archive_persist_helper.cpp index 2bf23e128e..3c4479829c 100644 --- a/src/share/backup/ob_archive_persist_helper.cpp +++ b/src/share/backup/ob_archive_persist_helper.cpp @@ -215,7 +215,6 @@ int ObArchivePersistHelper::get_piece_switch_interval( } else if (OB_FAIL(dest_attr.set_piece_switch_interval(value.ptr()))) { LOG_WARN("fail to set piece switch interval", K(ret), K(value)); } else { - // TODO: need to adjust piece_switch_interval = dest_attr.piece_switch_interval_; } return ret; diff --git a/src/share/backup/ob_backup_config.cpp b/src/share/backup/ob_backup_config.cpp index 90df7830be..b705a32e29 100644 --- a/src/share/backup/ob_backup_config.cpp +++ b/src/share/backup/ob_backup_config.cpp @@ -384,7 +384,7 @@ int ObDataBackupDestConfigParser::update_inner_config_table(common::ObISQLClient ObBackupDestMgr dest_mgr; share::ObBackupPathString backup_dest; ObBackupDestType::TYPE dest_type = ObBackupDestType::TYPE::DEST_TYPE_BACKUP_DATA; - // TODO: wangxiaohui.wxh, handle trans failed after write format file. + // TODO: handle trans failed after write format file. if (!type_.is_valid() || 1 != config_items_.count() ) { ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid parser", K(ret), KPC(this)); @@ -489,7 +489,7 @@ int ObLogArchiveDestConfigParser::update_archive_dest_config_(common::ObISQLClie LOG_WARN("fail to gen archive config items", K(ret)); } - // TODO: wangxiaohui.wxh, handle trans failed after write format file. + // TODO: handle trans failed after write format file. ARRAY_FOREACH_X(config_items_, i, cnt, OB_SUCC(ret)) { const BackupConfigItemPair &config_item = config_items_.at(i); if (OB_FAIL(helper.set_kv_item(trans, dest_no_, config_item.key_, config_item.value_))) { diff --git a/src/share/backup/ob_backup_connectivity.cpp b/src/share/backup/ob_backup_connectivity.cpp index 19b613a309..3260551716 100644 --- a/src/share/backup/ob_backup_connectivity.cpp +++ b/src/share/backup/ob_backup_connectivity.cpp @@ -354,7 +354,9 @@ int ObBackupCheckFile::generate_format_desc_(const share::ObBackupDest &dest, sh int ret = OB_SUCCESS; schema::ObSchemaGetterGuard schema_guard; const schema::ObTenantSchema *tenant_schema = nullptr; - // TODO: wangxiaohui.wxh, pass GCONF and GCTX to class. + + // TODO: pass GCONF and GCTX to class. + if (OB_ISNULL(GCTX.schema_service_)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("invalid argument", K(ret), K(GCTX.schema_service_)); diff --git a/src/share/backup/ob_backup_manager.cpp b/src/share/backup/ob_backup_manager.cpp index 26d0d82501..de7837c958 100644 --- a/src/share/backup/ob_backup_manager.cpp +++ b/src/share/backup/ob_backup_manager.cpp @@ -787,7 +787,9 @@ int ObBackupInfoChecker::get_item_count_(const uint64_t tenant_id, int64_t &item int ObBackupInfoChecker::get_status_line_count_(const uint64_t tenant_id, int64_t &status_count) { int ret = OB_SUCCESS; - // TODO: wangxiaohui.wxh, to remove + + // TODO: to remove. + #if 0 ObSqlString sql; SMART_VAR(ObMySQLProxy::ReadResult, res) { @@ -929,7 +931,7 @@ int ObBackupInfoChecker::insert_log_archive_status_( common::ObMySQLTransaction &trans, const uint64_t tenant_id) { int ret = OB_SUCCESS; - // TODO: wangxiaohui.wxh, to remove + // TODO: to remove. #if 0 ObSqlString sql; int64_t affected_rows = -1; diff --git a/src/share/backup/ob_backup_operator.h b/src/share/backup/ob_backup_operator.h index acd46e76d2..33c691efb6 100644 --- a/src/share/backup/ob_backup_operator.h +++ b/src/share/backup/ob_backup_operator.h @@ -85,7 +85,7 @@ private: }; -// TODO(wangxiaohui.wxh): move functions in ObBackupInfoOperator into ObTenantBackupInfoOperation. + // TODO: merge ObBackupInfoOperator into ObTenantBackupInfoOperation. class ObBackupInfoOperator final { public: diff --git a/src/share/backup/ob_backup_serialize_provider.h b/src/share/backup/ob_backup_serialize_provider.h index fb53eb1f82..b2caec6527 100644 --- a/src/share/backup/ob_backup_serialize_provider.h +++ b/src/share/backup/ob_backup_serialize_provider.h @@ -38,7 +38,7 @@ public: // Wrapper backup serialize data with common backup header. -// TODO: wangxiaohui.wxh, support deserialize according to different version. + // TODO: support deserialize according to different version. class ObBackupSerializeHeaderWrapper final : public ObIBackupSerializeProvider { public: diff --git a/src/share/backup/ob_backup_store.cpp b/src/share/backup/ob_backup_store.cpp index 1e0ed7922e..b83560be42 100644 --- a/src/share/backup/ob_backup_store.cpp +++ b/src/share/backup/ob_backup_store.cpp @@ -500,7 +500,7 @@ int ObBackupDestMgr::generate_format_desc_( schema::ObSchemaGetterGuard schema_guard; share::ObBackupPathString root_path; const schema::ObTenantSchema *tenant_schema = nullptr; - // TODO: wangxiaohui.wxh, pass GCONF and GCTX to class. + // TODO: pass GCONF and GCTX to class. if (OB_ISNULL(GCTX.schema_service_)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("invalid argument", K(ret), K(GCTX.schema_service_)); diff --git a/src/share/backup/ob_tenant_archive_mgr.cpp b/src/share/backup/ob_tenant_archive_mgr.cpp index 2386706ad2..f07d29a9a5 100644 --- a/src/share/backup/ob_tenant_archive_mgr.cpp +++ b/src/share/backup/ob_tenant_archive_mgr.cpp @@ -22,7 +22,7 @@ using namespace share; // round op int ObTenantArchiveMgr::get_tenant_current_round(const int64_t tenant_id, const int64_t incarnation, ObTenantArchiveRoundAttr &round_attr) { - // TODO: fix get round from other channel + // Only one dest is supported now. const int64_t fake_dest_no = 0; return get_dest_round_by_dest_no(tenant_id, fake_dest_no, round_attr); } diff --git a/src/share/restore/ob_restore_uri_parser.h b/src/share/restore/ob_restore_uri_parser.h index 083456b6b0..0db07eba8f 100644 --- a/src/share/restore/ob_restore_uri_parser.h +++ b/src/share/restore/ob_restore_uri_parser.h @@ -68,7 +68,6 @@ class ObPhysicalRestoreUriParser public: ObPhysicalRestoreUriParser() = default; ~ObPhysicalRestoreUriParser() = default; - // TODO: wangxiaohui.wxh, filter same path static int parse( const common::ObString &multi_uri, common::ObArenaAllocator &allocator,