Merge pull request #13243 from taosdata/fix/mnode

refactor: rename trans types

source/dnode/mnode/impl/inc/mndDef.h

@@ -53,6 +53,11 @@ typedef enum {
   MND_AUTH_MAX
 } EAuthOp;
 
+typedef enum {
+  TRN_STEP_LOG = 1,
+  TRN_STEP_ACTION = 2,
+} ETrnStep;
+
 typedef enum {
   TRN_STAGE_PREPARE = 0,
   TRN_STAGE_REDO_LOG = 1,

source/dnode/mnode/impl/inc/mndTrans.h

@@ -22,6 +22,13 @@
 extern "C" {
 #endif
 
+typedef enum {
+  TRANS_START_FUNC_TEST = 1,
+  TRANS_STOP_FUNC_TEST = 2,
+  TRANS_START_FUNC_MQ_REB = 3,
+  TRANS_STOP_FUNC_TEST_MQ_REB = 4,
+} ETrnFunc;
+
 typedef struct {
   SEpSet  epSet;
   tmsg_t  msgType;
@@ -33,12 +40,17 @@ typedef struct {
   void   *pCont;
 } STransAction;
 
-typedef enum {
-  TEST_TRANS_START_FUNC = 1,
-  TEST_TRANS_STOP_FUNC = 2,
-  MQ_REB_TRANS_START_FUNC = 3,
-  MQ_REB_TRANS_STOP_FUNC = 4,
-} ETrnFuncType;
+typedef struct {
+  SSdbRaw *pRaw;
+} STransLog;
+
+typedef struct {
+  ETrnStep stepType;
+  STransAction redoAction;
+  STransAction undoAction;
+  STransLog    redoLog;
+  STransLog    undoLog;
+} STransStep;
 
 typedef void (*TransCbFp)(SMnode *pMnode, void *param, int32_t paramLen);
 
@@ -55,7 +67,7 @@ int32_t mndTransAppendCommitlog(STrans *pTrans, SSdbRaw *pRaw);
 int32_t mndTransAppendRedoAction(STrans *pTrans, STransAction *pAction);
 int32_t mndTransAppendUndoAction(STrans *pTrans, STransAction *pAction);
 void    mndTransSetRpcRsp(STrans *pTrans, void *pCont, int32_t contLen);
-void    mndTransSetCb(STrans *pTrans, ETrnFuncType startFunc, ETrnFuncType stopFunc, void *param, int32_t paramLen);
+void    mndTransSetCb(STrans *pTrans, ETrnFunc startFunc, ETrnFunc stopFunc, void *param, int32_t paramLen);
 void    mndTransSetDbInfo(STrans *pTrans, SDbObj *pDb);
 void    mndTransSetExecOneByOne(STrans *pTrans);
 

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

@@ -493,7 +493,7 @@ static int32_t mndPersistRebResult(SMnode *pMnode, SRpcMsg *pMsg, const SMqRebOu
   // 4. TODO commit log: modification log
 
   // 5. set cb
-  mndTransSetCb(pTrans, MQ_REB_TRANS_START_FUNC, MQ_REB_TRANS_STOP_FUNC, NULL, 0);
+  mndTransSetCb(pTrans, TRANS_START_FUNC_MQ_REB, TRANS_STOP_FUNC_TEST_MQ_REB, NULL, 0);
 
   // 6. execution
   if (mndTransPrepare(pMnode, pTrans) != 0) goto REB_FAIL;

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

@@ -464,15 +464,15 @@ static void mndTransTestStopFunc(SMnode *pMnode, void *param, int32_t paramLen)
   mInfo("test trans stop, param:%s, len:%d", (char *)param, paramLen);
 }
 
-static TransCbFp mndTransGetCbFp(ETrnFuncType ftype) {
+static TransCbFp mndTransGetCbFp(ETrnFunc ftype) {
   switch (ftype) {
-    case TEST_TRANS_START_FUNC:
+    case TRANS_START_FUNC_TEST:
       return mndTransTestStartFunc;
-    case TEST_TRANS_STOP_FUNC:
+    case TRANS_STOP_FUNC_TEST:
       return mndTransTestStopFunc;
-    case MQ_REB_TRANS_START_FUNC:
+    case TRANS_START_FUNC_MQ_REB:
       return mndRebCntInc;
-    case MQ_REB_TRANS_STOP_FUNC:
+    case TRANS_STOP_FUNC_TEST_MQ_REB:
       return mndRebCntDec;
     default:
       return NULL;
@@ -657,7 +657,7 @@ void mndTransSetRpcRsp(STrans *pTrans, void *pCont, int32_t contLen) {
   pTrans->rpcRspLen = contLen;
 }
 
-void mndTransSetCb(STrans *pTrans, ETrnFuncType startFunc, ETrnFuncType stopFunc, void *param, int32_t paramLen) {
+void mndTransSetCb(STrans *pTrans, ETrnFunc startFunc, ETrnFunc stopFunc, void *param, int32_t paramLen) {
   pTrans->startFunc = startFunc;
   pTrans->stopFunc = stopFunc;
   pTrans->param = param;

source/dnode/mnode/impl/test/trans/trans2.cpp

@@ -123,7 +123,7 @@ class MndTestTrans2 : public ::testing::Test {
     sdbSetRawStatus(pUndoRaw, SDB_STATUS_DROPPED);
 
     char *param = strdup("====> test log <=====");
-    mndTransSetCb(pTrans, TEST_TRANS_START_FUNC, TEST_TRANS_STOP_FUNC, param, strlen(param) + 1);
+    mndTransSetCb(pTrans, TRANS_START_FUNC_TEST, TRANS_STOP_FUNC_TEST, param, strlen(param) + 1);
 
     if (pDb != NULL) {
       mndTransSetDbInfo(pTrans, pDb);
@@ -156,7 +156,7 @@ class MndTestTrans2 : public ::testing::Test {
     sdbSetRawStatus(pUndoRaw, SDB_STATUS_DROPPED);
 
     char *param = strdup("====> test action <=====");
-    mndTransSetCb(pTrans, TEST_TRANS_START_FUNC, TEST_TRANS_STOP_FUNC, param, strlen(param) + 1);
+    mndTransSetCb(pTrans, TRANS_START_FUNC_TEST, TRANS_STOP_FUNC_TEST, param, strlen(param) + 1);
 
     {
       STransAction action = {0};
@@ -228,7 +228,7 @@ class MndTestTrans2 : public ::testing::Test {
     sdbSetRawStatus(pUndoRaw, SDB_STATUS_DROPPED);
 
     char *param = strdup("====> test log <=====");
-    mndTransSetCb(pTrans, TEST_TRANS_START_FUNC, TEST_TRANS_STOP_FUNC, param, strlen(param) + 1);
+    mndTransSetCb(pTrans, TRANS_START_FUNC_TEST, TRANS_STOP_FUNC_TEST, param, strlen(param) + 1);
 
     int32_t code = mndTransPrepare(pMnode, pTrans);
     mndTransDrop(pTrans);