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

[CP] fix: fix the core induced by spf batch rescan

Browse Source
This commit is contained in:
obdev
2023-09-28 02:43:45 +00:00
committed by ob-robot
parent fe5316ab68
commit 508120bc1f
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sql/engine/table/ob_table_scan_op.cpp
View File

@ -779,10 +779,15 @@ int ObTableScanOp::prepare_all_das_tasks()
int ret = OB_SUCCESS;
if (MY_SPEC.batch_scan_flag_) {
if (OB_SUCC(ret)) {
group_size_ = tsc_rtdef_.bnlj_params_.at(0).second->count_;
if (OB_UNLIKELY(group_size_ > max_group_size_)) {
if (!tsc_rtdef_.bnlj_params_.empty()) {
group_size_ = tsc_rtdef_.bnlj_params_.at(0).second->count_;
if (OB_UNLIKELY(group_size_ > max_group_size_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("The amount of data exceeds the pre allocated memory", K(ret));
}
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("The amount of data exceeds the pre allocated memory", K(ret));
LOG_WARN("batch nlj params is empty", K(ret));
}
}
}
@ -1016,10 +1021,15 @@ int ObTableScanOp::prepare_batch_scan_range()
ObPhysicalPlanCtx *plan_ctx = GET_PHY_PLAN_CTX(ctx_);
int64_t batch_size = 0;
if (OB_SUCC(ret)) {
group_size_ = tsc_rtdef_.bnlj_params_.at(0).second->count_;
if (OB_UNLIKELY(group_size_ > max_group_size_)) {
if (!tsc_rtdef_.bnlj_params_.empty()) {
group_size_ = tsc_rtdef_.bnlj_params_.at(0).second->count_;
if (OB_UNLIKELY(group_size_ > max_group_size_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("The amount of data exceeds the pre allocated memory", K(ret));
}
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("The amount of data exceeds the pre allocated memory", K(ret));
LOG_WARN("batch nlj params is empry", K(ret));
}
}
for (int64_t i = 0; OB_SUCC(ret) && i < group_size_; ++i) {