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

[CP] add timeout param for estimation related interfaces

Browse Source
This commit is contained in:
hiddenbomb
2024-02-06 19:59:58 +00:00
committed by ob-robot
parent e1eda7c927
commit 01729c848d
13 changed files with 106 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/storage/ls/ob_ls_tablet_service.cpp
View File

@ -2262,6 +2262,7 @@ int ObLSTabletService::check_read_info_same(const AllowToReadMgr::AllowToReadInf
int ObLSTabletService::get_read_tables(
const common::ObTabletID &tablet_id,
const int64_t timeout_us,
const int64_t snapshot_version,
ObTabletTableIterator &iter,
const bool allow_no_ready_read)
@ -2285,17 +2286,16 @@ int ObLSTabletService::get_read_tables(
LOG_WARN("ls is not allow to read", K(ret), KPC(ls_));
} else if (FALSE_IT(key.ls_id_ = ls_->get_ls_id())) {
} else if (OB_FAIL(ObTabletCreateDeleteHelper::check_and_get_tablet(key, handle,
ObTabletCommon::DEFAULT_GET_TABLET_DURATION_US,
timeout_us,
ObMDSGetTabletMode::READ_READABLE_COMMITED,
snapshot_version))) {
if (OB_TABLET_NOT_EXIST != ret) {
LOG_WARN("fail to check and get tablet", K(ret), K(key), K(snapshot_version));
LOG_WARN("fail to check and get tablet", K(ret), K(key), K(timeout_us), K(snapshot_version));
}
} else if (OB_UNLIKELY(!handle.is_valid())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error, invalid tablet handle", K(ret), K(handle));
} else if (OB_FAIL(handle.get_obj()->get_read_tables(snapshot_version, iter,
allow_no_ready_read))) {
} else if (OB_FAIL(handle.get_obj()->get_read_tables(snapshot_version, iter, allow_no_ready_read))) {
LOG_WARN("fail to get read tables", K(ret), K(handle), K(tablet_id), K(snapshot_version),
K(iter), K(allow_no_ready_read));
} else {
@ -5609,7 +5609,8 @@ int ObLSTabletService::get_ls_min_end_scn(
}
int ObLSTabletService::get_multi_ranges_cost(
const ObTabletID &tablet_id,
const common::ObTabletID &tablet_id,
const int64_t timeout_us,
const common::ObIArray<common::ObStoreRange> &ranges,
int64_t &total_size)
{
@ -5620,7 +5621,7 @@ int ObLSTabletService::get_multi_ranges_cost(
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("not inited", K(ret));
} else if (OB_FAIL(get_read_tables(tablet_id, max_snapshot_version, iter))) {
} else if (OB_FAIL(get_read_tables(tablet_id, timeout_us, max_snapshot_version, iter))) {
LOG_WARN("fail to get all read tables", K(ret), K(tablet_id), K(max_snapshot_version));
} else {
ObPartitionMultiRangeSpliter spliter;
@ -5636,7 +5637,8 @@ int ObLSTabletService::get_multi_ranges_cost(
}
int ObLSTabletService::split_multi_ranges(
const ObTabletID &tablet_id,
const common::ObTabletID &tablet_id,
const int64_t timeout_us,
const ObIArray<ObStoreRange> &ranges,
const int64_t expected_task_count,
common::ObIAllocator &allocator,
@ -5649,7 +5651,7 @@ int ObLSTabletService::split_multi_ranges(
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("not inited", K(ret));
} else if (OB_FAIL(get_read_tables(tablet_id, max_snapshot_version, iter))) {
} else if (OB_FAIL(get_read_tables(tablet_id, timeout_us, max_snapshot_version, iter))) {
LOG_WARN("fail to get all read tables", K(ret), K(tablet_id), K(max_snapshot_version));
} else {
ObPartitionMultiRangeSpliter spliter;
@ -5670,7 +5672,8 @@ int ObLSTabletService::split_multi_ranges(
int ObLSTabletService::estimate_row_count(
const ObTableScanParam &param,
const ObTableScanRange &scan_range,
ObIArray<ObEstRowCountRecord> &est_records,
const int64_t timeout_us,
common::ObIArray<ObEstRowCountRecord> &est_records,
int64_t &logical_row_count,
int64_t &physical_row_count)
{
@ -5689,7 +5692,7 @@ int ObLSTabletService::estimate_row_count(
} else {
const int64_t snapshot_version = -1 == param.frozen_version_ ?
GET_BATCH_ROWS_READ_SNAPSHOT_VERSION : param.frozen_version_;
if (OB_FAIL(get_read_tables(param.tablet_id_, snapshot_version, tablet_iter, false))) {
if (OB_FAIL(get_read_tables(param.tablet_id_, timeout_us, snapshot_version, tablet_iter, false))) {
if (OB_TABLET_NOT_EXIST != ret) {
LOG_WARN("failed to get tablet_iter", K(ret), K(snapshot_version), K(param));
}
@ -5736,6 +5739,7 @@ int ObLSTabletService::estimate_row_count(
int ObLSTabletService::estimate_block_count_and_row_count(
const common::ObTabletID &tablet_id,
const int64_t timeout_us,
int64_t &macro_block_count,
int64_t &micro_block_count,
int64_t &sstable_row_count,
@ -5753,7 +5757,7 @@ int ObLSTabletService::estimate_block_count_and_row_count(
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("not inited", K(ret), K_(is_inited));
} else if (OB_FAIL(get_read_tables(tablet_id, INT64_MAX, tablet_iter, false/*allow_no_ready_read*/))) {
} else if (OB_FAIL(get_read_tables(tablet_id, timeout_us, INT64_MAX, tablet_iter, false/*allow_no_ready_read*/))) {
LOG_WARN("failed to get read tables", K(ret));
}