From 5f09352d33358f1dc9619eac41bfd5e859d6d439 Mon Sep 17 00:00:00 2001 From: joseph12138 <17862707376@163.com> Date: Thu, 14 Sep 2023 13:10:11 +0000 Subject: [PATCH] [4.x] set default value for some items --- .../backup/ob_backup_clean_scheduler.cpp | 2 +- .../backup/ob_backup_data_scheduler.cpp | 2 +- .../ddl_task/ob_modify_autoinc_task.cpp | 2 +- .../ob_balance_group_ls_stat_operator.cpp | 2 +- src/rootserver/ob_ddl_operator.cpp | 4 ++-- src/rootserver/ob_ddl_service.cpp | 22 +++++++++---------- .../ob_disaster_recovery_worker.cpp | 20 ++++++++--------- .../ob_ls_recovery_stat_handler.cpp | 4 ++-- src/rootserver/ob_partition_balance.cpp | 2 +- src/rootserver/ob_recovery_ls_service.cpp | 4 ++-- .../ob_tenant_role_transition_service.cpp | 2 +- ...pgrade_storage_format_version_executor.cpp | 2 +- src/share/ls/ob_ls_operator.cpp | 2 +- src/share/transfer/ob_transfer_info.cpp | 6 ++--- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/rootserver/backup/ob_backup_clean_scheduler.cpp b/src/rootserver/backup/ob_backup_clean_scheduler.cpp index f5605298f6..a15bedb6e8 100644 --- a/src/rootserver/backup/ob_backup_clean_scheduler.cpp +++ b/src/rootserver/backup/ob_backup_clean_scheduler.cpp @@ -248,7 +248,7 @@ int ObBackupCleanScheduler::build_task_( ObBackupScheduleTask *&task) { int ret = OB_SUCCESS; - int64_t task_deep_copy_size; + int64_t task_deep_copy_size = 0; void *raw_ptr = nullptr; ObBackupCleanLSTask tmp_task; if (OB_FAIL(tmp_task.build(task_attr, ls_task))) { diff --git a/src/rootserver/backup/ob_backup_data_scheduler.cpp b/src/rootserver/backup/ob_backup_data_scheduler.cpp index 2aa835f3b6..1b2f53e746 100644 --- a/src/rootserver/backup/ob_backup_data_scheduler.cpp +++ b/src/rootserver/backup/ob_backup_data_scheduler.cpp @@ -231,7 +231,7 @@ int ObBackupDataScheduler::do_build_task_( ObBackupScheduleTask *&task) { int ret = OB_SUCCESS; - int64_t task_deep_copy_size; + int64_t task_deep_copy_size = 0; void *raw_ptr = nullptr; if (OB_FAIL(tmp_task.build(job, set_task_attr, ls_task))) { LOG_WARN("[DATA_BACKUP]failed to build task", K(ret), K(job), K(ls_task)); diff --git a/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp b/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp index 855bf5ff56..8706074bd8 100644 --- a/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp +++ b/src/rootserver/ddl_task/ob_modify_autoinc_task.cpp @@ -329,7 +329,7 @@ int ObModifyAutoincTask::modify_autoinc() ret = OB_TABLE_NOT_EXIST; LOG_WARN("cannot find orig table", K(ret), K(alter_table_arg_)); } else { - int64_t alter_column_id; + int64_t alter_column_id = 0; ObTableSchema::const_column_iterator iter = alter_table_schema.column_begin(); ObTableSchema::const_column_iterator iter_end = alter_table_schema.column_end(); diff --git a/src/rootserver/ob_balance_group_ls_stat_operator.cpp b/src/rootserver/ob_balance_group_ls_stat_operator.cpp index 9bf63f4326..f85554edf5 100755 --- a/src/rootserver/ob_balance_group_ls_stat_operator.cpp +++ b/src/rootserver/ob_balance_group_ls_stat_operator.cpp @@ -345,7 +345,7 @@ int ObBalanceGroupLSStatOperator::delete_balance_group_ls_stat( { int ret = OB_SUCCESS; ObSqlString sql; - int64_t affected_rows; + int64_t affected_rows = 0; if (OB_UNLIKELY(!inited_)) { ret = OB_NOT_INIT; LOG_WARN("not init", KR(ret)); diff --git a/src/rootserver/ob_ddl_operator.cpp b/src/rootserver/ob_ddl_operator.cpp index 97a312eab9..cd7eb2a9d3 100644 --- a/src/rootserver/ob_ddl_operator.cpp +++ b/src/rootserver/ob_ddl_operator.cpp @@ -7098,7 +7098,7 @@ int ObDDLOperator::build_table_and_col_priv_array_for_revoke_all( { int ret = OB_SUCCESS; ObSEArray obj_priv_array; - uint64_t col_id; + uint64_t col_id = 0; CK (obj_priv_key.is_valid()); OZ (schema_guard.get_obj_privs_in_grantor_ur_obj_id(obj_priv_key.tenant_id_, obj_priv_key, @@ -7630,7 +7630,7 @@ int ObDDLOperator::get_flush_priv_array( const ObUserInfo &user_info) { int ret = OB_SUCCESS; - int64_t raw_priv; + int64_t raw_priv = 0; bool exists = false; need_flush = FALSE; diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index 2d8897573b..96c88483fa 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -14217,8 +14217,8 @@ int ObDDLService::drop_aux_table_in_truncate( const bool is_index = USER_INDEX == table_type; ObSEArray aux_vp_tid_array; ObSEArray simple_index_infos; - uint64_t lob_meta_table_id; - uint64_t lob_piece_table_id; + uint64_t lob_meta_table_id = 0; + uint64_t lob_piece_table_id = 0; int64_t N = 0; if (table_type == USER_INDEX) { if (OB_FAIL(orig_table_schema.get_simple_index_infos(simple_index_infos))) { @@ -19349,8 +19349,8 @@ int ObDDLService::flashback_aux_table( const uint64_t tenant_id = table_schema.get_tenant_id(); ObSEArray aux_vp_tid_array; ObSEArray simple_index_infos; - uint64_t lob_meta_table_id; - uint64_t lob_piece_table_id; + uint64_t lob_meta_table_id = 0; + uint64_t lob_piece_table_id = 0; int64_t N = 0; if (table_type == USER_INDEX) { if (OB_FAIL(table_schema.get_simple_index_infos(simple_index_infos))) { @@ -24723,7 +24723,7 @@ int ObDDLService::check_rename_object_type( RenameOracleObjectType &obj_type) { int ret = OB_SUCCESS; - uint64_t sequence_id; + uint64_t sequence_id = 0; bool sequence_exist = false; bool is_system_generated = false; obj_type = RENAME_TYPE_INVALID; @@ -27683,7 +27683,7 @@ int ObDDLService::grant_sys_priv_to_ur( int64_t refreshed_schema_version = 0; const ObUserInfo *user_info = NULL; ObSysPriv *sys_priv = NULL; - uint64_t grantee_id; + uint64_t grantee_id = 0; ObSArray users_name; ObSArray hosts_name; @@ -27780,7 +27780,7 @@ int ObDDLService::grant_table_and_col_privs_to_user( schema_guard)); /* 2. deal with cols privs */ /* 2.1 reorg privs according to colid */ - uint64_t colid; + uint64_t colid = 0; ObRawObjPrivArray obj_priv_array; for (int i = 0; i < arg.ins_col_ids_.count() && OB_SUCC(ret); i++) { obj_priv_array.reset(); @@ -28497,7 +28497,7 @@ int ObDDLService::build_need_flush_role_array( ObIArray &disable_flag_array) { int ret = OB_SUCCESS; - uint64_t role_id; + uint64_t role_id = 0; uint64_t target_disable_flag = 0; uint64_t org_disable_flag = 0; ObSEArray org_role_id_array; @@ -29488,9 +29488,9 @@ int ObDDLService::alter_outline_in_trans(const obrpc::ObAlterOutlineArg &arg) int ObDDLService::alter_outline(const obrpc::ObAlterOutlineArg &alter_outline_arg) { int ret = OB_SUCCESS; - int64_t start_usec; - int64_t end_usec; - int64_t cost_usec; + int64_t start_usec = 0; + int64_t end_usec = 0; + int64_t cost_usec = 0; const uint64_t tenant_id = alter_outline_arg.alter_outline_info_.get_tenant_id(); start_usec = ObTimeUtility::current_time(); if (OB_FAIL(check_inner_stat())) { diff --git a/src/rootserver/ob_disaster_recovery_worker.cpp b/src/rootserver/ob_disaster_recovery_worker.cpp index 6d348dd11f..5f39a836f8 100755 --- a/src/rootserver/ob_disaster_recovery_worker.cpp +++ b/src/rootserver/ob_disaster_recovery_worker.cpp @@ -2510,8 +2510,8 @@ int ObDRWorker::do_single_replica_permanent_offline_( } else if (is_offline) { FLOG_INFO("found ls replica need to permanent offline", K(tenant_id), K(ls_id), K(member_to_remove), K(replica_type), K(dr_ls_info)); share::ObTaskId task_id; - int64_t new_paxos_replica_number; - int64_t old_paxos_replica_number; + int64_t new_paxos_replica_number = 0; + int64_t old_paxos_replica_number = 0; common::ObAddr leader_addr; const common::ObAddr source_server; // not useful const bool need_check_has_leader_while_remove_replica = ObReplicaTypeCheck::is_paxos_replica_V2(replica_type); @@ -2808,14 +2808,14 @@ int ObDRWorker::generate_migrate_ls_task( } else { ObDRTaskKey task_key; bool task_exist = false; - uint64_t tenant_id; + uint64_t tenant_id = 0; share::ObLSID ls_id; share::ObTaskId task_id; ObReplicaMember data_source; int64_t data_size = 0; bool skip_change_member_list = false; ObDstReplica dst_replica; - int64_t old_paxos_replica_number; + int64_t old_paxos_replica_number = 0; const bool need_check_has_leader_while_remove_replica = false; const bool is_high_priority_task = true; bool can_generate = false; @@ -3622,8 +3622,8 @@ int ObDRWorker::try_remove_readonly_replica_for_deleting_unit_( LOG_WARN("invalid argument", KR(ret), K(ls_replica)); } else { share::ObTaskId task_id; - int64_t new_paxos_replica_number; - int64_t old_paxos_replica_number; + int64_t new_paxos_replica_number = 0; + int64_t old_paxos_replica_number = 0; common::ObAddr leader_addr; const common::ObAddr source_server; // not useful const bool need_check_has_leader_while_remove_replica = false; @@ -3797,7 +3797,7 @@ int ObDRWorker::try_type_transform_for_deleting_unit_( // try to generate type transform task share::ObTaskId task_id; ObDRTaskKey task_key; - uint64_t tenant_id; + uint64_t tenant_id = 0; share::ObLSID ls_id; common::ObAddr leader_addr; int64_t old_paxos_replica_number = 0; @@ -4254,7 +4254,7 @@ int ObDRWorker::try_cancel_unit_migration( LOG_WARN("fail to check need generate cancel unit migration task", KR(ret)); } else if (need_generate) { share::ObTaskId task_id; - uint64_t tenant_id; + uint64_t tenant_id = 0; share::ObLSID ls_id; common::ObAddr leader_addr; int64_t old_paxos_replica_number = 0; @@ -4554,14 +4554,14 @@ int ObDRWorker::try_migrate_to_unit( is_unit_in_group_related))) { LOG_WARN("fail to check need generate migrate to unit task", KR(ret)); } else if (need_generate) { - uint64_t tenant_id; + uint64_t tenant_id = 0; share::ObLSID ls_id; share::ObTaskId task_id; ObReplicaMember data_source; int64_t data_size = 0; ObDstReplica dst_replica; bool skip_change_member_list = false; - int64_t old_paxos_replica_number; + int64_t old_paxos_replica_number = 0; bool can_generate = false; const bool need_check_has_leader_while_remove_replica = false; const bool is_high_priority_task = false; diff --git a/src/rootserver/ob_ls_recovery_stat_handler.cpp b/src/rootserver/ob_ls_recovery_stat_handler.cpp index 7f13d43e28..79bdc2b3e3 100755 --- a/src/rootserver/ob_ls_recovery_stat_handler.cpp +++ b/src/rootserver/ob_ls_recovery_stat_handler.cpp @@ -185,7 +185,7 @@ int ObLSRecoveryStatHandler::do_get_ls_level_readable_scn_(SCN &read_scn) { int ret = OB_SUCCESS; palf::AccessMode access_mode; - int64_t unused_mode_version; + int64_t unused_mode_version = 0; share::SCN majority_min_readable_scn = SCN::min_scn(); read_scn = SCN::min_scn(); @@ -385,7 +385,7 @@ int ObLSRecoveryStatHandler::do_get_majority_readable_scn_( const auto member = ob_member_list.at(i); bool alive = true; - int64_t trace_time; + int64_t trace_time = 0; if (OB_FAIL(rootserver::ObRootUtils::get_rs_default_timeout_ctx(ctx))) { LOG_WARN("fail to get timeout ctx", KR(ret), K(ctx)); } else if (OB_UNLIKELY(!member.is_valid())) { diff --git a/src/rootserver/ob_partition_balance.cpp b/src/rootserver/ob_partition_balance.cpp index 1c9bd867c0..bebf0bc4c9 100644 --- a/src/rootserver/ob_partition_balance.cpp +++ b/src/rootserver/ob_partition_balance.cpp @@ -788,7 +788,7 @@ int ObPartitionBalance::save_balance_group_stat_() int ret = OB_SUCCESS; ObMySQLTransaction trans; ObSqlString sql; - int64_t affected_rows; + int64_t affected_rows = 0; ObTimeoutCtx ctx; int64_t start_time = ObTimeUtility::current_time(); if (!inited_) { diff --git a/src/rootserver/ob_recovery_ls_service.cpp b/src/rootserver/ob_recovery_ls_service.cpp index f0b1f391ee..87a2ff4250 100755 --- a/src/rootserver/ob_recovery_ls_service.cpp +++ b/src/rootserver/ob_recovery_ls_service.cpp @@ -1179,8 +1179,8 @@ void ObRecoveryLSService::try_update_primary_ip_list() ObRestoreSourceServiceAttr service_attr; ObMySQLTransaction trans; ObSqlString user_and_tenant; - int64_t primary_cluster_id; - uint64_t primary_tenant_id; + int64_t primary_cluster_id = 0; + uint64_t primary_tenant_id = 0; char passwd[OB_MAX_PASSWORD_LENGTH + 1] = { 0 }; //unencrypted password if (OB_FAIL(restore_source_mgr.init(tenant_id_, proxy_))) { diff --git a/src/rootserver/ob_tenant_role_transition_service.cpp b/src/rootserver/ob_tenant_role_transition_service.cpp index b4c56f52bf..e634f3b6b3 100644 --- a/src/rootserver/ob_tenant_role_transition_service.cpp +++ b/src/rootserver/ob_tenant_role_transition_service.cpp @@ -1433,7 +1433,7 @@ void ObTenantRoleTransitionService::broadcast_tenant_info(const char* const log_ obrpc::ObRefreshTenantInfoArg arg; const ObUnit &unit = units.at(i); bool alive = true; - int64_t trace_time; + int64_t trace_time = 0; if (OB_FAIL(GCTX.server_tracer_->is_alive(unit.server_, alive, trace_time))) { LOG_WARN("check server alive failed", KR(ret), K(unit)); } else if (!alive) { diff --git a/src/rootserver/ob_upgrade_storage_format_version_executor.cpp b/src/rootserver/ob_upgrade_storage_format_version_executor.cpp index a04e4cc7d0..0dd7aae975 100644 --- a/src/rootserver/ob_upgrade_storage_format_version_executor.cpp +++ b/src/rootserver/ob_upgrade_storage_format_version_executor.cpp @@ -159,7 +159,7 @@ int ObUpgradeStorageFormatVersionExecutor::execute() ret = OB_ERR_UNEXPECTED; LOG_WARN("job is is invalid", K(ret), K(job_id)); } else { - int64_t cur_version; + int64_t cur_version = 0; if (OB_FAIL(root_service_->get_zone_mgr().get_storage_format_version(cur_version))) { LOG_WARN("fail to get current version", K(ret), K(cur_version)); } else if (cur_version >= OB_STORAGE_FORMAT_VERSION_MAX - 1) { diff --git a/src/share/ls/ob_ls_operator.cpp b/src/share/ls/ob_ls_operator.cpp index 1e7a831e59..c029194f9e 100755 --- a/src/share/ls/ob_ls_operator.cpp +++ b/src/share/ls/ob_ls_operator.cpp @@ -926,7 +926,7 @@ int ObLSAttrOperator::get_random_normal_user_ls( } else { SMART_VAR(ObISQLClient::ReadResult, result) { ObSqlString sql; - int64_t int_ls_id; + int64_t int_ls_id = 0; common::sqlclient::ObMySQLResult *res; if (OB_FAIL(sql.assign_fmt( "select ls_id from %s where ls_id > %ld and status = '%s' and flag = '%s' order by rand() limit 1", diff --git a/src/share/transfer/ob_transfer_info.cpp b/src/share/transfer/ob_transfer_info.cpp index c28aa64ba8..e5c2b1e519 100644 --- a/src/share/transfer/ob_transfer_info.cpp +++ b/src/share/transfer/ob_transfer_info.cpp @@ -191,7 +191,7 @@ int ObTransferTabletInfo::init( int ObTransferTabletInfo::parse_from_display_str(const common::ObString &str) { int ret = OB_SUCCESS; - uint64_t tablet_id; + uint64_t tablet_id = 0; errno = 0; if (OB_UNLIKELY(2 != sscanf(str.ptr(), "%lu:%ld", &tablet_id, &transfer_seq_))) { ret = OB_INVALID_ARGUMENT; @@ -281,7 +281,7 @@ bool ObTransferPartInfo::operator==(const ObTransferPartInfo &other) const int ObDisplayTabletID::parse_from_display_str(const common::ObString &str) { int ret = OB_SUCCESS; - uint64_t tablet_id; + uint64_t tablet_id = 0; errno = 0; if (OB_UNLIKELY(1 != sscanf(str.ptr(), "%lu", &tablet_id))) { ret = OB_INVALID_ARGUMENT; @@ -749,4 +749,4 @@ int ObTransferLockUtil::process_table_lock_on_tablets_( LOG_WARN("invalid lock arg", KR(ret), K(lock_arg)); } return ret; -} \ No newline at end of file +}