diff --git a/src/client/inc/tscLog.h b/src/client/inc/tscLog.h index 5e57847daa1dddb6f95bb8ce30e99b7803d2ec43..dfa15049e5516e32229937065288510783c523d8 100644 --- a/src/client/inc/tscLog.h +++ b/src/client/inc/tscLog.h @@ -24,24 +24,11 @@ extern "C" { extern int32_t cDebugFlag; -#define tscError(...) \ - if (cDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR TSC ", 255, __VA_ARGS__); \ - } -#define tscWarn(...) \ - if (cDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN TSC ", cDebugFlag, __VA_ARGS__); \ - } -#define tscTrace(...) \ - if (cDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); \ - } -#define tscPrint(...) \ - { taosPrintLog("TSC ", 255, __VA_ARGS__); } -#define tscDump(...) \ - if (cDebugFlag & DEBUG_TRACE) { \ - taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); \ - } +#define tscError(...) { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscWarn(...) { if (cDebugFlag & DEBUG_WARN) { taosPrintLog("WARN TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscTrace(...) { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscDump(...) { if (cDebugFlag & DEBUG_TRACE) { taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscPrint(...) { taosPrintLog("TSC ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } #ifdef __cplusplus } diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c index 812c197ef7923a27a41fa8a37cb1d0bd5834ba4c..802d383152734e584a0694b61cb226c1bc1328a3 100644 --- a/src/client/src/TSDBJNIConnector.c +++ b/src/client/src/TSDBJNIConnector.c @@ -22,20 +22,10 @@ #include "tlog.h" #include "ttime.h" -#define jniError(...) \ - if (jniDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); \ - } -#define jniWarn(...) \ - if (jniDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); \ - } -#define jniTrace(...) \ - if (jniDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); \ - } -#define jniPrint(...) \ - { taosPrintLog("JNI ", 255, __VA_ARGS__); } +#define jniError(...) { if (jniDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); }} +#define jniWarn(...) { if (jniDebugFlag & DEBUG_WARN) { taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); }} +#define jniTrace(...) { if (jniDebugFlag & DEBUG_TRACE) { taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); }} +#define jniPrint(...) { taosPrintLog("JNI ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } int __init = 0; diff --git a/src/common/inc/tulog.h b/src/common/inc/tulog.h index 143bc56f9ff5a8042fc29fe4497807d815002760..a47e894e311245ca2c0006639e72bb98204e9984 100644 --- a/src/common/inc/tulog.h +++ b/src/common/inc/tulog.h @@ -25,31 +25,15 @@ extern "C" { extern int32_t uDebugFlag; extern int32_t tscEmbedded; -#define uError(...) \ - if (uDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR UTL ", uDebugFlag, __VA_ARGS__); \ - } -#define uWarn(...) \ - if (uDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN UTL ", uDebugFlag, __VA_ARGS__); \ - } -#define uTrace(...) \ - if (uDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); \ - } -#define uDump(x, y) \ - if (uDebugFlag & DEBUG_DUMP) { \ - taosDumpData(x, y); \ - } -#define uPrint(...) \ - { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } -#define uForcePrint(...) \ - { taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); } - -#define pError(...) \ - { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); } -#define pPrint(...) \ - { taosPrintLog("APP ", 255, __VA_ARGS__); } +#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR UTL ", uDebugFlag, __VA_ARGS__); }} +#define uWarn(...) { if (uDebugFlag & DEBUG_WARN) { taosPrintLog("WARN UTL ", uDebugFlag, __VA_ARGS__); }} +#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }} +#define uDump(x, y) { if (uDebugFlag & DEBUG_DUMP) { taosDumpData(x, y); }} +#define uPrint(...) { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } +#define uForcePrint(...) { taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); } + +#define pError(...) { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); } +#define pPrint(...) { taosPrintLog("APP ", 255, __VA_ARGS__); } #ifdef __cplusplus } diff --git a/src/common/src/tlocale.c b/src/common/src/tlocale.c index b2631cf08c4699c8ad7a79d80f30a4c81cedb30e..46a3d951db8473cbb1b6346a66938312d4e41fb1 100644 --- a/src/common/src/tlocale.c +++ b/src/common/src/tlocale.c @@ -31,16 +31,16 @@ void tsSetLocale() { // default locale or user specified locale is not valid, abort launch if (locale == NULL) { - uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale); + uError("Invalid locale:%s, please set the valid locale in config file", tsLocale); } if (strlen(tsCharset) == 0) { - uForcePrint("failed to get charset, please set the valid charset in config file"); + uError("failed to get charset, please set the valid charset in config file"); exit(-1); } if (!taosValidateEncodec(tsCharset)) { - uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset); + uError("Invalid charset:%s, please set the valid charset in config file", tsCharset); exit(-1); } } \ No newline at end of file diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c index 5cc3ce0159ca12e809f92857d71991104e410711..6e81db7db735b49a4a94b9b5a5af76469dc84fb9 100644 --- a/src/cq/src/cqMain.c +++ b/src/cq/src/cqMain.c @@ -27,10 +27,10 @@ #include "tcq.h" #include "taos.h" -#define cError(...) if (cqDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR CQ ", cqDebugFlag, __VA_ARGS__);} -#define cWarn(...) if (cqDebugFlag & DEBUG_WARN) {taosPrintLog("WARN CQ ", cqDebugFlag, __VA_ARGS__);} -#define cTrace(...) if (cqDebugFlag & DEBUG_TRACE) {taosPrintLog("CQ ", cqDebugFlag, __VA_ARGS__);} -#define cPrint(...) {taosPrintLog("CQ ", 255, __VA_ARGS__);} +#define cError(...) { if (cqDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR CQ ", cqDebugFlag, __VA_ARGS__); }} +#define cWarn(...) { if (cqDebugFlag & DEBUG_WARN) { taosPrintLog("WARN CQ ", cqDebugFlag, __VA_ARGS__); }} +#define cTrace(...) { if (cqDebugFlag & DEBUG_TRACE) { taosPrintLog("CQ ", cqDebugFlag, __VA_ARGS__); }} +#define cPrint(...) { taosPrintLog("CQ ", 255, __VA_ARGS__); } typedef struct { int vgId; diff --git a/src/dnode/inc/dnodeInt.h b/src/dnode/inc/dnodeInt.h index c69055723bc4c7a7879ed92ce69ad1a6bbf84c08..663914a95908efdc1f4a93db36f7a3ff00d33e1f 100644 --- a/src/dnode/inc/dnodeInt.h +++ b/src/dnode/inc/dnodeInt.h @@ -24,10 +24,10 @@ extern "C" { extern int32_t dDebugFlag; -#define dError(...) if (dDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR DND ", 255, __VA_ARGS__); } -#define dWarn(...) if (dDebugFlag & DEBUG_WARN) {taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); } -#define dTrace(...) if (dDebugFlag & DEBUG_TRACE) {taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); } -#define dPrint(...) {taosPrintLog("DND ", 255, __VA_ARGS__); } +#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR DND ", 255, __VA_ARGS__); }} +#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); }} +#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }} +#define dPrint(...) { taosPrintLog("DND ", 255, __VA_ARGS__); } #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtInt.h b/src/mnode/inc/mgmtInt.h index a83d5beee0659b9ce0c752388bda3efe6871cda2..240392f68497464d8ef53f17e6c518141d2e9a14 100644 --- a/src/mnode/inc/mgmtInt.h +++ b/src/mnode/inc/mgmtInt.h @@ -27,23 +27,23 @@ extern int32_t mDebugFlag; extern int32_t sdbDebugFlag; // mnode log function -#define mError(...) if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND ", 255, __VA_ARGS__); } -#define mWarn(...) if (mDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND ", mDebugFlag, __VA_ARGS__); } -#define mTrace(...) if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); } -#define mPrint(...) { taosPrintLog("MND ", 255, __VA_ARGS__); } - -#define mLError(...) monitorSaveLog(2, __VA_ARGS__); mError(__VA_ARGS__) -#define mLWarn(...) monitorSaveLog(1, __VA_ARGS__); mWarn(__VA_ARGS__) -#define mLPrint(...) monitorSaveLog(0, __VA_ARGS__); mPrint(__VA_ARGS__) - -#define sdbError(...) if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); } -#define sdbWarn(...) if (sdbDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND-SDB ", sdbDebugFlag, __VA_ARGS__); } -#define sdbTrace(...) if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__);} -#define sdbPrint(...) { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); } - -#define sdbLError(...) monitorSaveLog(2, __VA_ARGS__); sdbError(__VA_ARGS__) -#define sdbLWarn(...) monitorSaveLog(1, __VA_ARGS__); sdbWarn(__VA_ARGS__) -#define sdbLPrint(...) monitorSaveLog(0, __VA_ARGS__); sdbPrint(__VA_ARGS__) +#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND ", 255, __VA_ARGS__); }} +#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND ", mDebugFlag, __VA_ARGS__); }} +#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }} +#define mPrint(...) { taosPrintLog("MND ", 255, __VA_ARGS__); } + +#define mLError(...) { monitorSaveLog(2, __VA_ARGS__); mError(__VA_ARGS__) } +#define mLWarn(...) { monitorSaveLog(1, __VA_ARGS__); mWarn(__VA_ARGS__) } +#define mLPrint(...) { monitorSaveLog(0, __VA_ARGS__); mPrint(__VA_ARGS__) } + +#define sdbError(...) { if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); }} +#define sdbWarn(...) { if (sdbDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND-SDB ", sdbDebugFlag, __VA_ARGS__); }} +#define sdbTrace(...) { if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__);}} +#define sdbPrint(...) { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); } + +#define sdbLError(...) { monitorSaveLog(2, __VA_ARGS__); sdbError(__VA_ARGS__) } +#define sdbLWarn(...) { monitorSaveLog(1, __VA_ARGS__); sdbWarn(__VA_ARGS__) } +#define sdbLPrint(...) { monitorSaveLog(0, __VA_ARGS__); sdbPrint(__VA_ARGS__) } #ifdef __cplusplus } diff --git a/src/os/linux/src/linuxSysPara.c b/src/os/linux/src/linuxSysPara.c index 8b8607a58d779e645efc53b057c84d2496f79726..5794ad0302d1a14c1668e53fc2ec982fa26b49f3 100644 --- a/src/os/linux/src/linuxSysPara.c +++ b/src/os/linux/src/linuxSysPara.c @@ -226,11 +226,11 @@ static void taosGetSystemLocale() { // get and set default locale if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) { locale = setlocale(LC_CTYPE, ""); if (locale == NULL) { - uForcePrint("can't get locale from system, set it to en_US.UTF-8"); + uError("can't get locale from system, set it to en_US.UTF-8"); strcpy(tsLocale, "en_US.UTF-8"); } else { strncpy(tsLocale, locale, tListLen(tsLocale)); - uForcePrint("locale not configured, set to system default:%s", tsLocale); + uError("locale not configured, set to system default:%s", tsLocale); } } @@ -245,10 +245,10 @@ static void taosGetSystemLocale() { // get and set default locale strncpy(tsCharset, revisedCharset, tListLen(tsCharset)); free(revisedCharset); - uForcePrint("charset not configured, set to system default:%s", tsCharset); + uError("charset not configured, set to system default:%s", tsCharset); } else { strcpy(tsCharset, "UTF-8"); - uForcePrint("can't get locale and charset from system, set it to UTF-8"); + uError("can't get locale and charset from system, set it to UTF-8"); } } } diff --git a/src/plugins/http/inc/httpLog.h b/src/plugins/http/inc/httpLog.h index 19fa46bd238ef00d5752c3b7f010c28fcd92c1ca..0e09f277f0de9a5d1860fc63e4765476af57df9b 100644 --- a/src/plugins/http/inc/httpLog.h +++ b/src/plugins/http/inc/httpLog.h @@ -20,23 +20,10 @@ extern int32_t httpDebugFlag; -#define httpError(...) \ - if (httpDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR HTP ", 255, __VA_ARGS__); \ - } -#define httpWarn(...) \ - if (httpDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpTrace(...) \ - if (httpDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpDump(...) \ - if (httpDebugFlag & DEBUG_TRACE) { \ - taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpPrint(...) \ - { taosPrintLog("HTP ", 255, __VA_ARGS__); } +#define httpError(...) { if (httpDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR HTP ", 255, __VA_ARGS__); }} +#define httpWarn(...) { if (httpDebugFlag & DEBUG_WARN) { taosPrintLog("WARN HTP ", httpDebugFlag, __VA_ARGS__); }} +#define httpTrace(...) { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); }} +#define httpDump(...) { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); }} +#define httpPrint(...) { taosPrintLog("HTP ", 255, __VA_ARGS__); } #endif diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c index 72efd5b552cd37a72addce814246c14073b24685..fc958c1b1fb408afcd5c6a4d27a9eb4632731bcf 100644 --- a/src/plugins/monitor/src/monitorMain.c +++ b/src/plugins/monitor/src/monitorMain.c @@ -27,20 +27,10 @@ #include "dnode.h" #include "monitor.h" -#define monitorError(...) \ - if (monitorDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR MON ", 255, __VA_ARGS__); \ - } -#define monitorWarn(...) \ - if (monitorDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN MON ", monitorDebugFlag, __VA_ARGS__); \ - } -#define monitorTrace(...) \ - if (monitorDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); \ - } -#define monitorPrint(...) \ - { taosPrintLog("MON ", 255, __VA_ARGS__); } +#define monitorError(...) { if (monitorDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MON ", 255, __VA_ARGS__); }} +#define monitorWarn(...) { if (monitorDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MON ", monitorDebugFlag, __VA_ARGS__); }} +#define monitorTrace(...) { if (monitorDebugFlag & DEBUG_TRACE) { taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); }} +#define monitorPrint(...) { taosPrintLog("MON ", 255, __VA_ARGS__); } #define SQL_LENGTH 1024 #define LOG_LEN_STR 100 diff --git a/src/query/inc/queryLog.h b/src/query/inc/queryLog.h index 32338a4143ef63495235b8ac0da19661654cd9a3..e92f6abe872140bf65079bfedc7615e7e4e6e955 100644 --- a/src/query/inc/queryLog.h +++ b/src/query/inc/queryLog.h @@ -24,23 +24,12 @@ extern "C" { extern int32_t qDebugFlag; -#define qTrace(...) \ - if (qDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); \ - } - -#define qError(...) \ - if (qDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR QRY ", qDebugFlag, __VA_ARGS__); \ - } - -#define qWarn(...) \ - if (qDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN QRY ", qDebugFlag, __VA_ARGS__); \ - } +#define qTrace(...) { if (qDebugFlag & DEBUG_TRACE) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} +#define qError(...) { if (qDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR QRY ", qDebugFlag, __VA_ARGS__); }} +#define qWarn(...) { if (qDebugFlag & DEBUG_WARN) { taosPrintLog("WARN QRY ", qDebugFlag, __VA_ARGS__); }} #ifdef __cplusplus } #endif -#endif // TDENGINE_QUERY_CACHE_H +#endif // TDENGINE_QUERY_LOG_H diff --git a/src/rpc/inc/rpcLog.h b/src/rpc/inc/rpcLog.h index 251863f1deb1aedc379617532499f1f1096880e9..5094d817572a66da4f5cfcebbd17172fe0a58d89 100644 --- a/src/rpc/inc/rpcLog.h +++ b/src/rpc/inc/rpcLog.h @@ -24,27 +24,14 @@ extern "C" { extern int32_t rpcDebugFlag; -#define tError(...) \ - if (rpcDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); \ - } -#define tWarn(...) \ - if (rpcDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN RPC ", rpcDebugFlag, __VA_ARGS__); \ - } -#define tTrace(...) \ - if (rpcDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); \ - } -#define tPrint(...) \ - { taosPrintLog("RPC ", 255, __VA_ARGS__); } -#define tDump(x, y) \ - if (rpcDebugFlag & DEBUG_DUMP) { \ - taosDumpData((unsigned char *)x, y); \ - } +#define tError(...) { if (rpcDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); }} +#define tWarn(...) { if (rpcDebugFlag & DEBUG_WARN) { taosPrintLog("WARN RPC ", rpcDebugFlag, __VA_ARGS__); }} +#define tTrace(...) { if (rpcDebugFlag & DEBUG_TRACE) { taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); }} +#define tDump(x, y) { if (rpcDebugFlag & DEBUG_DUMP) { taosDumpData((unsigned char *)x, y); }} +#define tPrint(...) { taosPrintLog("RPC ", 255, __VA_ARGS__); } #ifdef __cplusplus } #endif -#endif // TDENGINE_RPC_CACHE_H +#endif // TDENGINE_RPC_LOG_H diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index 20a704db49975a0fc32f8b9aff1e5db4d8379bbc..63d3eb349b75717895441c0e2661b86db3db2c67 100644 --- a/src/tsdb/inc/tsdbMain.h +++ b/src/tsdb/inc/tsdbMain.h @@ -29,20 +29,10 @@ extern "C" { extern int tsdbDebugFlag; -#define tsdbError(...) \ - if (tsdbDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR TDB ", tsdbDebugFlag, __VA_ARGS__); \ - } -#define tsdbWarn(...) \ - if (tsdbDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN TDB ", tsdbDebugFlag, __VA_ARGS__); \ - } -#define tsdbTrace(...) \ - if (tsdbDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); \ - } -#define tsdbPrint(...) \ - { taosPrintLog("TDB ", 255, __VA_ARGS__); } +#define tsdbError(...) { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR TDB ", tsdbDebugFlag, __VA_ARGS__); }} +#define tsdbWarn(...) { if (tsdbDebugFlag & DEBUG_WARN) { taosPrintLog("WARN TDB ", tsdbDebugFlag, __VA_ARGS__); }} +#define tsdbTrace(...) { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} +#define tsdbPrint(...) { taosPrintLog("TDB ", 255, __VA_ARGS__); } // ------------------------------ TSDB META FILE INTERFACES ------------------------------ #define TSDB_META_FILE_NAME "meta" diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index 420b08c1e1a55f041c6020e5a210aaa453778efc..de6ed85b09959ed6755b7e2250544ad33d52f3c1 100644 --- a/tests/script/basicSuite.sim +++ b/tests/script/basicSuite.sim @@ -1,21 +1,21 @@ run general/cache/new_metrics.sim +run general/column/commit.sim run general/compress/compress.sim -run general/compute/avg.sim -run general/compute/count.sim -run general/db/len.sim +run general/compute/interval.sim run general/db/basic4.sim +run general/field/binary.sim run general/http/restful_insert.sim -run general/import/basic.sim run general/import/commit.sim -run general/insert/query_file_memory.sim +run general/import/replica1.sim +run general/parser/auto_create_tb_drop_tb.sim run general/parser/binary_escapeCharacter.sim run general/parser/select_from_cache_disk.sim +run general/stable/vnode3.sim run general/table/autocreate.sim -run general/table/column_name.sim -run general/table/int.sim +run general/table/fill.sim run general/table/vgroup.sim -run general/user/basic1.sim -run general/user/pass_alter.sim -run general/vector/single.sim -#run general/connection/connection.sim +run general/tag/filter.sim run general/user/authority.sim +run general/user/pass_alter.sim +run general/vector/metrics_mix.sim +run general/vector/table_field.sim