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

[FEAT MERGE] New upgrade framework for 4.x

Browse Source
This commit is contained in:
tino247
2022-12-29 11:40:25 +00:00
committed by ob-robot
parent b39b8c45f0
commit a6098ccbc6
106 changed files with 6140 additions and 3227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/ob_freeze_info_proxy.cpp
View File

@ -37,7 +37,7 @@ namespace share
{
OB_SERIALIZE_MEMBER(ObSimpleFrozenStatus, frozen_scn_,
schema_version_, cluster_version_);
schema_version_, data_version_);
int ObFreezeInfoProxy::get_freeze_info(
ObISQLClient &sql_proxy,
@ -181,7 +181,7 @@ int ObFreezeInfoProxy::set_freeze_info(
ret = OB_INVALID_ARGUMENT;
LOG_ERROR("invalid argument", KR(ret), K(frozen_status), K_(tenant_id));
} else if (OB_FAIL(dml.add_uint64_pk_column("frozen_scn", frozen_status.frozen_scn_.get_val_for_inner_table_field()))
|| OB_FAIL(dml.add_column("cluster_version", frozen_status.cluster_version_))
|| OB_FAIL(dml.add_column("cluster_version", frozen_status.data_version_))
|| OB_FAIL(dml.add_column("schema_version", frozen_status.schema_version_))) {
LOG_WARN("fail to add column", KR(ret), K(frozen_status), K_(tenant_id));
} else if (OB_FAIL(exec.exec_insert(OB_ALL_FREEZE_INFO_TNAME, dml, affected_rows))) {
@ -388,7 +388,7 @@ int ObFreezeInfoProxy::construct_frozen_status_(
int ret = OB_SUCCESS;
uint64_t frozen_scn_val = OB_INVALID_SCN_VAL;
EXTRACT_UINT_FIELD_MYSQL(result, "frozen_scn", frozen_scn_val, uint64_t);
EXTRACT_INT_FIELD_MYSQL(result, "cluster_version", frozen_status.cluster_version_, int64_t);
EXTRACT_INT_FIELD_MYSQL(result, "cluster_version", frozen_status.data_version_, int64_t);
EXTRACT_INT_FIELD_MYSQL(result, "schema_version", frozen_status.schema_version_, int64_t);
if (FAILEDx(frozen_status.frozen_scn_.convert_for_inner_table_field(frozen_scn_val))) {
LOG_WARN("fail to convert val to SCN", KR(ret), K(frozen_scn_val));