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

[scn] mv definition of SCN to dir of share

Browse Source
This commit is contained in:
obdev
2022-11-28 02:50:55 +00:00
committed by ob-robot
parent 68151eb87a
commit 99d4f56fec
716 changed files with 7746 additions and 6117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
unittest/storage/test_dml_common.h
View File

@ -218,16 +218,16 @@ int TestDmlCommon::create_data_tablet(
} else {
transaction::ObMulSourceDataNotifyArg trans_flags;
trans_flags.tx_id_ = 123;
trans_flags.scn_ = palf::SCN::invalid_scn();
trans_flags.scn_ = share::SCN::invalid_scn();
trans_flags.for_replay_ = false;
ObLS *ls = ls_handle.get_ls();
if (OB_FAIL(ls->get_tablet_svr()->on_prepare_create_tablets(arg, trans_flags))) {
STORAGE_LOG(WARN, "failed to prepare create tablets", K(ret), K(arg));
} else if (FALSE_IT(trans_flags.scn_ = palf::SCN::minus(palf::SCN::max_scn(), 100))) {
} else if (FALSE_IT(trans_flags.scn_ = share::SCN::minus(share::SCN::max_scn(), 100))) {
} else if (OB_FAIL(ls->get_tablet_svr()->on_redo_create_tablets(arg, trans_flags))) {
STORAGE_LOG(WARN, "failed to redo create tablets", K(ret), K(arg));
} else if (FALSE_IT(trans_flags.scn_ = palf::SCN::plus(trans_flags.scn_, 1))) {
} else if (FALSE_IT(trans_flags.scn_ = share::SCN::plus(trans_flags.scn_, 1))) {
} else if (OB_FAIL(ls->get_tablet_svr()->on_commit_create_tablets(arg, trans_flags))) {
STORAGE_LOG(WARN, "failed to commit create tablets", K(ret), K(arg));
}
@ -246,15 +246,15 @@ int TestDmlCommon::create_data_and_index_tablets(
ObLSHandle ls_handle;
obrpc::ObBatchCreateTabletArg arg;
palf::SCN log_scn;
share::SCN log_scn;
if (OB_FAIL(create_ls(tenant_id, ls_id, ls_handle))) {
STORAGE_LOG(WARN, "failed to create ls", K(ret), K(tenant_id), K(ls_id));
} else if (OB_FAIL(build_mixed_tablets_arg(tenant_id, ls_id,
data_tablet_id, index_tablet_id_array, arg))) {
STORAGE_LOG(WARN, "failed to build pure data tablet arg", K(ret),
K(tenant_id), K(ls_id), K(data_tablet_id), K(index_tablet_id_array));
} else if (OB_FAIL(log_scn.convert_for_lsn_allocator(1))) {
STORAGE_LOG(WARN, "failed to convert_for_lsn_allocator", K(ret));
} else if (OB_FAIL(log_scn.convert_for_logservice(1))) {
STORAGE_LOG(WARN, "failed to convert_for_logservice", K(ret));
} else if (OB_FAIL(ls_handle.get_ls()->batch_create_tablets(arg, log_scn, true/*is_replay*/))) {
STORAGE_LOG(WARN, "failed to batch create tablets", K(ret), K(arg));
@ -591,7 +591,7 @@ int TestDmlCommon::build_pure_data_tablet_arg(
} else if (OB_FAIL(tablet_info.init(tablet_id_array, data_tablet_id, tablet_schema_index_array, lib::Worker::CompatMode::MYSQL, false))) {
STORAGE_LOG(WARN, "failed to init tablet info", K(ret), K(tablet_id_array),
K(data_tablet_id), K(tablet_schema_index_array));
} else if (OB_FAIL(arg.init_create_tablet(ls_id, palf::SCN::min_scn()))) {
} else if (OB_FAIL(arg.init_create_tablet(ls_id, share::SCN::min_scn()))) {
STORAGE_LOG(WARN, "failed to init create tablet", K(ret), K(tenant_id), K(ls_id));
} else if (OB_FAIL(arg.table_schemas_.push_back(table_schema))) {
STORAGE_LOG(WARN, "failed to push back table schema", K(ret), K(table_schema));
@ -643,7 +643,7 @@ int TestDmlCommon::build_mixed_tablets_arg(
} else if (OB_FAIL(tablet_info.init(tablet_id_array, data_tablet_id, tablet_schema_index_array, lib::Worker::CompatMode::MYSQL, false))) {
STORAGE_LOG(WARN, "failed to init tablet info", K(ret), K(tablet_id_array),
K(data_tablet_id), K(tablet_schema_index_array));
} else if (OB_FAIL(arg.init_create_tablet(ls_id, palf::SCN::min_scn()))) {
} else if (OB_FAIL(arg.init_create_tablet(ls_id, share::SCN::min_scn()))) {
STORAGE_LOG(WARN, "failed to init create tablet", K(ret), K(tenant_id), K(ls_id));
} else if (OB_FAIL(arg.table_schemas_.push_back(data_table_schema))) {
STORAGE_LOG(WARN, "failed to push back data table schema", K(ret), K(data_table_schema));