Merge branch 'feature/dnode3' of https://github.com/taosdata/TDengine into feature/dnode3

source/dnode/mnode/impl/src/mndUser.c

@@ -75,7 +75,7 @@ static int32_t mndCreateDefaultUser(SMnode *pMnode, char *acct, char *user, char
   if (pRaw == NULL) return -1;
   sdbSetRawStatus(pRaw, SDB_STATUS_READY);
 
-  mDebug("user:%s, will be created while deploy sdb", userObj.user);
+  mDebug("user:%s, will be created while deploy sdb, raw:%p", userObj.user, pRaw);
   return sdbWrite(pMnode->pSdb, pRaw);
 }
 
@@ -107,6 +107,7 @@ static SSdbRaw *mndUserActionEncode(SUserObj *pUser) {
   SDB_SET_RESERVE(pRaw, dataPos, TSDB_USER_RESERVE_SIZE)
   SDB_SET_DATALEN(pRaw, dataPos);
 
+  mTrace("user:%s, encode to raw:%p, row:%p", pUser->user, pRaw, pUser);
   return pRaw;
 }
 
@@ -133,11 +134,12 @@ static SSdbRow *mndUserActionDecode(SSdbRaw *pRaw) {
   SDB_GET_INT8(pRaw, pRow, dataPos, &pUser->superUser)
   SDB_GET_RESERVE(pRaw, pRow, dataPos, TSDB_USER_RESERVE_SIZE)
 
+  mTrace("user:%s, decode from raw:%p, row:%p", pUser->user, pRaw, pUser);
   return pRow;
 }
 
 static int32_t mndUserActionInsert(SSdb *pSdb, SUserObj *pUser) {
-  mTrace("user:%s, perform insert action", pUser->user);
+  mTrace("user:%s, perform insert action, row:%p", pUser->user, pUser);
   pUser->prohibitDbHash = taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
   if (pUser->prohibitDbHash == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -158,7 +160,7 @@ static int32_t mndUserActionInsert(SSdb *pSdb, SUserObj *pUser) {
 }
 
 static int32_t mndUserActionDelete(SSdb *pSdb, SUserObj *pUser) {
-  mTrace("user:%s, perform delete action", pUser->user);
+  mTrace("user:%s, perform delete action, row:%p", pUser->user, pUser);
   if (pUser->prohibitDbHash) {
     taosHashCleanup(pUser->prohibitDbHash);
     pUser->prohibitDbHash = NULL;
@@ -168,7 +170,7 @@ static int32_t mndUserActionDelete(SSdb *pSdb, SUserObj *pUser) {
 }
 
 static int32_t mndUserActionUpdate(SSdb *pSdb, SUserObj *pOldUser, SUserObj *pNewUser) {
-  mTrace("user:%s, perform update action", pOldUser->user);
+  mTrace("user:%s, perform update action, old_row:%p new_row:%p", pOldUser->user, pOldUser, pNewUser);
   memcpy(pOldUser->pass, pNewUser->pass, TSDB_PASSWORD_LEN);
   pOldUser->updateTime = pNewUser->updateTime;
   return 0;
@@ -240,15 +242,15 @@ static int32_t mndProcessCreateUserMsg(SMnodeMsg *pMsg) {
     return -1;
   }
 
-  SUserObj *pUser = sdbAcquire(pMnode->pSdb, SDB_USER, pCreate->user);
+  SUserObj *pUser = mndAcquireUser(pMnode, pCreate->user);
   if (pUser != NULL) {
-    sdbRelease(pMnode->pSdb, pUser);
+    mndReleaseUser(pMnode, pUser);
     terrno = TSDB_CODE_MND_USER_ALREADY_EXIST;
     mError("user:%s, failed to create since %s", pCreate->user, terrstr());
     return -1;
   }
 
-  SUserObj *pOperUser = sdbAcquire(pMnode->pSdb, SDB_USER, pMsg->user);
+  SUserObj *pOperUser = mndAcquireUser(pMnode, pMsg->user);
   if (pOperUser == NULL) {
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
     mError("user:%s, failed to create since %s", pCreate->user, terrstr());
@@ -256,7 +258,7 @@ static int32_t mndProcessCreateUserMsg(SMnodeMsg *pMsg) {
   }
 
   int32_t code = mndCreateUser(pMnode, pOperUser->acct, pCreate->user, pCreate->pass, pMsg);
-  sdbRelease(pMnode->pSdb, pOperUser);
+  mndReleaseUser(pMnode, pOperUser);
 
   if (code != 0) {
     mError("user:%s, failed to create since %s", pCreate->user, terrstr());
@@ -310,15 +312,16 @@ static int32_t mndProcessAlterUserMsg(SMnodeMsg *pMsg) {
     return -1;
   }
 
-  SUserObj *pUser = sdbAcquire(pMnode->pSdb, SDB_USER, pAlter->user);
+  SUserObj *pUser = mndAcquireUser(pMnode, pAlter->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_USER_NOT_EXIST;
     mError("user:%s, failed to alter since %s", pAlter->user, terrstr());
     return -1;
   }
 
-  SUserObj *pOperUser = sdbAcquire(pMnode->pSdb, SDB_USER, pMsg->user);
+  SUserObj *pOperUser = mndAcquireUser(pMnode, pMsg->user);
   if (pOperUser == NULL) {
+    mndReleaseUser(pMnode, pUser);
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
     mError("user:%s, failed to alter since %s", pAlter->user, terrstr());
     return -1;
@@ -331,7 +334,8 @@ static int32_t mndProcessAlterUserMsg(SMnodeMsg *pMsg) {
   newUser.updateTime = taosGetTimestampMs();
 
   int32_t code = mndUpdateUser(pMnode, pUser, &newUser, pMsg);
-  sdbRelease(pMnode->pSdb, pOperUser);
+  mndReleaseUser(pMnode, pOperUser);
+  mndReleaseUser(pMnode, pUser);
 
   if (code != 0) {
     mError("user:%s, failed to alter since %s", pAlter->user, terrstr());
@@ -379,22 +383,24 @@ static int32_t mndProcessDropUserMsg(SMnodeMsg *pMsg) {
     return -1;
   }
 
-  SUserObj *pUser = sdbAcquire(pMnode->pSdb, SDB_USER, pDrop->user);
+  SUserObj *pUser = mndAcquireUser(pMnode, pDrop->user);
   if (pUser == NULL) {
     terrno = TSDB_CODE_MND_USER_NOT_EXIST;
     mError("user:%s, failed to drop since %s", pDrop->user, terrstr());
     return -1;
   }
 
-  SUserObj *pOperUser = sdbAcquire(pMnode->pSdb, SDB_USER, pMsg->user);
+  SUserObj *pOperUser = mndAcquireUser(pMnode, pMsg->user);
   if (pOperUser == NULL) {
+    mndReleaseUser(pMnode, pUser);
     terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
     mError("user:%s, failed to drop since %s", pDrop->user, terrstr());
     return -1;
   }
 
   int32_t code = mndDropUser(pMnode, pMsg, pUser);
-  sdbRelease(pMnode->pSdb, pOperUser);
+  mndReleaseUser(pMnode, pOperUser);
+  mndReleaseUser(pMnode, pUser);
 
   if (code != 0) {
     mError("user:%s, failed to drop since %s", pDrop->user, terrstr());

source/dnode/mnode/sdb/src/sdbHash.c

@@ -57,12 +57,14 @@ void sdbPrintOper(SSdb *pSdb, SSdbRow *pRow, const char *oper) {
   EKeyType keyType = pSdb->keyTypes[pRow->type];
 
   if (keyType == SDB_KEY_BINARY) {
-    mTrace("%s:%s, refCount:%d oper:%s", sdbTableName(pRow->type), (char *)pRow->pObj, pRow->refCount, oper);
+    mTrace("%s:%s, refCount:%d oper:%s row:%p", sdbTableName(pRow->type), (char *)pRow->pObj, pRow->refCount, oper,
+           pRow->pObj);
   } else if (keyType == SDB_KEY_INT32) {
-    mTrace("%s:%d, refCount:%d oper:%s", sdbTableName(pRow->type), *(int32_t *)pRow->pObj, pRow->refCount, oper);
+    mTrace("%s:%d, refCount:%d oper:%s row:%p", sdbTableName(pRow->type), *(int32_t *)pRow->pObj, pRow->refCount, oper,
+           pRow->pObj);
   } else if (keyType == SDB_KEY_INT64) {
-    mTrace("%s:%" PRId64 ", refCount:%d oper:%s", sdbTableName(pRow->type), *(int64_t *)pRow->pObj, pRow->refCount,
-           oper);
+    mTrace("%s:%" PRId64 ", refCount:%d oper:%s row:%p", sdbTableName(pRow->type), *(int64_t *)pRow->pObj,
+           pRow->refCount, oper, pRow->pObj);
   } else {
   }
 }

source/dnode/mnode/sdb/src/sdbRow.c

@@ -23,6 +23,7 @@ SSdbRow *sdbAllocRow(int32_t objSize) {
     return NULL;
   }
 
+  mTrace("row:%p, is created, len:%d", pRow->pObj, objSize);
   return pRow;
 }
 
@@ -43,5 +44,7 @@ void sdbFreeRow(SSdb *pSdb, SSdbRow *pRow) {
   }
 
   sdbPrintOper(pSdb, pRow, "freeRow");
+
+  mTrace("row:%p, is freed", pRow->pObj);
   tfree(pRow);
 }