Merge branch 'develop' into feature/2.0tsdb

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
 }

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;
 

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
 }

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

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;

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
 }

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
 }

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");
     }
   }
 }

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

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

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

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

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"

tests/pytest/import_merge/importToCommit.py

@@ -46,7 +46,6 @@ class TDTestCase:
         tdLog.info('insert data until the first commit')
         dnodesDir = tdDnodes.getDnodesRootDir()
         dataDir = dnodesDir + '/dnode1/data/vnode'
-        tdLog.info('CBD: dataDir=%s' % dataDir)
         startTime = self.startTime
         rid0 = 1
         while (True):

tests/script/basicSuite.sim

 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

tests/test/c/CMakeLists.txt

@@ -16,6 +16,6 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   add_executable(importOneRow importOneRow.c)
   target_link_libraries(importOneRow taos_static pthread)
 
-  add_executable(importPerTabe importPerTabe.c)
-  target_link_libraries(importPerTabe taos_static pthread)
+  add_executable(importPerTable importPerTable.c)
+  target_link_libraries(importPerTable taos_static pthread)
 ENDIF()