Merge pull request #13236 from taosdata/fix/ZhiqiangWang/TD-15848-add-sdbDump-win-compile

fix(os): add sdbDump win compile

tests/test/c/CMakeLists.txt

@@ -23,20 +23,18 @@ target_link_libraries(
     PUBLIC os
 )
 
-if(NOT TD_WINDOWS)
-    add_executable(sdbDump sdbDump.c)
-    target_link_libraries(
-        sdbDump
-        PUBLIC dnode
-        PUBLIC mnode
-        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"
-    )
+add_executable(sdbDump sdbDump.c)
+target_link_libraries(
+    sdbDump
+    PUBLIC dnode
+    PUBLIC mnode
+    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"
+)
\ No newline at end of file
-ENDIF ()
\ No newline at end of file

tests/test/c/sdbDump.c

@@ -21,12 +21,12 @@
 #include "tjson.h"
 
 #define TMP_DNODE_DIR           TD_TMP_DIR_PATH "dumpsdb"
-#define TMP_MNODE_DIR           TD_TMP_DIR_PATH "dumpsdb/mnode"
-#define TMP_SDB_DATA_DIR        TD_TMP_DIR_PATH "dumpsdb/mnode/data"
-#define TMP_SDB_SYNC_DIR        TD_TMP_DIR_PATH "dumpsdb/mnode/sync"
-#define TMP_SDB_DATA_FILE       TD_TMP_DIR_PATH "dumpsdb/mnode/data/sdb.data"
-#define TMP_SDB_RAFT_CFG_FILE   TD_TMP_DIR_PATH "dumpsdb/mnode/sync/raft_config.json"
-#define TMP_SDB_RAFT_STORE_FILE TD_TMP_DIR_PATH "dumpsdb/mnode/sync/raft_store.json"
+#define TMP_MNODE_DIR           TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode"
+#define TMP_SDB_DATA_DIR        TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode" TD_DIRSEP "data"
+#define TMP_SDB_SYNC_DIR        TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode" TD_DIRSEP "sync"
+#define TMP_SDB_DATA_FILE       TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode" TD_DIRSEP "data" TD_DIRSEP "sdb.data"
+#define TMP_SDB_RAFT_CFG_FILE   TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode" TD_DIRSEP "sync" TD_DIRSEP "raft_config.json"
+#define TMP_SDB_RAFT_STORE_FILE TD_TMP_DIR_PATH "dumpsdb" TD_DIRSEP "mnode" TD_DIRSEP "sync" TD_DIRSEP "raft_store.json"
 
 void reportStartup(const char *name, const char *desc) {}
 
@@ -412,13 +412,23 @@ int32_t parseArgs(int32_t argc, char *argv[]) {
   char dataFile[PATH_MAX] = {0};
   char raftCfgFile[PATH_MAX] = {0};
   char raftStoreFile[PATH_MAX] = {0};
-  snprintf(dataFile, PATH_MAX, "%s/mnode/data/sdb.data", tsDataDir);
-  snprintf(raftCfgFile, PATH_MAX, "%s/mnode/sync/raft_config.json", tsDataDir);
-  snprintf(raftStoreFile, PATH_MAX, "%s/mnode/sync/raft_store.json", tsDataDir);
+  snprintf(dataFile, PATH_MAX, "%s" TD_DIRSEP "mnode" TD_DIRSEP "data" TD_DIRSEP "sdb.data", tsDataDir);
+  snprintf(raftCfgFile, PATH_MAX, "%s" TD_DIRSEP "mnode" TD_DIRSEP "sync" TD_DIRSEP "raft_config.json", tsDataDir);
+  snprintf(raftStoreFile, PATH_MAX, "%s" TD_DIRSEP "mnode" TD_DIRSEP "sync" TD_DIRSEP "raft_store.json", tsDataDir);
 
   char cmd[PATH_MAX * 2] = {0};
   snprintf(cmd, sizeof(cmd), "rm -rf %s", TMP_DNODE_DIR);
   system(cmd);
+#ifdef WINDOWS
+  taosMulMkDir(TMP_SDB_DATA_DIR);
+  taosMulMkDir(TMP_SDB_SYNC_DIR);
+  snprintf(cmd, sizeof(cmd), "cp %s %s 2>nul", dataFile, TMP_SDB_DATA_FILE);
+  system(cmd);
+  snprintf(cmd, sizeof(cmd), "cp %s %s 2>nul", raftCfgFile, TMP_SDB_RAFT_CFG_FILE);
+  system(cmd);
+  snprintf(cmd, sizeof(cmd), "cp %s %s 2>nul", raftStoreFile, TMP_SDB_RAFT_STORE_FILE);
+  system(cmd);
+#else
   snprintf(cmd, sizeof(cmd), "mkdir -p %s", TMP_SDB_DATA_DIR);
   system(cmd);
   snprintf(cmd, sizeof(cmd), "mkdir -p %s", TMP_SDB_SYNC_DIR);
@@ -429,6 +439,7 @@ int32_t parseArgs(int32_t argc, char *argv[]) {
   system(cmd);
   snprintf(cmd, sizeof(cmd), "cp %s %s 2>/dev/null", raftStoreFile, TMP_SDB_RAFT_STORE_FILE);
   system(cmd);
+#endif
 
   strcpy(tsDataDir, TMP_DNODE_DIR);
   return 0;