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

[tablelock] do not throw deadlock error code when the timeout parameter of LOCK TABLE statment is larger than 1 min

Browse Source
This commit is contained in:
YangEfei
2023-05-16 02:11:33 +00:00
committed by ob-robot
parent 88b861540e
commit da78951e6d
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/ob_sql_trans_control.cpp
View File

@ -1141,6 +1141,7 @@ int ObSqlTransControl::lock_table(ObExecContext &exec_ctx,
arg.lock_mode_ = lock_mode;
arg.op_type_ = ObTableLockOpType::IN_TRANS_COMMON_LOCK;
arg.timeout_us_ = lock_timeout_us;
arg.is_from_sql_ = true;
OZ (lock_service->lock_table(*session->get_tx_desc(),
tx_param,
@ -1153,6 +1154,8 @@ int ObSqlTransControl::lock_table(ObExecContext &exec_ctx,
arg.lock_mode_ = lock_mode;
arg.op_type_ = ObTableLockOpType::IN_TRANS_COMMON_LOCK;
arg.timeout_us_ = lock_timeout_us;
arg.is_from_sql_ = true;
for (int64_t i = 0; i < part_ids.count() && OB_SUCC(ret); ++i) {
arg.part_object_id_ = part_ids.at(i);
OZ(lock_service->lock_partition_or_subpartition(*session->get_tx_desc(),