Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1

packaging/tools/install.sh

@@ -270,6 +270,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/install_arbi.sh

@@ -165,6 +165,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/install_arbi_power.sh

@@ -158,6 +158,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/install_client.sh

@@ -182,6 +182,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/install_client_power.sh

@@ -182,6 +182,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/install_power.sh

@@ -263,6 +263,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/install_tq.sh

@@ -270,6 +270,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

packaging/tools/make_install.sh

@@ -176,6 +176,7 @@ function install_bin() {
         [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos  || :
     fi
 }
+
 function install_jemalloc() {
     if [ "$osType" != "Darwin" ]; then
         /usr/bin/install -c -d /usr/local/bin
@@ -217,6 +218,7 @@ function install_jemalloc() {
             /usr/bin/install -c -d /usr/local/share/man/man3
             /usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 

src/kit/taosdemo/taosdemo.c

@@ -3216,6 +3216,13 @@ static int readTagFromCsvFileToMem(SSuperTable  * superTblInfo) {
   return 0;
 }
 
+#if 0
+int readSampleFromJsonFileToMem(SSuperTable  * superTblInfo) {
+  // TODO
+  return 0;
+}
+#endif
+
 /*
   Read 10000 lines at most. If more than 10000 lines, continue to read after using
 */
@@ -5331,7 +5338,7 @@ static int64_t generateInterlaceDataWithoutStb(
 
 #if STMT_IFACE_ENABLED == 1
 static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
-        char *dataType, int32_t dataLen, char **ptr, char *value)
+        char *dataType, int32_t dataLen, char **ptr)
 {
     if (0 == strncasecmp(dataType,
                 "BINARY", strlen("BINARY"))) {
@@ -5341,18 +5348,12 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
             return -1;
         }
         char *bind_binary = (char *)*ptr;
+        rand_string(bind_binary, dataLen);
 
         bind->buffer_type = TSDB_DATA_TYPE_BINARY;
-        if (value) {
-            strncpy(bind_binary, value, strlen(value));
-            bind->buffer_length = strlen(bind_binary);
-        } else {
-            rand_string(bind_binary, dataLen);
-            bind->buffer_length = dataLen;
-        }
-
-        bind->length = &bind->buffer_length;
+        bind->buffer_length = dataLen;
         bind->buffer = bind_binary;
+        bind->length = &bind->buffer_length;
         bind->is_null = NULL;
 
         *ptr += bind->buffer_length;
@@ -5364,14 +5365,9 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
             return -1;
         }
         char *bind_nchar = (char *)*ptr;
+        rand_string(bind_nchar, dataLen);
 
         bind->buffer_type = TSDB_DATA_TYPE_NCHAR;
-        if (value) {
-            strncpy(bind_nchar, value, strlen(value));
-        } else {
-            rand_string(bind_nchar, dataLen);
-        }
-
         bind->buffer_length = strlen(bind_nchar);
         bind->buffer = bind_nchar;
         bind->length = &bind->buffer_length;
@@ -5382,11 +5378,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "INT", strlen("INT"))) {
         int32_t *bind_int = (int32_t *)*ptr;
 
-        if (value) {
-            *bind_int = atoi(value);
-        } else {
-            *bind_int = rand_int();
-        }
+        *bind_int = rand_int();
         bind->buffer_type = TSDB_DATA_TYPE_INT;
         bind->buffer_length = sizeof(int32_t);
         bind->buffer = bind_int;
@@ -5398,11 +5390,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "BIGINT", strlen("BIGINT"))) {
         int64_t *bind_bigint = (int64_t *)*ptr;
 
-        if (value) {
-            *bind_bigint = atoll(value);
-        } else {
-            *bind_bigint = rand_bigint();
-        }
+        *bind_bigint = rand_bigint();
         bind->buffer_type = TSDB_DATA_TYPE_BIGINT;
         bind->buffer_length = sizeof(int64_t);
         bind->buffer = bind_bigint;
@@ -5414,11 +5402,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "FLOAT", strlen("FLOAT"))) {
         float   *bind_float = (float *) *ptr;
 
-        if (value) {
-            *bind_float = (float)atof(value);
-        } else {
-            *bind_float = rand_float();
-        }
+        *bind_float = rand_float();
         bind->buffer_type = TSDB_DATA_TYPE_FLOAT;
         bind->buffer_length = sizeof(float);
         bind->buffer = bind_float;
@@ -5430,11 +5414,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "DOUBLE", strlen("DOUBLE"))) {
         double  *bind_double = (double *)*ptr;
 
-        if (value) {
-            *bind_double = atof(value);
-        } else {
-            *bind_double = rand_double();
-        }
+        *bind_double = rand_double();
         bind->buffer_type = TSDB_DATA_TYPE_DOUBLE;
         bind->buffer_length = sizeof(double);
         bind->buffer = bind_double;
@@ -5446,11 +5426,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "SMALLINT", strlen("SMALLINT"))) {
         int16_t *bind_smallint = (int16_t *)*ptr;
 
-        if (value) {
-            *bind_smallint = (int16_t)atoi(value);
-        } else {
-            *bind_smallint = rand_smallint();
-        }
+        *bind_smallint = rand_smallint();
         bind->buffer_type = TSDB_DATA_TYPE_SMALLINT;
         bind->buffer_length = sizeof(int16_t);
         bind->buffer = bind_smallint;
@@ -5462,11 +5438,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "TINYINT", strlen("TINYINT"))) {
         int8_t  *bind_tinyint = (int8_t *)*ptr;
 
-        if (value) {
-            *bind_tinyint = (int8_t)atoi(value);
-        } else {
-            *bind_tinyint = rand_tinyint();
-        }
+        *bind_tinyint = rand_tinyint();
         bind->buffer_type = TSDB_DATA_TYPE_TINYINT;
         bind->buffer_length = sizeof(int8_t);
         bind->buffer = bind_tinyint;
@@ -5489,11 +5461,7 @@ static int32_t prepareStmtBindArrayByType(TAOS_BIND *bind,
                 "TIMESTAMP", strlen("TIMESTAMP"))) {
         int64_t *bind_ts2 = (int64_t *) *ptr;
 
-        if (value) {
-            *bind_ts2 = atoll(value);
-        } else {
-            *bind_ts2 = rand_bigint();
-        }
+        *bind_ts2 = rand_bigint();
         bind->buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
         bind->buffer_length = sizeof(int64_t);
         bind->buffer = bind_ts2;
@@ -5559,13 +5527,12 @@ static int32_t prepareStmtWithoutStb(
         ptr += bind->buffer_length;
 
         for (int i = 0; i < g_args.num_of_CPR; i ++) {
-            bind = (TAOS_BIND *)((char *)bindArray
-                    + (sizeof(TAOS_BIND) * (i + 1)));
+            bind = (TAOS_BIND *)((char *)bindArray + (sizeof(TAOS_BIND) * (i + 1)));
             if ( -1 == prepareStmtBindArrayByType(
                         bind,
                         data_type[i],
                         g_args.len_of_binary,
-                        &ptr, NULL)) {
+                        &ptr)) {
                 return -1;
             }
         }
@@ -5584,14 +5551,12 @@ static int32_t prepareStmtWithoutStb(
     return k;
 }
 
-static int32_t prepareStbStmt(
-        SSuperTable *stbInfo,
+static int32_t prepareStbStmt(SSuperTable *stbInfo,
         TAOS_STMT *stmt,
         char *tableName, uint32_t batch,
         uint64_t insertRows,
         uint64_t recordFrom,
-        int64_t startTime,
-        int64_t *pSamplePos)
+        int64_t startTime, char *buffer)
 {
     int ret = taos_stmt_set_tbname(stmt, tableName);
     if (ret != 0) {
@@ -5602,24 +5567,16 @@ static int32_t prepareStbStmt(
 
     char *bindArray = malloc(sizeof(TAOS_BIND) * (stbInfo->columnCount + 1));
     if (bindArray == NULL) {
-        errorPrint("%s() LN%d, Failed to allocate %d bind params\n",
-                __func__, __LINE__, (stbInfo->columnCount + 1));
+        errorPrint("Failed to allocate %d bind params\n",
+                (stbInfo->columnCount + 1));
         return -1;
     }
 
-    bool sourceRand;
+    bool tsRand;
     if (0 == strncasecmp(stbInfo->dataSource, "rand", strlen("rand"))) {
-        sourceRand = true;
+        tsRand = true;
     } else {
-        sourceRand = false;     // from sample data file
-    }
-
-    char *bindBuffer = malloc(g_args.len_of_binary);
-    if (bindBuffer == NULL) {
-        errorPrint("%s() LN%d, Failed to allocate %d bind buffer\n",
-                __func__, __LINE__, g_args.len_of_binary);
-        free(bindArray);
-        return -1;
+        tsRand = false;
     }
 
     uint32_t k;
@@ -5635,7 +5592,7 @@ static int32_t prepareStbStmt(
 
         bind_ts = (int64_t *)ptr;
         bind->buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
-        if (sourceRand) {
+        if (tsRand) {
             *bind_ts = startTime + getTSRandTail(
                     stbInfo->timeStampStep, k,
                     stbInfo->disorderRatio,
@@ -5650,46 +5607,14 @@ static int32_t prepareStbStmt(
 
         ptr += bind->buffer_length;
 
-        int cursor = 0;
         for (int i = 0; i < stbInfo->columnCount; i ++) {
             bind = (TAOS_BIND *)((char *)bindArray + (sizeof(TAOS_BIND) * (i + 1)));
-
-            if (sourceRand) {
-                if ( -1 == prepareStmtBindArrayByType(
-                            bind,
-                            stbInfo->columns[i].dataType,
-                            stbInfo->columns[i].dataLen,
-                            &ptr,
-                            NULL)) {
-                    free(bindArray);
-                    free(bindBuffer);
-                    return -1;
-                }
-            } else {
-                char *restStr = stbInfo->sampleDataBuf + cursor;
-                int lengthOfRest = strlen(restStr);
-
-                int index = 0;
-                for (index = 0; index < lengthOfRest; index ++) {
-                    if (restStr[index] == ',') {
-                        break;
-                    }
-                }
-
-                memset(bindBuffer, 0, g_args.len_of_binary);
-                strncpy(bindBuffer, restStr, index);
-                cursor += index + 1; // skip ',' too
-
-                if ( -1 == prepareStmtBindArrayByType(
-                            bind,
-                            stbInfo->columns[i].dataType,
-                            stbInfo->columns[i].dataLen,
-                            &ptr,
-                            bindBuffer)) {
-                    free(bindArray);
-                    free(bindBuffer);
-                    return -1;
-                }
+            if ( -1 == prepareStmtBindArrayByType(
+                        bind,
+                        stbInfo->columns[i].dataType,
+                        stbInfo->columns[i].dataLen,
+                        &ptr)) {
+                return -1;
             }
         }
         taos_stmt_bind_param(stmt, (TAOS_BIND *)bindArray);
@@ -5698,16 +5623,11 @@ static int32_t prepareStbStmt(
 
         k++;
         recordFrom ++;
-
-        if (!sourceRand) {
-            (*pSamplePos) ++;
-        }
         if (recordFrom >= insertRows) {
             break;
         }
     }
 
-    free(bindBuffer);
     free(bindArray);
     return k;
 }
@@ -5900,14 +5820,13 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
       if (superTblInfo) {
           if (superTblInfo->iface == STMT_IFACE) {
 #if STMT_IFACE_ENABLED == 1
-              generated = prepareStbStmt(
-                      superTblInfo,
+              generated = prepareStbStmt(superTblInfo,
                       pThreadInfo->stmt,
                       tableName,
                       batchPerTbl,
                       insertRows, i,
                       startTime,
-                      &(pThreadInfo->samplePos));
+                      pThreadInfo->buffer);
 #else
               generated = -1;
 #endif
@@ -6132,8 +6051,7 @@ static void* syncWriteProgressive(threadInfo *pThreadInfo) {
                       pThreadInfo->stmt,
                       tableName,
                       g_args.num_of_RPR,
-                      insertRows, i, start_time,
-                      &(pThreadInfo->samplePos));
+                      insertRows, i, start_time, pstr);
 #else
               generated = -1;
 #endif