[TD-10418]taosdemo cmdline datatype binary, nchar with customized width

src/kit/taosdemo/taosdemo.c

@@ -586,6 +586,7 @@ static int64_t getTSRandTail(int64_t timeStampStep, int32_t seq,
         int disorderRatio, int disorderRange);
 static bool getInfoFromJsonFile(char* file);
 static void init_rand_data();
+static int regexMatch(const char *s, const char *reg, int cflags);
 
 /* ************ Global variables ************  */
 
@@ -1579,9 +1580,8 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                         && strcasecmp(dataType, "SMALLINT")
                         && strcasecmp(dataType, "BIGINT")
                         && strcasecmp(dataType, "DOUBLE")
-                        && strcasecmp(dataType, "BINARY")
                         && strcasecmp(dataType, "TIMESTAMP")
-                        && strcasecmp(dataType, "NCHAR")
+                        && !regexMatch(dataType, "^(NCHAR|BINARY)(\\([1-9][0-9]*\\))?$", REG_ICASE | REG_EXTENDED)
                         && strcasecmp(dataType, "UTINYINT")
                         && strcasecmp(dataType, "USMALLINT")
                         && strcasecmp(dataType, "UINT")
@@ -1603,9 +1603,11 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                     arguments->data_type[0] = TSDB_DATA_TYPE_FLOAT;
                 } else if (0 == strcasecmp(dataType, "DOUBLE")) {
                     arguments->data_type[0] = TSDB_DATA_TYPE_DOUBLE;
-                } else if (0 == strcasecmp(dataType, "BINARY")) {
+                } else if (1 == regexMatch(dataType, "^BINARY(\\([1-9][0-9]*\\))?$", REG_ICASE | 
+                    REG_EXTENDED)) {
                     arguments->data_type[0] = TSDB_DATA_TYPE_BINARY;
-                } else if (0 == strcasecmp(dataType, "NCHAR")) {
+                } else if (1 == regexMatch(dataType, "^NCHAR(\\([1-9][0-9]*\\))?$", REG_ICASE | 
+                    REG_EXTENDED)) {
                     arguments->data_type[0] = TSDB_DATA_TYPE_NCHAR;
                 } else if (0 == strcasecmp(dataType, "BOOL")) {
                     arguments->data_type[0] = TSDB_DATA_TYPE_BOOL;
@@ -1638,9 +1640,8 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                             && strcasecmp(token, "SMALLINT")
                             && strcasecmp(token, "BIGINT")
                             && strcasecmp(token, "DOUBLE")
-                            && strcasecmp(token, "BINARY")
                             && strcasecmp(token, "TIMESTAMP")
-                            && strcasecmp(token, "NCHAR")
+                            && !regexMatch(token, "^(NCHAR|BINARY)(\\([1-9][0-9]*\\))?$", REG_ICASE | REG_EXTENDED)
                             && strcasecmp(token, "UTINYINT")
                             && strcasecmp(token, "USMALLINT")
                             && strcasecmp(token, "UINT")
@@ -1663,9 +1664,11 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                         arguments->data_type[index] = TSDB_DATA_TYPE_DOUBLE;
                     } else if (0 == strcasecmp(token, "TINYINT")) {
                         arguments->data_type[index] = TSDB_DATA_TYPE_TINYINT;
-                    } else if (0 == strcasecmp(token, "BINARY")) {
+                    } else if (1 == regexMatch(token, "^BINARY(\\([1-9][0-9]*\\))?$", REG_ICASE | 
+                    REG_EXTENDED)) {
                         arguments->data_type[index] = TSDB_DATA_TYPE_BINARY;
-                    } else if (0 == strcasecmp(token, "NCHAR")) {
+                    } else if (1 == regexMatch(token, "^NCHAR(\\([1-9][0-9]*\\))?$", REG_ICASE | 
+                    REG_EXTENDED)) {
                         arguments->data_type[index] = TSDB_DATA_TYPE_NCHAR;
                     } else if (0 == strcasecmp(token, "BOOL")) {
                         arguments->data_type[index] = TSDB_DATA_TYPE_BOOL;
@@ -2735,7 +2738,7 @@ static int printfInsertMeta() {
                     g_Dbs.db[i].superTbls[j].sampleFile);
             printf("      tagsFile:          \033[33m%s\033[0m\n",
                     g_Dbs.db[i].superTbls[j].tagsFile);
-            printf("      columnCount:       \033[33m%d\033[0m\n",
+            printf("      columnCount:       \033[33m%d\033[0m\n        ",
                     g_Dbs.db[i].superTbls[j].columnCount);
             for (int k = 0; k < g_Dbs.db[i].superTbls[j].columnCount; k++) {
                 //printf("dataType:%s, dataLen:%d\t", g_Dbs.db[i].superTbls[j].columns[k].dataType, g_Dbs.db[i].superTbls[j].columns[k].dataLen);
@@ -2743,7 +2746,7 @@ static int printfInsertMeta() {
                                 "binary", 6))
                         || (0 == strncasecmp(g_Dbs.db[i].superTbls[j].columns[k].dataType,
                                 "nchar", 5))) {
-                    printf("column[\033[33m%d\033[0m]:\033[33m%s(%d)\033[0m ", k,
+                    printf("column[%d]:\033[33m%s(%d)\033[0m ", k,
                             g_Dbs.db[i].superTbls[j].columns[k].dataType,
                             g_Dbs.db[i].superTbls[j].columns[k].dataLen);
                 } else {
@@ -11815,7 +11818,20 @@ static void setParaFromArg() {
             g_Dbs.db[0].superTbls[0].columns[i].data_type = data_type[i];
             tstrncpy(g_Dbs.db[0].superTbls[0].columns[i].dataType,
                     dataType[i], min(DATATYPE_BUFF_LEN, strlen(dataType[i]) + 1));
-            g_Dbs.db[0].superTbls[0].columns[i].dataLen = g_args.binwidth;
+            if (1 == regexMatch(dataType[i], "^(NCHAR|BINARY)(\\([1-9][0-9]*\\))$", REG_ICASE | 
+                    REG_EXTENDED)) {
+                char type[20];
+                char length[20];
+                sscanf(dataType[i], "%[^(](%[^)]", type, length);
+                printf("%s and type is %s, datalength is : %s\n", dataType[i], type, length);
+                g_Dbs.db[0].superTbls[0].columns[i].dataLen = atoi(length);
+                tstrncpy(g_Dbs.db[0].superTbls[0].columns[i].dataType,
+                    type, min(DATATYPE_BUFF_LEN, strlen(type) + 1));
+            } else {
+                g_Dbs.db[0].superTbls[0].columns[i].dataLen = g_args.binwidth;
+                tstrncpy(g_Dbs.db[0].superTbls[0].columns[i].dataType,
+                    dataType[i], min(DATATYPE_BUFF_LEN, strlen(dataType[i]) + 1)); 
+            }
             g_Dbs.db[0].superTbls[0].columnCount++;
         }