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

[SCN] adjust ObBatchCreateTabletArg

Browse Source
This commit is contained in:
obdev
2022-11-28 02:40:26 +00:00
committed by ob-robot
parent 4c49f6e7c5
commit c538314fd7
62 changed files with 391 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rootserver/ob_tablet_creator.cpp
View File

@ -108,7 +108,7 @@ DEF_TO_STRING(ObTabletCreatorArg)
/////////////////////////////////////////////////////////
int ObBatchCreateTabletHelper::init(const share::ObLSID &ls_key, const int64_t tenant_id,
const int64_t frozen_timestamp)
const palf::SCN &major_frozen_scn)
{
int ret = OB_SUCCESS;
const int64_t bucket_count = hash::cal_next_prime(100);
@ -117,8 +117,8 @@ int ObBatchCreateTabletHelper::init(const share::ObLSID &ls_key, const int64_t t
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(tenant_id), K(ls_key));
} else if (OB_FAIL(arg_.init_create_tablet(ls_key,
frozen_timestamp))) {
LOG_WARN("failed to init create tablet", KR(ret), K(tenant_id), K(ls_key), K(frozen_timestamp));
major_frozen_scn))) {
LOG_WARN("failed to init create tablet", KR(ret), K(tenant_id), K(ls_key), K(major_frozen_scn));
} else if (OB_FAIL(table_schemas_map_.create(bucket_count, "CreateTablet", "CreateTablet"))) {
LOG_WARN("failed to create hashmap", KR(ret));
}
@ -252,7 +252,7 @@ int ObTabletCreator::add_create_tablet_arg(const ObTabletCreatorArg &arg)
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to allocate new arg", KR(ret), KP(batch_arg));
} else if (FALSE_IT(batch_arg = new (arg_buf)ObBatchCreateTabletHelper())) {
} else if (OB_FAIL(batch_arg->init(arg.ls_key_, tenant_id_, frozen_timestamp_))) {
} else if (OB_FAIL(batch_arg->init(arg.ls_key_, tenant_id_, major_frozen_scn_))) {
LOG_WARN("failed to init batch arg helper", KR(ret), K(arg));
} else if (OB_FAIL(args_map_.set_refactored(arg.ls_key_, batch_arg, 0/*not overwrite*/))) {
LOG_WARN("fail to set refactored", KR(ret), K(arg));
@ -271,7 +271,7 @@ int ObTabletCreator::add_create_tablet_arg(const ObTabletCreatorArg &arg)
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to allocate new arg", KR(ret));
} else if (FALSE_IT(new_arg = new (arg_buf)ObBatchCreateTabletHelper())) {
} else if (OB_FAIL(new_arg->init(arg.ls_key_, tenant_id_, frozen_timestamp_))) {
} else if (OB_FAIL(new_arg->init(arg.ls_key_, tenant_id_, major_frozen_scn_))) {
LOG_WARN("failed to init batch arg helper", KR(ret), K(arg));
} else if (FALSE_IT(new_arg->next_ = batch_arg)) {
} else if (OB_FAIL(args_map_.set_refactored(arg.ls_key_, new_arg, 1/*not overwrite*/))) {