From a74188f45691404e0334a6f4f288b93bf5eac379 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 23 Feb 2022 17:34:06 +0800
Subject: [PATCH] fix conflicts

---
 source/dnode/mgmt/impl/test/sut/src/sut.cpp    | 1 +
 source/libs/index/test/fstUT.cc                | 4 ++--
 source/libs/scalar/test/filter/filterTests.cpp | 4 +---
 source/libs/scalar/test/scalar/scalarTests.cpp | 4 +---
 source/libs/transport/test/transUT.cc          | 6 ++----
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/source/dnode/mgmt/impl/test/sut/src/sut.cpp b/source/dnode/mgmt/impl/test/sut/src/sut.cpp
index ac199107a0..d32bdf29c6 100644
--- a/source/dnode/mgmt/impl/test/sut/src/sut.cpp
+++ b/source/dnode/mgmt/impl/test/sut/src/sut.cpp
@@ -33,6 +33,7 @@ void Testbase::InitLog(const char* path) {
 
   taosRemoveDir(path);
   taosMkDir(path);
+  tstrncpy(tsLogDir, path, PATH_MAX);
   if (taosInitLog("taosdlog", 1) != 0) {
     printf("failed to init log file\n");
   }
diff --git a/source/libs/index/test/fstUT.cc b/source/libs/index/test/fstUT.cc
index d10f5f47b8..5df44a7433 100644
--- a/source/libs/index/test/fstUT.cc
+++ b/source/libs/index/test/fstUT.cc
@@ -30,8 +30,8 @@ static void EnvInit() {
   taosRemoveDir(path.c_str());
   taosMkDir(path.c_str());
   // init log file
-  snprintf(indexlog, PATH_MAX, "%s/tindex.idx", path.c_str());
-  if (taosInitLog(indexlog, tsNumOfLogLines, 1) != 0) {
+  tstrncpy(tsLogDir, path.c_str(), PATH_MAX);
+  if (taosInitLog("tindex.idx", 1) != 0) {
     printf("failed to init log");
   }
   // init index file
diff --git a/source/libs/scalar/test/filter/filterTests.cpp b/source/libs/scalar/test/filter/filterTests.cpp
index db9df9ff08..420371fa04 100644
--- a/source/libs/scalar/test/filter/filterTests.cpp
+++ b/source/libs/scalar/test/filter/filterTests.cpp
@@ -52,9 +52,7 @@ void flttInitLogFile() {
   tsAsyncLog = 0;
   qDebugFlag = 159;
 
-  char temp[128] = {0};
-  sprintf(temp, "%s/%s", tsLogDir, defaultLogFileNamePrefix);
-  if (taosInitLog(temp, tsNumOfLogLines, maxLogFileNum) < 0) {
+  if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
     printf("failed to open log file in directory:%s\n", tsLogDir);
   }
 }
diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp
index 2f0a60362d..24bc8eaf40 100644
--- a/source/libs/scalar/test/scalar/scalarTests.cpp
+++ b/source/libs/scalar/test/scalar/scalarTests.cpp
@@ -51,9 +51,7 @@ void scltInitLogFile() {
   tsAsyncLog = 0;
   qDebugFlag = 159;
 
-  char temp[128] = {0};
-  sprintf(temp, "%s/%s", tsLogDir, defaultLogFileNamePrefix);
-  if (taosInitLog(temp, tsNumOfLogLines, maxLogFileNum) < 0) {
+  if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
     printf("failed to open log file in directory:%s\n", tsLogDir);
   }
 }
diff --git a/source/libs/transport/test/transUT.cc b/source/libs/transport/test/transUT.cc
index d1fefe2c72..f5b3ed4c32 100644
--- a/source/libs/transport/test/transUT.cc
+++ b/source/libs/transport/test/transUT.cc
@@ -148,7 +148,6 @@ class TransObj {
     wDebugFlag = 0;
     sDebugFlag = 0;
     tsdbDebugFlag = 0;
-    cqDebugFlag = 0;
     tscEmbeddedInUtil = 1;
     tsAsyncLog = 0;
 
@@ -156,9 +155,8 @@ class TransObj {
     taosRemoveDir(path.c_str());
     taosMkDir(path.c_str());
 
-    char temp[PATH_MAX];
-    snprintf(temp, PATH_MAX, "%s/taosdlog", path.c_str());
-    if (taosInitLog(temp, tsNumOfLogLines, 1) != 0) {
+    tstrncpy(tsLogDir, path.c_str(), PATH_MAX);
+    if (taosInitLog("taosdlog", 1) != 0) {
       printf("failed to init log file\n");
     }
     cli = new Client;