hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add placeholder for backup cluster and tenant parameter data.

Browse Source
This commit is contained in:
obdev
2024-05-28 11:42:30 +00:00
committed by ob-robot
parent 48ff369f14
commit d6ada56d95
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/objit/include/objit/common/ob_item_type.h
View File

@ -2513,6 +2513,7 @@ typedef enum ObItemType
T_VEC_INDEX_PARAMS,
T_VEC_INDEX_COLUMN,
T_VEC_INDEX_COLUMN_EXPR,
T_BACKUP_CLUSTER_PARAMETERS,
T_MAX //Attention: add a new type before T_MAX
} ObItemType;

1
src/sql/resolver/ob_stmt_type.h
View File

@ -343,6 +343,7 @@ OB_STMT_TYPE_DEF_UNKNOWN_AT(T_ADMIN_STORAGE, get_sys_tenant_alter_system_priv, 3
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_EVENT_JOB_CREATE, no_priv_needed, 343)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_EVENT_JOB_ALTER, no_priv_needed, 344)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_EVENT_JOB_DROP, no_priv_needed, 345)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_BACKUP_CLUSTER_PARAMETERS, get_sys_tenant_alter_system_priv, 346)
OB_STMT_TYPE_DEF_UNKNOWN_AT(T_MAX, err_stmt_type_priv, 500)
#endif

16
src/storage/backup/ob_backup_data_store.cpp
View File

@ -76,6 +76,20 @@ bool ObBackupDeletedTabletToLSDesc::is_valid() const
return true;
}
/*
*------------------------------ObBackupResourcePool----------------------------------------
*/
int ObBackupResourcePool::assign(const ObBackupResourcePool &that)
{
int ret = OB_SUCCESS;
if (OB_FAIL(resource_pool_.assign(that.resource_pool_))) {
LOG_WARN("failed to assign resource pool", K(ret));
} else if (OB_FAIL(unit_config_.assign(that.unit_config_))) {
LOG_WARN("failed to assign unit config", K(ret));
}
return ret;
}
/*
*------------------------------ObExternTenantLocalityInfo----------------------------
*/
@ -99,6 +113,8 @@ int ObExternTenantLocalityInfoDesc::assign(const ObExternTenantLocalityInfoDesc
int ret = OB_SUCCESS;
if (OB_FAIL(sys_time_zone_wrap_.deep_copy(that.sys_time_zone_wrap_))) {
LOG_WARN("failed to deep copy", K(ret));
} else if (OB_FAIL(resource_pool_infos_.assign(that.resource_pool_infos_))) {
LOG_WARN("failed to assign resource pool infos", K(ret));
} else {
tenant_id_ = that.tenant_id_;
backup_set_id_ = that.backup_set_id_;

17
src/storage/backup/ob_backup_data_store.h
View File

@ -119,6 +119,19 @@ public:
bool is_valid() const override { return true; }
};
struct ObBackupResourcePool
{
public:
ObBackupResourcePool()
: resource_pool_(),
unit_config_() {}
int assign(const ObBackupResourcePool &that);
TO_STRING_KV(K_(resource_pool), K_(unit_config));
public:
share::ObResourcePool resource_pool_;
share::ObUnitConfig unit_config_;
};
struct ObExternTenantLocalityInfoDesc final : public ObExternBackupDataDesc
{
public:
@ -141,7 +154,8 @@ public:
locality_(),
primary_zone_(),
sys_time_zone_(),
sys_time_zone_wrap_() {}
sys_time_zone_wrap_(),
resource_pool_infos_() {}
virtual ~ObExternTenantLocalityInfoDesc() {}
int assign(const ObExternTenantLocalityInfoDesc &that);
bool is_valid() const override;
@ -159,6 +173,7 @@ public:
PrimaryZone primary_zone_;
TimeZone sys_time_zone_;
ObTimeZoneInfoWrap sys_time_zone_wrap_;
common::ObSArray<ObBackupResourcePool> resource_pool_infos_;
};
struct ObExternBackupSetInfoDesc final : public ObExternBackupDataDesc