enh: dump sdb info from mnode

include/dnode/mnode/mnode.h

@@ -106,6 +106,8 @@ void    mndPostProcessQueryMsg(SRpcMsg *pMsg);
  */
 void mndGenerateMachineCode();
 
+void mndDumpSdb();
+
 #ifdef __cplusplus
 }
 #endif

source/dnode/mgmt/exe/dmMain.c

@@ -16,6 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "dmMgmt.h"
 #include "tconfig.h"
+#include "mnode.h"
 
 #define DM_APOLLO_URL    "The apollo string to use when configuring the server, such as: -a 'jsonFile:./tests/cfg.json', cfg.json text can be '{\"fqdn\":\"td1\"}'."
 #define DM_CFG_DIR       "Configuration directory."
@@ -31,6 +32,7 @@ static struct {
   bool         winServiceMode;
 #endif
   bool         dumpConfig;
+  bool         dumpSdb;
   bool         generateGrant;
   bool         printAuth;
   bool         printVersion;
@@ -82,6 +84,8 @@ static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
       }
     } else if (strcmp(argv[i], "-a") == 0) {
       tstrncpy(global.apolloUrl, argv[++i], PATH_MAX);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      global.dumpSdb = true;
     } else if (strcmp(argv[i], "-E") == 0) {
       tstrncpy(global.envFile, argv[++i], PATH_MAX);
     } else if (strcmp(argv[i], "-n") == 0) {
@@ -229,6 +233,14 @@ int mainWindows(int argc,char** argv) {
     return 0;
   }
 
+  if (global.dumpSdb) {
+    mndDumpSdb();
+    taosCleanupCfg();
+    taosCloseLog();
+    taosCleanupArgs();
+    return 0;
+  }
+
   dmSetProcInfo(argc, (char **)argv);
   taosCleanupArgs();
 

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

@@ -40,6 +40,8 @@ int32_t mndBuildSMCreateStbRsp(SMnode *pMnode, char* dbFName, char* stbFName, vo
 void mndExtractDbNameFromStbFullName(const char *stbFullName, char *dst);
 void mndExtractTbNameFromStbFullName(const char *stbFullName, char *dst, int32_t dstSize);
 
+const char *mndGetStbStr(const char *src);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -54,13 +54,15 @@ static int32_t mndProcessConsumerLostMsg(SRpcMsg *pMsg);
 static int32_t mndProcessConsumerRecoverMsg(SRpcMsg *pMsg);
 
 int32_t mndInitConsumer(SMnode *pMnode) {
-  SSdbTable table = {.sdbType = SDB_CONSUMER,
-                     .keyType = SDB_KEY_INT64,
-                     .encodeFp = (SdbEncodeFp)mndConsumerActionEncode,
-                     .decodeFp = (SdbDecodeFp)mndConsumerActionDecode,
-                     .insertFp = (SdbInsertFp)mndConsumerActionInsert,
-                     .updateFp = (SdbUpdateFp)mndConsumerActionUpdate,
-                     .deleteFp = (SdbDeleteFp)mndConsumerActionDelete};
+  SSdbTable table = {
+      .sdbType = SDB_CONSUMER,
+      .keyType = SDB_KEY_INT64,
+      .encodeFp = (SdbEncodeFp)mndConsumerActionEncode,
+      .decodeFp = (SdbDecodeFp)mndConsumerActionDecode,
+      .insertFp = (SdbInsertFp)mndConsumerActionInsert,
+      .updateFp = (SdbUpdateFp)mndConsumerActionUpdate,
+      .deleteFp = (SdbDeleteFp)mndConsumerActionDelete,
+  };
 
   mndSetMsgHandle(pMnode, TDMT_MND_SUBSCRIBE, mndProcessSubscribeReq);
   mndSetMsgHandle(pMnode, TDMT_MND_MQ_HB, mndProcessMqHbReq);

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

@@ -38,13 +38,15 @@ static int32_t  mndRetrieveFuncs(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
 static void     mndCancelGetNextFunc(SMnode *pMnode, void *pIter);
 
 int32_t mndInitFunc(SMnode *pMnode) {
-  SSdbTable table = {.sdbType = SDB_FUNC,
-                     .keyType = SDB_KEY_BINARY,
-                     .encodeFp = (SdbEncodeFp)mndFuncActionEncode,
-                     .decodeFp = (SdbDecodeFp)mndFuncActionDecode,
-                     .insertFp = (SdbInsertFp)mndFuncActionInsert,
-                     .updateFp = (SdbUpdateFp)mndFuncActionUpdate,
-                     .deleteFp = (SdbDeleteFp)mndFuncActionDelete};
+  SSdbTable table = {
+      .sdbType = SDB_FUNC,
+      .keyType = SDB_KEY_BINARY,
+      .encodeFp = (SdbEncodeFp)mndFuncActionEncode,
+      .decodeFp = (SdbDecodeFp)mndFuncActionDecode,
+      .insertFp = (SdbInsertFp)mndFuncActionInsert,
+      .updateFp = (SdbUpdateFp)mndFuncActionUpdate,
+      .deleteFp = (SdbDeleteFp)mndFuncActionDelete,
+  };
 
   mndSetMsgHandle(pMnode, TDMT_MND_CREATE_FUNC, mndProcessCreateFuncReq);
   mndSetMsgHandle(pMnode, TDMT_MND_DROP_FUNC, mndProcessDropFuncReq);

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

@@ -2579,3 +2579,14 @@ static void mndCancelGetNextStb(SMnode *pMnode, void *pIter) {
   SSdb *pSdb = pMnode->pSdb;
   sdbCancelFetch(pSdb, pIter);
 }
+
+const char *mndGetStbStr(const char *src) {
+  char *posDb = strstr(src, TS_PATH_DELIMITER);
+  if (posDb != NULL) ++posDb;
+  if (posDb == NULL) return src;
+
+  char *posStb = strstr(posDb, TS_PATH_DELIMITER);
+  if (posStb != NULL) ++posStb;
+  if (posStb == NULL) return posDb;
+  return posStb;
+}
\ No newline at end of file

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

@@ -40,6 +40,8 @@ const char *sdbTableName(ESdbType type) {
       return "auth";
     case SDB_ACCT:
       return "acct";
+    case SDB_STREAM_CK:
+      return "stream_ck";
     case SDB_STREAM:
       return "stream";
     case SDB_OFFSET:

utils/test/c/CMakeLists.txt

@@ -40,20 +40,3 @@ target_link_libraries(
     PUBLIC common
     PUBLIC os
 )
-
-add_executable(sdbDump sdbDump.c)
-target_link_libraries(
-    sdbDump
-    PUBLIC dnode
-    PUBLIC mnode
-    PUBLIC stream
-    PUBLIC sdb
-    PUBLIC os
-)
-target_include_directories(
-    sdbDump
-    PUBLIC "${TD_SOURCE_DIR}/include/dnode/mnode"
-    PRIVATE "${TD_SOURCE_DIR}/source/dnode/mnode/impl/inc"
-    PRIVATE "${TD_SOURCE_DIR}/source/dnode/mnode/sdb/inc"
-    PRIVATE "${TD_SOURCE_DIR}/source/dnode/mgmt/node_mgmt/inc"
-)