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

BUGFIX: allow dml if lock table at the same trans

Browse Source
This commit is contained in:
obdev 2023-04-22 14:03:28 +00:00 committed by ob-robot
parent b64fd4b7ac
commit dd74e230e7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/storage/tablelock/ob_mem_ctx_table_lock.cpp
View File

@ -314,15 +314,16 @@ int ObLockMemCtx::check_lock_exist(
} else {
RDLockGuard guard(list_rwlock_);
DLIST_FOREACH(curr, lock_list_) {
if (curr->lock_op_.lock_id_ == lock_id &&
curr->lock_op_.owner_id_ == owner_id &&
curr->lock_op_.op_type_ == op_type && // different op type may lock twice.
curr->lock_op_.lock_op_status_ == LOCK_OP_DOING) {
if (curr->lock_op_.lock_mode_ == mode) {
if (curr->lock_op_.lock_id_ == lock_id) {
// BE CAREFUL: get all the lock mode curr trans has got.
lock_mode_in_same_trans |= curr->lock_op_.lock_mode_;
// check exist.
if (curr->lock_op_.lock_mode_ == mode &&
curr->lock_op_.owner_id_ == owner_id &&
curr->lock_op_.op_type_ == op_type && /* different op type may lock twice */
curr->lock_op_.lock_op_status_ == LOCK_OP_DOING) {
is_exist = true;
break;
} else {
lock_mode_in_same_trans |= curr->lock_op_.lock_mode_;
}
}
}