xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:add windows support

This commit is contained in:
wangmm0220 2023-11-03 17:14:04 +08:00
parent 7a39b32961
commit 572dd8ec39
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/src/tglobal.c
View File

@ -136,7 +136,7 @@ char tsSmlAutoChildTableNameDelimiter[TSDB_TABLE_NAME_LEN] = "";
// checkpoint backup // checkpoint backup
char tsSnodeIp[TSDB_FQDN_LEN] = {0}; char tsSnodeIp[TSDB_FQDN_LEN] = {0};
#ifdef WINDOWS #ifdef WINDOWS
char tsCheckpointBackupDir[PATH_MAX] = "/c/TDengine/data/backup/checkpoint/"; char tsCheckpointBackupDir[PATH_MAX] = "C:\TDengine\data\backup\checkpoint\";
#else #else
char tsCheckpointBackupDir[PATH_MAX] = "/var/lib/taos/backup/checkpoint/"; char tsCheckpointBackupDir[PATH_MAX] = "/var/lib/taos/backup/checkpoint/";
#endif #endif

30
source/util/src/rsync.c
View File

@ -38,6 +38,21 @@ static void removeEmptyDir(){
taosCloseDir(&pDir); taosCloseDir(&pDir);
} }
#ifdef WINDOWS
// C:\TDengine\data\backup\checkpoint\ -> /c/TDengine/data/backup/checkpoint/
static void changeDirFromWindowsToLinux(char* from, char* to){
to[0] = '/';
to[1] = from[0];
for(int i = 2; i < strlen(from); i++) {
if (from[i] == '\\') {
to[i] = '/';
} else {
to[i] = from[i];
}
}
}
#endif
static int generateConfigFile(char* confDir){ static int generateConfigFile(char* confDir){
TdFilePtr pFile = taosOpenFile(confDir, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC); TdFilePtr pFile = taosOpenFile(confDir, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
if (pFile == NULL) { if (pFile == NULL) {
@ -45,6 +60,11 @@ static int generateConfigFile(char* confDir){
return -1; return -1;
} }
#ifdef WINDOWS
char path[PATH_MAX] = {0};
changeDirFromWindowsToLinux(tsCheckpointBackupDir, path);
#endif
char confContent[PATH_MAX*4] = {0}; char confContent[PATH_MAX*4] = {0};
snprintf(confContent, PATH_MAX*4, snprintf(confContent, PATH_MAX*4,
#ifndef WINDOWS #ifndef WINDOWS
@ -60,7 +80,13 @@ static int generateConfigFile(char* confDir){
"read only = false\n" "read only = false\n"
"list = false\n" "list = false\n"
"[checkpoint]\n" "[checkpoint]\n"
"path = %s", tsCheckpointBackupDir, tsCheckpointBackupDir, tsCheckpointBackupDir); "path = %s", tsCheckpointBackupDir, tsCheckpointBackupDir,
#ifdef WINDOWS
path
#else
tsCheckpointBackupDir
#endif
);
uDebug("[rsync] conf:%s", confContent); uDebug("[rsync] conf:%s", confContent);
if (taosWriteFile(pFile, confContent, strlen(confContent)) <= 0){ if (taosWriteFile(pFile, confContent, strlen(confContent)) <= 0){
uError("[rsync] write conf file error,"ERRNO_ERR_FORMAT, ERRNO_ERR_DATA); uError("[rsync] write conf file error,"ERRNO_ERR_FORMAT, ERRNO_ERR_DATA);
@ -88,7 +114,7 @@ static int execCommand(char* command){
void stopRsync(){ void stopRsync(){
int code = int code =
#ifdef WINDOWS #ifdef WINDOWS
system("taskkill /f /mi rsync.exe"); system("taskkill /f /im rsync.exe");
#else #else
system("pkill rsync"); system("pkill rsync");
#endif #endif