From fcdc7e3308894f135c36f7d20438e5a30165341c Mon Sep 17 00:00:00 2001
From: gjw2284740 <gjw2284740@oceanbase.com>
Date: Fri, 3 Dec 2021 14:25:48 +0800
Subject: [PATCH] [hotpots] refine some codes

---
 src/storage/memtable/mvcc/ob_mvcc_row.cpp    | 24 +++++++++++---------
 src/storage/transaction/ob_trans_service.cpp | 17 +++++++-------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/storage/memtable/mvcc/ob_mvcc_row.cpp b/src/storage/memtable/mvcc/ob_mvcc_row.cpp
index 0a142215a2..8bfa4674e5 100644
--- a/src/storage/memtable/mvcc/ob_mvcc_row.cpp
+++ b/src/storage/memtable/mvcc/ob_mvcc_row.cpp
@@ -1233,17 +1233,19 @@ int ObMvccRow::lock_for_write(const ObMemtableKey* key, ObIMvccCtx& ctx)
     }
   }
 
-  // remote sql?
-  const int64_t is_remote_sql =
-      (static_cast<ObMemtableCtx&>(ctx).get_trans_ctx()->get_trans_id().get_server() != OBSERVER.get_self());
-  if (OB_SUCCESS != (tmp_ret = get_global_lock_wait_mgr().post_lock(ret,
-                         row_lock_,
-                         *key,
-                         query_abs_lock_wait_timeout,
-                         is_remote_sql,
-                         total_trans_node_cnt_,
-                         ctx.is_can_elr(),
-                         uid))) {}
+  if (OB_TRY_LOCK_ROW_CONFLICT == ret) {
+    // remote sql?
+    const int64_t is_remote_sql =
+        (static_cast<ObMemtableCtx&>(ctx).get_trans_ctx()->get_trans_id().get_server() != OBSERVER.get_self());
+    if (OB_SUCCESS != (tmp_ret = get_global_lock_wait_mgr().post_lock(ret,
+                           row_lock_,
+                           *key,
+                           query_abs_lock_wait_timeout,
+                           is_remote_sql,
+                           total_trans_node_cnt_,
+                           ctx.is_can_elr(),
+                           uid))) {}
+  }
   const bool enable_perf_event = GCONF.enable_perf_event;
   ctx.set_lock_wait_start_ts(0);
   if (OB_SUCC(ret)) {
diff --git a/src/storage/transaction/ob_trans_service.cpp b/src/storage/transaction/ob_trans_service.cpp
index ebcc102d07..084442bb26 100644
--- a/src/storage/transaction/ob_trans_service.cpp
+++ b/src/storage/transaction/ob_trans_service.cpp
@@ -501,7 +501,7 @@ int ObTransService::half_stmt_commit(const ObTransDesc& trans_desc, const ObPart
   } else {
     part_ctx = static_cast<ObPartTransCtx*>(ctx);
     if (OB_FAIL(part_ctx->half_stmt_commit())) {
-      TRANS_LOG(WARN, "half stmt commit error", K(ret), K(trans_desc), K(partition), K(*part_ctx));
+      TRANS_LOG(WARN, "half stmt commit error", K(ret), K(trans_desc), K(partition));
     }
     (void)part_trans_ctx_mgr_.revert_trans_ctx(ctx);
   }
@@ -1409,7 +1409,7 @@ int ObTransService::start_stmt(const ObStmtParam& stmt_param, ObTransDesc& trans
         if (OB_TRANS_XA_BRANCH_FAIL == ret) {
           TRANS_LOG(INFO, "xa trans has terminated", K(ret), K(trans_desc));
         } else {
-          TRANS_LOG(WARN, "unexpected scheduler for xa execution", K(ret), K(*sche_ctx));
+          TRANS_LOG(WARN, "unexpected scheduler for xa execution", K(ret));
         }
       } else if (OB_SUCCESS != (ret = sche_ctx->xa_try_global_lock(xid))) {
         // ret = OB_TRANS_STMT_NEED_RETRY;
@@ -4188,10 +4188,10 @@ int ObTransService::can_replay_redo_(
           need_replay_redo = true;
         } else {
           need_replay_redo = false;
-          TRANS_LOG(INFO, "no need to replay this big row redo log", K(meta), K(*part_ctx));
+          TRANS_LOG(INFO, "no need to replay this big row redo log", K(meta));
         }
       } else {
-        TRANS_LOG(ERROR, "invalid row flag, unexpected error", K(meta), K(*part_ctx));
+        TRANS_LOG(ERROR, "invalid row flag, unexpected error", K(meta));
         ret = OB_ERR_UNEXPECTED;
       }
     }
@@ -4934,7 +4934,7 @@ int ObTransService::replay(const ObPartitionKey& partition, const char* logbuf,
     } else {
       part_ctx = static_cast<ObPartTransCtx*>(ctx);
       if (OB_UNLIKELY(OB_SUCCESS != (tmp_ret = part_ctx->get_memtable_ctx()->sub_trans_end(false)))) {
-        TRANS_LOG(WARN, "sub trans abort error", K(tmp_ret), K(partition), K(log_id), K(*part_ctx));
+        TRANS_LOG(WARN, "sub trans abort error", K(tmp_ret), K(partition), K(log_id));
       }
       (void)part_trans_ctx_mgr_.revert_trans_ctx(ctx);
     }
@@ -8267,8 +8267,7 @@ int ObTransService::handle_elr_callback_(const int64_t task_type, const ObPartit
           K(partition),
           K(trans_id),
           K(prev_or_next_trans_id),
-          K(state),
-          K(*part_ctx));
+          K(state));
     }
     (void)part_trans_ctx_mgr_.revert_trans_ctx(ctx);
   }
@@ -8813,7 +8812,7 @@ int ObTransService::xa_rollback_all_changes(ObTransDesc& trans_desc, const ObStm
     TRANS_LOG(WARN, "invalid argument", K(ret), K(trans_desc));
   } else if (OB_ISNULL(sche_ctx)) {
     ret = OB_ERR_UNEXPECTED;
-    TRANS_LOG(WARN, "xa trans sche ctx is null", K(ret), K(*sche_ctx), K(trans_desc));
+    TRANS_LOG(WARN, "xa trans sche ctx is null", K(ret), K(trans_desc));
   } else if (OB_FAIL(trans_desc.set_cur_stmt_expired_time(expired_time))) {
     TRANS_LOG(WARN, "set statement expired time error", KR(ret), K(trans_desc), K(expired_time));
   } else if (sche_ctx->is_xa_tightly_coupled()) {
@@ -8823,7 +8822,7 @@ int ObTransService::xa_rollback_all_changes(ObTransDesc& trans_desc, const ObStm
         if (OB_TRANS_XA_BRANCH_FAIL == ret) {
           TRANS_LOG(INFO, "xa trans has terminated", K(ret), K(trans_desc));
         } else {
-          TRANS_LOG(WARN, "unexpected scheduler for xa execution", K(ret), K(*sche_ctx));
+          TRANS_LOG(WARN, "unexpected scheduler for xa execution", K(ret));
         }
       } else {
         int64_t retry_times = 0;
-- 
GitLab