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

Revert [LOCK_WAIT_MGR] let the sess_id to be set by post_lock directly

Browse Source
This commit is contained in:
YangEfei
2023-08-22 02:44:14 +00:00
committed by ob-robot
parent 56702f6840
commit 29ecde7ba3
9 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/rpc/ob_lock_wait_node.cpp vendored
View File

@ -31,7 +31,6 @@ void ObLockWaitNode::set(void* addr,
const int64_t last_compact_cnt,
const int64_t total_trans_node_cnt,
const char* key,
const uint32_t sess_id,
int64_t tx_id,
int64_t holder_tx_id) {
hash_ = hash | 1;
@ -40,7 +39,6 @@ void ObLockWaitNode::set(void* addr,
lock_seq_ = lock_seq;
abs_timeout_ = timeout;
tablet_id_ = tablet_id;//used for gv$lock_wait_stat
sessid_ = sess_id;
tx_id_ = tx_id;//requester used for deadlock detection
holder_tx_id_ = holder_tx_id; // txn id of lock holder
last_compact_cnt_ = last_compact_cnt,

1
deps/oblib/src/rpc/ob_lock_wait_node.h vendored
View File

@ -35,7 +35,6 @@ struct ObLockWaitNode: public common::SpHashNode
const int64_t last_compact_cnt,
const int64_t total_trans_node_cnt,
const char* key,
const uint32_t sess_id,
int64_t tx_id,
int64_t holder_tx_id);
void change_hash(const int64_t hash, const int64_t lock_seq);

2
src/observer/mysql/obmp_query.cpp
View File

@ -212,6 +212,8 @@ int ObMPQuery::process()
retry_ctrl_.set_sys_global_schema_version(sys_version);
session.partition_hit().reset();
session.set_pl_can_retry(true);
ObLockWaitNode &lock_wait_node = req_->get_lock_wait_node();
lock_wait_node.set_session_info(session.get_sessid());
bool has_more = false;
bool force_sync_resp = false;

2
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -1870,6 +1870,8 @@ int ObMPStmtExecute::process()
retry_ctrl_.set_sys_global_schema_version(sys_version);
session.partition_hit().reset();
session.set_pl_can_retry(true);
ObLockWaitNode &lock_wait_node = req_->get_lock_wait_node();
lock_wait_node.set_session_info(session.get_sessid());
need_response_error = false;
need_disconnect = false;

4
src/storage/memtable/ob_lock_wait_mgr.cpp
View File

@ -571,7 +571,6 @@ int ObLockWaitMgr::post_lock(const int tmp_ret,
const bool is_remote_sql,
const int64_t last_compact_cnt,
const int64_t total_trans_node_cnt,
const uint32_t sess_id,
const ObTransID &tx_id,
const ObTransID &holder_tx_id,
ObFunction<int(bool&, bool&)> &rechecker)
@ -605,7 +604,6 @@ int ObLockWaitMgr::post_lock(const int tmp_ret,
last_compact_cnt,
total_trans_node_cnt,
to_cstring(row_key),// just for virtual table display
sess_id,
tx_id,
holder_tx_id);
node->set_need_wait();
@ -623,7 +621,6 @@ int ObLockWaitMgr::post_lock(const int tmp_ret,
const bool is_remote_sql,
const int64_t last_compact_cnt,
const int64_t total_trans_node_cnt,
const uint32_t sess_id,
const transaction::ObTransID &tx_id,
const transaction::ObTransID &holder_tx_id,
const ObTableLockMode &lock_mode,
@ -662,7 +659,6 @@ int ObLockWaitMgr::post_lock(const int tmp_ret,
last_compact_cnt,
total_trans_node_cnt,
lock_id_buf, // just for virtual table display
sess_id,
tx_id,
holder_tx_id);
node->set_need_wait();

2
src/storage/memtable/ob_lock_wait_mgr.h
View File

@ -237,7 +237,6 @@ public:
const bool is_remote_sql,
const int64_t last_compact_cnt,
const int64_t total_trans_node_cnt,
const uint32_t sess_id,
const transaction::ObTransID &tx_id,
const transaction::ObTransID &holder_tx_id,
ObFunction<int(bool&, bool&)> &rechecker);
@ -248,7 +247,6 @@ public:
const bool is_remote_sql,
const int64_t last_compact_cnt,
const int64_t total_trans_node_cnt,
const uint32_t sess_id,
const transaction::ObTransID &tx_id,
const transaction::ObTransID &holder_tx_id,
const transaction::tablelock::ObTableLockMode &lock_mode,

1
src/storage/memtable/ob_memtable.cpp
View File

@ -2986,7 +2986,6 @@ int ObMemtable::post_row_write_conflict_(ObMvccAccessCtx &acc_ctx,
remote_tx,
last_compact_cnt,
total_trans_node_cnt,
acc_ctx.tx_desc_->get_session_id(),
tx_id,
conflict_tx_id,
recheck_func);

1
src/storage/memtable/ob_row_conflict_handler.cpp
View File

@ -158,7 +158,6 @@ int ObRowConflictHandler::post_row_read_conflict(ObMvccAccessCtx &acc_ctx,
remote_tx,
last_compact_cnt,
total_trans_node_cnt,
tx_desc->get_session_id(),
tx_id,
conflict_tx_id,
recheck_func);

1
src/storage/tablelock/ob_lock_memtable.cpp
View File

@ -391,7 +391,6 @@ int ObLockMemtable::post_obj_lock_conflict_(ObMvccAccessCtx &acc_ctx,
remote_tx,
-1,
-1, // total_trans_node_cnt
acc_ctx.tx_desc_->get_session_id(),
tx_id,
conflict_tx_id,
lock_mode,