cherry pick from develop branch. (#6903)

src/kit/taosdemo/taosdemo.c

@@ -54,6 +54,7 @@
 #include "tutil.h"
 
 #define STMT_IFACE_ENABLED  0
+#define NANO_SECOND_ENABLED  0
 
 #define REQ_EXTRA_BUF_LEN   1024
 #define RESP_BUF_LEN        4096
@@ -66,13 +67,6 @@ extern char configDir[];
 
 #define STR_INSERT_INTO     "INSERT INTO "
 
-enum TEST_MODE {
-    INSERT_TEST,            // 0
-    QUERY_TEST,             // 1
-    SUBSCRIBE_TEST,         // 2
-    INVAID_TEST
-};
-
 #define MAX_RECORDS_PER_REQ     32766
 
 #define HEAD_BUFF_LEN       TSDB_MAX_COLUMNS*24  // 16*MAX_COLUMNS + (192+32)*2 + insert into ..
@@ -105,6 +99,13 @@ enum TEST_MODE {
 #define DEFAULT_TIMESTAMP_STEP  1
 
 
+enum TEST_MODE {
+    INSERT_TEST,            // 0
+    QUERY_TEST,             // 1
+    SUBSCRIBE_TEST,         // 2
+    INVAID_TEST
+};
+
 typedef enum CREATE_SUB_TALBE_MOD_EN {
     PRE_CREATE_SUBTBL,
     AUTO_CREATE_SUBTBL,
@@ -228,7 +229,7 @@ typedef struct SArguments_S {
     int64_t  num_of_DPT;
     int      abort;
     uint32_t disorderRatio;               // 0: no disorder, >0: x%
-    int      disorderRange;               // ms or us by database precision
+    int      disorderRange;               // ms, us or ns. accordig to database precision
     uint32_t method_of_delete;
     char **  arg_list;
     uint64_t totalInsertRows;
@@ -256,10 +257,10 @@ typedef struct SSuperTable_S {
     int64_t      childTblLimit;
     uint64_t     childTblOffset;
 
-//  int          multiThreadWriteOneTbl;  // 0: no, 1: yes
+    //  int          multiThreadWriteOneTbl;  // 0: no, 1: yes
     uint32_t     interlaceRows;           //
     int          disorderRatio;           // 0: no disorder, >0: x%
-  int          disorderRange;           // ms or us by database precision
+    int          disorderRange;           // ms, us or ns. according to database precision
     uint64_t     maxSqlLen;               //
 
     uint64_t     insertInterval;          // insert interval, will override global insert interval
@@ -317,7 +318,7 @@ typedef struct {
 } SDbInfo;
 
 typedef struct SDbCfg_S {
-//  int       maxtablesPerVnode;
+    //  int       maxtablesPerVnode;
     uint32_t  minRows;        // 0 means default
     uint32_t  maxRows;        // 0 means default
     int       comp;
@@ -1514,7 +1515,10 @@ static int printfInsertMeta() {
         }
         if (g_Dbs.db[i].dbCfg.precision[0] != 0) {
             if ((0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ms", 2))
-                    || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "us", 2))) {
+#if NANO_SECOND_ENABLED == 1
+                    || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "us", 2))
+#endif
+                    || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ns", 2))) {
                 printf("  precision:             \033[33m%s\033[0m\n",
                         g_Dbs.db[i].dbCfg.precision);
             } else {
@@ -1704,6 +1708,9 @@ static void printfInsertMetaToFile(FILE* fp) {
         }
         if (g_Dbs.db[i].dbCfg.precision[0] != 0) {
             if ((0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ms", 2))
+#if NANO_SECOND_ENABLED == 1
+                    || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ns", 2))
+#endif
                     || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "us", 2))) {
                 fprintf(fp, "  precision:             %s\n",
                         g_Dbs.db[i].dbCfg.precision);
@@ -1904,10 +1911,12 @@ static void printfQueryMeta() {
 
 static char* formatTimestamp(char* buf, int64_t val, int precision) {
     time_t tt;
-    if (precision == TSDB_TIME_PRECISION_NANO) {
-        tt = (time_t)(val / 1000000000);
-    } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+    if (precision == TSDB_TIME_PRECISION_MICRO) {
         tt = (time_t)(val / 1000000);
+#if NANO_SECOND_ENABLED == 1
+    } if (precision == TSDB_TIME_PRECISION_NANO) {
+        tt = (time_t)(val / 1000000000);
+#endif
     } else {
         tt = (time_t)(val / 1000);
     }
@@ -1927,10 +1936,12 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
     struct tm* ptm = localtime(&tt);
     size_t pos = strftime(buf, 32, "%Y-%m-%d %H:%M:%S", ptm);
 
-    if (precision == TSDB_TIME_PRECISION_NANO) {
-        sprintf(buf + pos, ".%09d", (int)(val % 1000000000));
-    } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+    if (precision == TSDB_TIME_PRECISION_MICRO) {
         sprintf(buf + pos, ".%06d", (int)(val % 1000000));
+#if NANO_SECOND_ENABLED == 1
+    } else if (precision == TSDB_TIME_PRECISION_NANO) {
+        sprintf(buf + pos, ".%09d", (int)(val % 1000000000));
+#endif
     } else {
         sprintf(buf + pos, ".%03d", (int)(val % 1000));
     }
@@ -2954,6 +2965,10 @@ static int createDatabasesAndStables() {
                         " fsync %d", g_Dbs.db[i].dbCfg.fsync);
             }
             if ((0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ms", strlen("ms")))
+#if NANO_SECOND_ENABLED == 1
+                    || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision,
+                            "ns", strlen("ns")))
+#endif
                     || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision,
                             "us", strlen("us"))))  {
                 dataLen += snprintf(command + dataLen, BUFFER_SIZE - dataLen,
@@ -4141,7 +4156,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
                         __func__, __LINE__);
                 goto PARSE_OVER;
             }
-/*
+            /*
                cJSON *multiThreadWriteOneTbl =
                cJSON_GetObjectItem(stbInfo, "multi_thread_write_one_tbl"); // no , yes
                if (multiThreadWriteOneTbl
@@ -4158,7 +4173,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
                printf("ERROR: failed to read json, multiThreadWriteOneTbl not found\n");
                goto PARSE_OVER;
                }
-*/
+               */
             cJSON* insertRows = cJSON_GetObjectItem(stbInfo, "insert_rows");
             if (insertRows && insertRows->type == cJSON_Number) {
                 if (insertRows->valueint < 0) {
@@ -6542,6 +6557,10 @@ static void startMultiThreadInsertData(int threads, char* db_name,
             timePrec = TSDB_TIME_PRECISION_MILLI;
         } else if (0 == strncasecmp(precision, "us", 2)) {
             timePrec = TSDB_TIME_PRECISION_MICRO;
+#if NANO_SECOND_ENABLED == 1
+        } else if (0 == strncasecmp(precision, "ns", 2)) {
+            timePrec = TSDB_TIME_PRECISION_NANO;
+#endif
         } else {
             errorPrint("Not support precision: %s\n", precision);
             exit(-1);
@@ -6760,19 +6779,19 @@ static void startMultiThreadInsertData(int threads, char* db_name,
             pThreadInfo->taos = NULL;
         }
 
-/*    if ((NULL == superTblInfo)
+        /*    if ((NULL == superTblInfo)
               || (0 == superTblInfo->multiThreadWriteOneTbl)) {
               */
         pThreadInfo->start_table_from = tableFrom;
         pThreadInfo->ntables = i<b?a+1:a;
         pThreadInfo->end_table_to = i < b ? tableFrom + a : tableFrom + a - 1;
         tableFrom = pThreadInfo->end_table_to + 1;
-/*    } else {
+        /*    } else {
               pThreadInfo->start_table_from = 0;
               pThreadInfo->ntables = superTblInfo->childTblCount;
               pThreadInfo->start_time = pThreadInfo->start_time + rand_int() % 10000 - rand_tinyint();
               }
-*/
+              */
         tsem_init(&(pThreadInfo->lock_sem), 0, 0);
         if (ASYNC_MODE == g_Dbs.asyncMode) {
             pthread_create(pids + i, NULL, asyncWrite, pThreadInfo);