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

core in ObMultipleMultiScanMerge::construct_iters

Browse Source
This commit is contained in:
xy0
2022-03-11 16:08:31 +08:00
committed by LINxiansheng
parent fb7b94bcff
commit f10f55af0d
2 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/ob_multiple_multi_scan_merge.cpp
View File

@ -228,7 +228,7 @@ int ObMultipleMultiScanMerge::construct_iters()
iter->~ObStoreRowIterator(); iter->~ObStoreRowIterator();
STORAGE_LOG(WARN, "Fail to push iter to iterator array, ", K(ret), K(i)); STORAGE_LOG(WARN, "Fail to push iter to iterator array, ", K(ret), K(i));
} }
} else if (OB_ISNULL(iters_.at(tables.count() - 1 - i))) { } else if (OB_ISNULL(iter = iters_.at(tables.count() - 1 - i))) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "Unexpected null iter", K(ret), "idx", tables.count() - 1 - i, K_(iters)); STORAGE_LOG(WARN, "Unexpected null iter", K(ret), "idx", tables.count() - 1 - i, K_(iters));
} else if (OB_FAIL(iter->init(*iter_param, *access_ctx_, table, ranges_))) { } else if (OB_FAIL(iter->init(*iter_param, *access_ctx_, table, ranges_))) {
@ -433,8 +433,8 @@ int ObMultipleMultiScanMerge::to_collation_free_range_on_demand(
} }
for (int64_t i = 0; OB_SUCC(ret) && i < ranges.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < ranges.count(); ++i) {
if (OB_FAIL( if (OB_FAIL(const_cast<ObExtStoreRange &>(ranges.at(i))
const_cast<ObExtStoreRange&>(ranges.at(i)).to_collation_free_range_on_demand_and_cutoff_range(allocator))) { .to_collation_free_range_on_demand_and_cutoff_range(allocator))) {
STORAGE_LOG(WARN, "fail to get collation free rowkey", K(ret), K(ranges.at(i).get_range())); STORAGE_LOG(WARN, "fail to get collation free rowkey", K(ret), K(ranges.at(i).get_range()));
} }
} }

4
src/storage/ob_sstable_multi_version_row_iterator.cpp
View File

@ -123,7 +123,7 @@ int ObSSTableMultiVersionRowGetter::inner_open(
if (OB_FAIL(ObVersionStoreRangeConversionHelper::store_rowkey_to_multi_version_range( if (OB_FAIL(ObVersionStoreRangeConversionHelper::store_rowkey_to_multi_version_range(
*rowkey_, access_ctx.trans_version_range_, *access_ctx.allocator_, multi_version_range_))) { *rowkey_, access_ctx.trans_version_range_, *access_ctx.allocator_, multi_version_range_))) {
LOG_WARN("convert to multi version range failed", K(ret), K(*rowkey_)); LOG_WARN("convert to multi version range failed", K(ret), K(*rowkey_));
} else if (OB_FAIL(new_iterator<ObSSTableRowScanner>(*access_ctx.allocator_))) { } else if (OB_FAIL(new_iterator<ObSSTableRowScanner>(*access_ctx.stmt_allocator_))) {
LOG_WARN("failed to new iterator", K(ret)); LOG_WARN("failed to new iterator", K(ret));
} else if (OB_FAIL(iter_->init(iter_param, access_ctx, table, &multi_version_range_))) { } else if (OB_FAIL(iter_->init(iter_param, access_ctx, table, &multi_version_range_))) {
LOG_WARN("failed to open scanner", K(ret)); LOG_WARN("failed to open scanner", K(ret));
@ -213,7 +213,7 @@ int ObSSTableMultiVersionRowScanner::inner_open(
if (OB_FAIL(ObVersionStoreRangeConversionHelper::range_to_multi_version_range( if (OB_FAIL(ObVersionStoreRangeConversionHelper::range_to_multi_version_range(
*range_, access_ctx.trans_version_range_, *access_ctx.allocator_, multi_version_range_))) { *range_, access_ctx.trans_version_range_, *access_ctx.allocator_, multi_version_range_))) {
LOG_WARN("convert to multi version range failed", K(ret), K(*range_)); LOG_WARN("convert to multi version range failed", K(ret), K(*range_));
} else if (OB_FAIL(new_iterator<ObSSTableRowScanner>(*access_ctx.allocator_))) { } else if (OB_FAIL(new_iterator<ObSSTableRowScanner>(*access_ctx.stmt_allocator_))) {
LOG_WARN("failed to new iterator", K(ret)); LOG_WARN("failed to new iterator", K(ret));
} else if (OB_FAIL(iter_->init(iter_param, access_ctx, table, &multi_version_range_))) { } else if (OB_FAIL(iter_->init(iter_param, access_ctx, table, &multi_version_range_))) {
LOG_WARN("failed to open scanner", K(ret)); LOG_WARN("failed to open scanner", K(ret));