From f30d1ebacdcc1d70706ead27a4d19010d03afebf Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Fri, 18 Aug 2023 18:35:44 +0800
Subject: [PATCH] enh: refactor func name as mndTransAppendPrepareLog

---
 source/dnode/mnode/impl/inc/mndTrans.h  | 4 +++-
 source/dnode/mnode/impl/src/mndDb.c     | 7 +++----
 source/dnode/mnode/impl/src/mndTrans.c  | 9 ++++-----
 source/dnode/mnode/impl/src/mndVgroup.c | 3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/source/dnode/mnode/impl/inc/mndTrans.h b/source/dnode/mnode/impl/inc/mndTrans.h
index 625546aa55..04544da80e 100644
--- a/source/dnode/mnode/impl/inc/mndTrans.h
+++ b/source/dnode/mnode/impl/inc/mndTrans.h
@@ -66,11 +66,13 @@ void    mndReleaseTrans(SMnode *pMnode, STrans *pTrans);
 STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, ETrnConflct conflict, const SRpcMsg *pReq,
                        const char *opername);
 void    mndTransDrop(STrans *pTrans);
+
+int32_t mndTransAppendPrepareLog(STrans *pTrans, SSdbRaw *pRaw);
 int32_t mndTransAppendRedolog(STrans *pTrans, SSdbRaw *pRaw);
 int32_t mndTransAppendUndolog(STrans *pTrans, SSdbRaw *pRaw);
 int32_t mndTransAppendCommitlog(STrans *pTrans, SSdbRaw *pRaw);
 int32_t mndTransAppendNullLog(STrans *pTrans);
-int32_t mndTransAppendPrepareAction(STrans *pTrans, STransAction *pAction);
+
 int32_t mndTransAppendRedoAction(STrans *pTrans, STransAction *pAction);
 int32_t mndTransAppendUndoAction(STrans *pTrans, STransAction *pAction);
 void    mndTransSetRpcRsp(STrans *pTrans, void *pCont, int32_t contLen);
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index 73a4e42abf..56cea10b32 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -464,12 +464,11 @@ static void mndSetDefaultDbCfg(SDbCfg *pCfg) {
   if (pCfg->tsdbPageSize <= 0) pCfg->tsdbPageSize = TSDB_DEFAULT_TSDB_PAGESIZE;
 }
 
-static int32_t mndSetCreateDbPrepareActions(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
+static int32_t mndSetCreateDbPrepareAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
   SSdbRaw *pDbRaw = mndDbActionEncode(pDb);
   if (pDbRaw == NULL) return -1;
 
-  STransAction action = {.pRaw = pDbRaw, .msgType = TDMT_MND_CREATE_DB};
-  if (mndTransAppendPrepareAction(pTrans, &action) != 0) return -1;
+  if (mndTransAppendPrepareLog(pTrans, pDbRaw) != 0) return -1;
   if (sdbSetRawStatus(pDbRaw, SDB_STATUS_CREATING) != 0) return -1;
   return 0;
 }
@@ -659,7 +658,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SRpcMsg *pReq, SCreateDbReq *pCreate,
   if (mndTransCheckConflict(pMnode, pTrans) != 0) goto _OVER;
 
   mndTransSetOper(pTrans, MND_OPER_CREATE_DB);
-  if (mndSetCreateDbPrepareActions(pMnode, pTrans, &dbObj) != 0) goto _OVER;
+  if (mndSetCreateDbPrepareAction(pMnode, pTrans, &dbObj) != 0) goto _OVER;
   if (mndSetNewVgPrepareActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
   if (mndSetCreateDbRedoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
   if (mndSetCreateDbUndoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c
index 7ebaf6dda5..02d9368595 100644
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
@@ -655,11 +655,10 @@ int32_t mndTransAppendCommitlog(STrans *pTrans, SSdbRaw *pRaw) {
   return mndTransAppendAction(pTrans->commitActions, &action);
 }
 
-int32_t mndTransAppendPrepareAction(STrans *pTrans, STransAction *pAction) {
-  pAction->stage = TRN_STAGE_PREPARE;
-  pAction->actionType = TRANS_ACTION_RAW;
-  pAction->mTraceId = pTrans->mTraceId;
-  return mndTransAppendAction(pTrans->prepareActions, pAction);
+int32_t mndTransAppendPrepareLog(STrans *pTrans, SSdbRaw *pRaw) {
+  STransAction action = {
+      .pRaw = pRaw, .stage = TRN_STAGE_PREPARE, .actionType = TRANS_ACTION_RAW, .mTraceId = pTrans->mTraceId};
+  return mndTransAppendAction(pTrans->prepareActions, &action);
 }
 
 int32_t mndTransAppendRedoAction(STrans *pTrans, STransAction *pAction) {
diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c
index 0bf524508a..e0156db67c 100644
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
@@ -1276,8 +1276,7 @@ int32_t mndAddNewVgPrepareAction(SMnode *pMnode, STrans *pTrans, SVgObj *pVg) {
   SSdbRaw *pRaw = mndVgroupActionEncode(pVg);
   if (pRaw == NULL) goto _err;
 
-  STransAction action = {.pRaw = pRaw, .msgType = TDMT_MND_CREATE_VG};
-  if (mndTransAppendPrepareAction(pTrans, &action) != 0) goto _err;
+  if (mndTransAppendPrepareLog(pTrans, pRaw) != 0) goto _err;
   (void)sdbSetRawStatus(pRaw, SDB_STATUS_CREATING);
   pRaw = NULL;
   return 0;