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

Specify tenant id for key_ranges of TableScanParam

Browse Source
This commit is contained in:
pe-99y
2023-09-15 07:10:27 +00:00
committed by ob-robot
parent fd3d7d13a3
commit d3b5e04d43
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/das/ob_das_scan_op.cpp
View File

@ -215,7 +215,10 @@ int ObDASScanOp::swizzling_remote_task(ObDASRemoteInfo *remote_info)
int ObDASScanOp::init_scan_param()
{
int ret = OB_SUCCESS;
scan_param_.tenant_id_ = MTL_ID();
uint64_t tenant_id = MTL_ID();
scan_param_.tenant_id_ = tenant_id;
scan_param_.key_ranges_.set_attr(ObMemAttr(tenant_id, "ScanParamKR"));
scan_param_.ss_key_ranges_.set_attr(ObMemAttr(tenant_id, "ScanParamSSKR"));
scan_param_.tx_lock_timeout_ = scan_rtdef_->tx_lock_timeout_;
scan_param_.index_id_ = scan_ctdef_->ref_table_id_;
scan_param_.is_get_ = scan_ctdef_->is_get_;
@ -1218,7 +1221,10 @@ OB_INLINE ObITabletScan &ObLocalIndexLookupOp::get_tsc_service()
OB_INLINE int ObLocalIndexLookupOp::init_scan_param()
{
int ret = OB_SUCCESS;
scan_param_.tenant_id_ = MTL_ID();
uint64_t tenant_id = MTL_ID();
scan_param_.tenant_id_ = tenant_id;
scan_param_.key_ranges_.set_attr(ObMemAttr(tenant_id, "ScanParamKR"));
scan_param_.ss_key_ranges_.set_attr(ObMemAttr(tenant_id, "ScanParamSSKR"));
scan_param_.tx_lock_timeout_ = lookup_rtdef_->tx_lock_timeout_;
scan_param_.index_id_ = lookup_ctdef_->ref_table_id_;
scan_param_.is_get_ = lookup_ctdef_->is_get_;

2
src/sql/das/ob_data_access_service.cpp
View File

@ -182,7 +182,7 @@ OB_NOINLINE int ObDataAccessService::execute_dist_das_task(
LOG_WARN("failed to copy das task", K(ret));
} else if (task_arg.is_local_task()) {
if (OB_FAIL(do_local_das_task(das_ref, task_arg))) {
LOG_WARN("do local das task failed", K(ret), K(task_arg));
LOG_WARN("do local das task failed", K(ret));
}
} else if (OB_FAIL(das_ref.acquire_task_execution_resource())) {
LOG_WARN("failed to acquire execution resource", K(ret));