From 15b18f4ce92368f56696aeeb1d47a56ca3837c11 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 27 Feb 2022 11:05:46 +0800 Subject: [PATCH] log --- source/common/src/tdataformat.c | 2 +- source/common/src/tglobal.c | 1 - source/dnode/mgmt/daemon/inc/dmnInt.h | 2 +- source/dnode/mgmt/impl/test/sut/inc/sut.h | 2 +- source/libs/index/test/fstUT.cc | 2 +- source/libs/transport/test/transUT.cc | 2 +- source/util/src/compare.c | 2 +- source/util/src/tcache.c | 2 +- source/util/src/tcompression.c | 2 +- source/util/src/tconfig.c | 2 +- source/util/src/tfile.c | 2 +- source/util/src/thash.c | 2 +- source/util/src/tidpool.c | 3 +-- source/util/src/tlog.c | 2 +- source/util/src/tlosertree.c | 2 +- source/util/src/tmempool.c | 3 +-- source/util/src/tpagedbuf.c | 3 +-- source/util/src/tqueue.c | 2 +- source/util/src/tref.c | 3 ++- source/util/src/tsched.c | 3 +-- source/util/src/tskiplist.c | 4 +--- source/util/src/tstep.c | 3 +-- source/util/src/tthread.c | 3 +-- source/util/src/tversion.c | 1 - source/util/src/tworker.c | 2 +- source/util/test/trefTest.c | 2 +- tools/shell/src/backup/tnettest.c | 2 +- tools/shell/src/shellLinux.c | 2 +- 28 files changed, 27 insertions(+), 36 deletions(-) diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 41d911e4c7..0180cc5ede 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -13,11 +13,11 @@ * along with this program. If not, see . */ #include "tdataformat.h" -#include "ulog.h" #include "talgo.h" #include "tcoding.h" #include "wchar.h" #include "tarray.h" +#include "tlog.h" static void dataColSetNEleNull(SDataCol *pCol, int nEle); #if 0 diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index e1a23a8ac8..26d33199c1 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -24,7 +24,6 @@ #include "tglobal.h" #include "tlog.h" #include "tutil.h" -#include "ulog.h" SConfig *tsCfg = NULL; diff --git a/source/dnode/mgmt/daemon/inc/dmnInt.h b/source/dnode/mgmt/daemon/inc/dmnInt.h index 82e95782cb..8a571352f0 100644 --- a/source/dnode/mgmt/daemon/inc/dmnInt.h +++ b/source/dnode/mgmt/daemon/inc/dmnInt.h @@ -21,7 +21,7 @@ #include "dnode.h" #include "taoserror.h" #include "tglobal.h" -#include "ulog.h" +#include "tlog.h" #include "version.h" #ifdef __cplusplus diff --git a/source/dnode/mgmt/impl/test/sut/inc/sut.h b/source/dnode/mgmt/impl/test/sut/inc/sut.h index c5c7ff2920..304a370bcd 100644 --- a/source/dnode/mgmt/impl/test/sut/inc/sut.h +++ b/source/dnode/mgmt/impl/test/sut/inc/sut.h @@ -26,10 +26,10 @@ #include "tmsg.h" #include "trpc.h" #include "tthread.h" -#include "ulog.h" #include "client.h" #include "server.h" +#include "tlog.h" class Testbase { public: diff --git a/source/libs/index/test/fstUT.cc b/source/libs/index/test/fstUT.cc index d59a3428da..9665198b3b 100644 --- a/source/libs/index/test/fstUT.cc +++ b/source/libs/index/test/fstUT.cc @@ -15,7 +15,7 @@ #include "tglobal.h" #include "tskiplist.h" #include "tutil.h" -#include "ulog.h" +#include "tlog.h" static std::string dir = "/tmp/index"; diff --git a/source/libs/transport/test/transUT.cc b/source/libs/transport/test/transUT.cc index f5b3ed4c32..6db709da51 100644 --- a/source/libs/transport/test/transUT.cc +++ b/source/libs/transport/test/transUT.cc @@ -18,7 +18,7 @@ #include "tep.h" #include "tglobal.h" #include "trpc.h" -#include "ulog.h" +#include "tlog.h" using namespace std; const char *label = "APP"; diff --git a/source/util/src/compare.c b/source/util/src/compare.c index 1b1fa41754..b597eb32bf 100644 --- a/source/util/src/compare.c +++ b/source/util/src/compare.c @@ -22,7 +22,7 @@ #include "regex.h" #include "thash.h" #include "types.h" -#include "ulog.h" +#include "tlog.h" #include "tdef.h" #include "taos.h" diff --git a/source/util/src/tcache.c b/source/util/src/tcache.c index 621f103207..6914e7e2d0 100644 --- a/source/util/src/tcache.c +++ b/source/util/src/tcache.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "ulog.h" +#include "tlog.h" #include "ttimer.h" #include "tutil.h" #include "tcache.h" diff --git a/source/util/src/tcompression.c b/source/util/src/tcompression.c index b0dcff88e7..03a4846c3d 100644 --- a/source/util/src/tcompression.c +++ b/source/util/src/tcompression.c @@ -53,7 +53,7 @@ #include "td_sz.h" #endif #include "tcompression.h" -#include "ulog.h" +#include "tlog.h" static const int TEST_NUMBER = 1; #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0) diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c index dd446a4048..0ee1b9e1d6 100644 --- a/source/util/src/tconfig.c +++ b/source/util/src/tconfig.c @@ -19,7 +19,7 @@ #include "tcfg.h" #include "thash.h" #include "tutil.h" -#include "ulog.h" +#include "tlog.h" #define CFG_NAME_PRINT_LEN 24 #define CFG_SRC_PRINT_LEN 12 diff --git a/source/util/src/tfile.c b/source/util/src/tfile.c index d10ea6a934..ef9708df0c 100644 --- a/source/util/src/tfile.c +++ b/source/util/src/tfile.c @@ -18,7 +18,7 @@ #include "taoserror.h" #include "tref.h" #include "tutil.h" -#include "ulog.h" +#include "tlog.h" static int32_t tsFileRsetId = -1; diff --git a/source/util/src/thash.c b/source/util/src/thash.c index 0b0d8c4c58..9f39b79968 100644 --- a/source/util/src/thash.c +++ b/source/util/src/thash.c @@ -15,7 +15,7 @@ #include "os.h" #include "thash.h" -#include "ulog.h" +#include "tlog.h" #include "taos.h" #include "tdef.h" diff --git a/source/util/src/tidpool.c b/source/util/src/tidpool.c index 00c43bb25f..b4d76e6fb5 100644 --- a/source/util/src/tidpool.c +++ b/source/util/src/tidpool.c @@ -13,8 +13,7 @@ * along with this program. If not, see . */ -#include "os.h" -#include "ulog.h" +#include "tlog.h" typedef struct { int maxId; diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index 547470340c..9fdbeba6d8 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "tutil.h" -#include "ulog.h" +#include "tlog.h" #define LOG_MAX_LINE_SIZE (1000) #define LOG_MAX_LINE_BUFFER_SIZE (LOG_MAX_LINE_SIZE + 10) diff --git a/source/util/src/tlosertree.c b/source/util/src/tlosertree.c index 80bbac2c78..8b7f55809b 100644 --- a/source/util/src/tlosertree.c +++ b/source/util/src/tlosertree.c @@ -14,7 +14,7 @@ */ #include "os.h" -#include "ulog.h" +#include "tlog.h" #include "tlosertree.h" #include "taoserror.h" diff --git a/source/util/src/tmempool.c b/source/util/src/tmempool.c index a61c4abb14..f980a05629 100644 --- a/source/util/src/tmempool.c +++ b/source/util/src/tmempool.c @@ -13,8 +13,7 @@ * along with this program. If not, see . */ -#include "os.h" -#include "ulog.h" +#include "tlog.h" #include "tmempool.h" #include "tutil.h" diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c index ca260f0df5..a7e43cebf9 100644 --- a/source/util/src/tpagedbuf.c +++ b/source/util/src/tpagedbuf.c @@ -1,5 +1,4 @@ -#include "os.h" -#include "ulog.h" +#include "tlog.h" #include "tpagedbuf.h" #include "taoserror.h" #include "tcompression.h" diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c index 8125f550d0..0f6e2610c5 100644 --- a/source/util/src/tqueue.c +++ b/source/util/src/tqueue.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "tqueue.h" #include "taoserror.h" -#include "ulog.h" +#include "tlog.h" typedef struct STaosQnode STaosQnode; diff --git a/source/util/src/tref.c b/source/util/src/tref.c index 68f161bd3d..ca4388ec26 100644 --- a/source/util/src/tref.c +++ b/source/util/src/tref.c @@ -14,8 +14,9 @@ */ #include "os.h" + #include "taoserror.h" -#include "ulog.h" +#include "tlog.h" #include "tutil.h" #define TSDB_REF_OBJECTS 50 diff --git a/source/util/src/tsched.c b/source/util/src/tsched.c index 915edc45ce..7db5abdd24 100644 --- a/source/util/src/tsched.c +++ b/source/util/src/tsched.c @@ -13,10 +13,9 @@ * along with this program. If not, see . */ -#include "os.h" #include "tdef.h" #include "tutil.h" -#include "ulog.h" +#include "tlog.h" #include "tsched.h" #include "ttimer.h" diff --git a/source/util/src/tskiplist.c b/source/util/src/tskiplist.c index 328d3da5a4..1c325ca0a8 100644 --- a/source/util/src/tskiplist.c +++ b/source/util/src/tskiplist.c @@ -14,12 +14,10 @@ * along with this program. If not, see . */ -#include "os.h" - #include "compare.h" #include "tskiplist.h" #include "tutil.h" -#include "ulog.h" +#include "tlog.h" static int initForwardBackwardPtr(SSkipList *pSkipList); static SSkipListNode * getPriorNode(SSkipList *pSkipList, const char *val, int32_t order, SSkipListNode **pCur); diff --git a/source/util/src/tstep.c b/source/util/src/tstep.c index d840b119fb..30c8ec2b3a 100644 --- a/source/util/src/tstep.c +++ b/source/util/src/tstep.c @@ -14,8 +14,7 @@ */ #define _DEFAULT_SOURCE -#include "os.h" -#include "ulog.h" +#include "tlog.h" #include "taoserror.h" #include "tstep.h" diff --git a/source/util/src/tthread.c b/source/util/src/tthread.c index 44fce1c882..8c7a3ada05 100644 --- a/source/util/src/tthread.c +++ b/source/util/src/tthread.c @@ -14,11 +14,10 @@ */ #include "tthread.h" -#include "os.h" #include "taoserror.h" #include "tdef.h" #include "tutil.h" -#include "ulog.h" +#include "tlog.h" // create new thread pthread_t* taosCreateThread(void* (*__start_routine)(void*), void* param) { diff --git a/source/util/src/tversion.c b/source/util/src/tversion.c index 3944bd5132..8409637e80 100644 --- a/source/util/src/tversion.c +++ b/source/util/src/tversion.c @@ -17,7 +17,6 @@ #include "os.h" #include "taoserror.h" #include "tdef.h" -#include "ulog.h" int32_t taosVersionStrToInt(const char *vstr, int32_t *vint) { if (vstr == NULL) { diff --git a/source/util/src/tworker.c b/source/util/src/tworker.c index ca4e5a6f30..2843f4e801 100644 --- a/source/util/src/tworker.c +++ b/source/util/src/tworker.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "tworker.h" #include "taoserror.h" -#include "ulog.h" +#include "tlog.h" typedef void *(*ThreadFp)(void *param); diff --git a/source/util/test/trefTest.c b/source/util/test/trefTest.c index 1484ed2182..586151d782 100644 --- a/source/util/test/trefTest.c +++ b/source/util/test/trefTest.c @@ -8,7 +8,7 @@ #include "tlog.h" #include "tglobal.h" #include "taoserror.h" -#include "ulog.h" +#include "tlog.h" typedef struct { int refNum; diff --git a/tools/shell/src/backup/tnettest.c b/tools/shell/src/backup/tnettest.c index be8714387f..772d92d8c6 100644 --- a/tools/shell/src/backup/tnettest.c +++ b/tools/shell/src/backup/tnettest.c @@ -18,7 +18,7 @@ #include "taosdef.h" #include "tmsg.h" #include "taoserror.h" -#include "tulog.h" +#include "tlog.h" #include "tglobal.h" #include "tsocket.h" #include "trpc.h" diff --git a/tools/shell/src/shellLinux.c b/tools/shell/src/shellLinux.c index b06109184e..f304f35e3e 100644 --- a/tools/shell/src/shellLinux.c +++ b/tools/shell/src/shellLinux.c @@ -19,7 +19,7 @@ #include "shell.h" #include "shellCommand.h" #include "tkey.h" -#include "ulog.h" +#include "tlog.h" #include "version.h" #include -- GitLab