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

fix conflicts

This commit is contained in:
Shengliang Guan 2022-02-23 17:34:06 +08:00
parent 5b698b3d4d
commit a74188f456
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/mgmt/impl/test/sut/src/sut.cpp
View File

@ -33,6 +33,7 @@ void Testbase::InitLog(const char* path) {
taosRemoveDir(path); taosRemoveDir(path);
taosMkDir(path); taosMkDir(path);
tstrncpy(tsLogDir, path, PATH_MAX);
if (taosInitLog("taosdlog", 1) != 0) { if (taosInitLog("taosdlog", 1) != 0) {
printf("failed to init log file\n"); printf("failed to init log file\n");
} }

4
source/libs/index/test/fstUT.cc
View File

@ -30,8 +30,8 @@ static void EnvInit() {
taosRemoveDir(path.c_str()); taosRemoveDir(path.c_str());
taosMkDir(path.c_str()); taosMkDir(path.c_str());
// init log file // init log file
snprintf(indexlog, PATH_MAX, "%s/tindex.idx", path.c_str()); tstrncpy(tsLogDir, path.c_str(), PATH_MAX);
if (taosInitLog(indexlog, tsNumOfLogLines, 1) != 0) { if (taosInitLog("tindex.idx", 1) != 0) {
printf("failed to init log"); printf("failed to init log");
} }
// init index file // init index file

4
source/libs/scalar/test/filter/filterTests.cpp
View File

@ -52,9 +52,7 @@ void flttInitLogFile() {
tsAsyncLog = 0; tsAsyncLog = 0;
qDebugFlag = 159; qDebugFlag = 159;
char temp[128] = {0}; if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
sprintf(temp, "%s/%s", tsLogDir, defaultLogFileNamePrefix);
if (taosInitLog(temp, tsNumOfLogLines, maxLogFileNum) < 0) {
printf("failed to open log file in directory:%s\n", tsLogDir); printf("failed to open log file in directory:%s\n", tsLogDir);
} }
} }

4
source/libs/scalar/test/scalar/scalarTests.cpp
View File

@ -51,9 +51,7 @@ void scltInitLogFile() {
tsAsyncLog = 0; tsAsyncLog = 0;
qDebugFlag = 159; qDebugFlag = 159;
char temp[128] = {0}; if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
sprintf(temp, "%s/%s", tsLogDir, defaultLogFileNamePrefix);
if (taosInitLog(temp, tsNumOfLogLines, maxLogFileNum) < 0) {
printf("failed to open log file in directory:%s\n", tsLogDir); printf("failed to open log file in directory:%s\n", tsLogDir);
} }
} }

6
source/libs/transport/test/transUT.cc
View File

@ -148,7 +148,6 @@ class TransObj {
wDebugFlag = 0; wDebugFlag = 0;
sDebugFlag = 0; sDebugFlag = 0;
tsdbDebugFlag = 0; tsdbDebugFlag = 0;
cqDebugFlag = 0;
tscEmbeddedInUtil = 1; tscEmbeddedInUtil = 1;
tsAsyncLog = 0; tsAsyncLog = 0;
@ -156,9 +155,8 @@ class TransObj {
taosRemoveDir(path.c_str()); taosRemoveDir(path.c_str());
taosMkDir(path.c_str()); taosMkDir(path.c_str());
char temp[PATH_MAX]; tstrncpy(tsLogDir, path.c_str(), PATH_MAX);
snprintf(temp, PATH_MAX, "%s/taosdlog", path.c_str()); if (taosInitLog("taosdlog", 1) != 0) {
if (taosInitLog(temp, tsNumOfLogLines, 1) != 0) {
printf("failed to init log file\n"); printf("failed to init log file\n");
} }
cli = new Client; cli = new Client;