diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index 115d896da2..0f0e92625e 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -42,13 +42,6 @@ extern int32_t mDebugFlag; #define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }} #define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }} -typedef struct SClusterObj SClusterObj; -typedef struct SMnodeObj SMnodeObj; -typedef struct SAcctObj SAcctObj; -typedef struct SVgObj SVgObj; -typedef struct SFuncObj SFuncObj; -typedef struct SOperObj SOperObj; - typedef enum { MND_AUTH_ACCT_START = 0, MND_AUTH_ACCT_USER, @@ -99,7 +92,7 @@ typedef enum { DND_REASON_OTHERS } EDndReason; -typedef struct STrans { +typedef struct { int32_t id; ETrnStage stage; ETrnPolicy policy; @@ -111,7 +104,7 @@ typedef struct STrans { SArray *undoActions; } STrans; -typedef struct SClusterObj { +typedef struct { int32_t id; char name[TSDB_CLUSTER_ID_LEN]; int64_t createdTime; @@ -139,7 +132,7 @@ typedef struct { char ep[TSDB_EP_LEN]; } SDnodeObj; -typedef struct SMnodeObj { +typedef struct { int32_t id; int64_t createdTime; int64_t updateTime; @@ -167,7 +160,7 @@ typedef struct { int64_t compStorage; // Compressed storage on disk } SAcctInfo; -typedef struct SAcctObj { +typedef struct { char acct[TSDB_USER_LEN]; int64_t createdTime; int64_t updateTime; @@ -223,7 +216,7 @@ typedef struct { ESyncState role; } SVnodeGid; -typedef struct SVgObj { +typedef struct { int32_t vgId; int64_t createdTime; int64_t updateTime; @@ -252,7 +245,7 @@ typedef struct { SSchema *pSchema; } SStbObj; -typedef struct SFuncObj { +typedef struct { char name[TSDB_FUNC_NAME_LEN]; int64_t createdTime; int8_t funcType; diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c index 9a462c024b..8d39850965 100644 --- a/source/dnode/mnode/impl/src/mndVgroup.c +++ b/source/dnode/mnode/impl/src/mndVgroup.c @@ -133,12 +133,6 @@ static int32_t mndVgroupActionDelete(SSdb *pSdb, SVgObj *pVgroup) { return 0; } -static int32_t mndProcessCreateVnodeRsp(SMnodeMsg *pMsg) { return 0; } -static int32_t mndProcessAlterVnodeRsp(SMnodeMsg *pMsg) { return 0; } -static int32_t mndProcessDropVnodeRsp(SMnodeMsg *pMsg) { return 0; } -static int32_t mndProcessSyncVnodeRsp(SMnodeMsg *pMsg) { return 0; } -static int32_t mndProcessCompactVnodeRsp(SMnodeMsg *pMsg) { return 0; } - static int32_t mndVgroupActionUpdate(SSdb *pSdb, SVgObj *pOldVgroup, SVgObj *pNewVgroup) { mTrace("vgId:%d, perform update action", pOldVgroup->vgId); pOldVgroup->updateTime = pNewVgroup->updateTime; @@ -158,6 +152,12 @@ void mndReleaseVgroup(SMnode *pMnode, SVgObj *pVgroup) { sdbRelease(pSdb, pVgroup); } +static int32_t mndProcessCreateVnodeRsp(SMnodeMsg *pMsg) { return 0; } +static int32_t mndProcessAlterVnodeRsp(SMnodeMsg *pMsg) { return 0; } +static int32_t mndProcessDropVnodeRsp(SMnodeMsg *pMsg) { return 0; } +static int32_t mndProcessSyncVnodeRsp(SMnodeMsg *pMsg) { return 0; } +static int32_t mndProcessCompactVnodeRsp(SMnodeMsg *pMsg) { return 0; } + static int32_t mndGetVgroupMaxReplica(SMnode *pMnode, char *dbName, int8_t *pReplica, int32_t *pNumOfVgroups) { SSdb *pSdb = pMnode->pSdb; @@ -274,9 +274,9 @@ static int32_t mndRetrieveVgroups(SMnodeMsg *pMsg, SShowObj *pShow, char *data, } pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - *(int8_t *)pWrite = pVgroup->compact; + *(int8_t *)pWrite = pVgroup->compact; cols++; - + sdbRelease(pSdb, pVgroup); numOfRows++; }