From f20723b057b0b3e873c5bebd176b02a2119aa132 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Fri, 11 Sep 2020 20:53:42 +0800
Subject: [PATCH] TD-1284

---
 src/mnode/src/mnodeSdb.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
index 3611f15032..646c17b2b8 100644
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
@@ -448,7 +448,6 @@ void sdbDecRef(void *handle, void *pObj) {
 }
 
 static void *sdbGetRowMeta(SSdbTable *pTable, void *key) {
-  void *pRet = NULL;
   if (pTable == NULL) return NULL;
 
   int32_t keySize = sizeof(int32_t);
@@ -456,12 +455,10 @@ static void *sdbGetRowMeta(SSdbTable *pTable, void *key) {
     keySize = strlen((char *)key);
   }
 
-  pthread_mutex_lock(&pTable->mutex);
   void **ppRow = (void **)taosHashGet(pTable->iHandle, key, keySize);
-  if (ppRow != NULL) pRet = *ppRow;
-  pthread_mutex_unlock(&pTable->mutex);
+  if (ppRow != NULL) return *ppRow;
 
-  return pRet;
+  return NULL;
 }
 
 static void *sdbGetRowMetaFromObj(SSdbTable *pTable, void *key) {
@@ -469,10 +466,12 @@ static void *sdbGetRowMetaFromObj(SSdbTable *pTable, void *key) {
 }
 
 void *sdbGetRow(void *handle, void *key) {
+  SSdbTable *pTable = handle;
+
+  pthread_mutex_lock(&pTable->mutex);
   void *pRow = sdbGetRowMeta(handle, key);
-  if (pRow) {
-    sdbIncRef(handle, pRow);
-  }
+  if (pRow) sdbIncRef(handle, pRow);
+  pthread_mutex_unlock(&pTable->mutex);
 
   return pRow;
 }
-- 
GitLab