Merge branch 'develop' into hotfix/sangshuduo/TD-3147-insert-rate-more-than-1s

src/kit/taosdemo/taosdemo.c

@@ -998,7 +998,7 @@ static int printfInsertMeta() {
   printf("database count:             \033[33m%d\033[0m\n", g_Dbs.dbCount);
   for (int i = 0; i < g_Dbs.dbCount; i++) {
     printf("database[\033[33m%d\033[0m]:\n", i);
-    printf("  database name:         \033[33m%s\033[0m\n", g_Dbs.db[i].dbName);
+    printf("  database[%d] name:      \033[33m%s\033[0m\n", i, g_Dbs.db[i].dbName);
     if (0 == g_Dbs.db[i].drop) {
       printf("  drop:                  \033[33mno\033[0m\n");     
     }else {
@@ -1147,7 +1147,7 @@ static void printfInsertMetaToFile(FILE* fp) {
   fprintf(fp, "database count:          %d\n", g_Dbs.dbCount);
   for (int i = 0; i < g_Dbs.dbCount; i++) {
     fprintf(fp, "database[%d]:\n", i);
-    fprintf(fp, "  database name:         %s\n", g_Dbs.db[i].dbName);
+    fprintf(fp, "  database[%d] name:       %s\n", i, g_Dbs.db[i].dbName);
     if (0 == g_Dbs.db[i].drop) {
       fprintf(fp, "  drop:                  no\n");     
     }else {
@@ -2140,7 +2140,7 @@ static int createDatabases() {
     }
     printf("\ncreate database %s success!\n\n", g_Dbs.db[i].dbName);
 
-    debugPrint("DEBUG %s() %d count:%d\n", __func__, __LINE__, g_Dbs.db[i].superTblCount);
+    debugPrint("DEBUG %s() %d supertbl count:%d\n", __func__, __LINE__, g_Dbs.db[i].superTblCount);
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
       // describe super table, if exists
       sprintf(command, "describe %s.%s;", g_Dbs.db[i].dbName, g_Dbs.db[i].superTbls[j].sTblName);
@@ -2285,6 +2285,7 @@ int startMultiThreadCreateChildTable(
     t_info->threadID = i;
     tstrncpy(t_info->db_name, db_name, MAX_DB_NAME_SIZE);
     t_info->superTblInfo = superTblInfo;
+    debugPrint("DEBUG %s() %d db_name: %s\n", __func__, __LINE__, db_name);
     t_info->taos = taos_connect(
             g_Dbs.host,
             g_Dbs.user,
@@ -2347,25 +2348,26 @@ static void createChildTables() {
     } else {
         // normal table
         len = snprintf(tblColsBuf, MAX_SQL_SIZE, "(TS TIMESTAMP");
-        int i = 0;
-        while (g_args.datatype[i]) {
-            if ((strncasecmp(g_args.datatype[i], "BINARY", strlen("BINARY")) == 0)
-                    || (strncasecmp(g_args.datatype[i], "NCHAR", strlen("NCHAR")) == 0)) {
-                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE, ", COL%d %s(60)", i, g_args.datatype[i]);
+        int j = 0;
+        while (g_args.datatype[j]) {
+            if ((strncasecmp(g_args.datatype[j], "BINARY", strlen("BINARY")) == 0)
+                    || (strncasecmp(g_args.datatype[j], "NCHAR", strlen("NCHAR")) == 0)) {
+                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE, ", COL%d %s(60)", j, g_args.datatype[j]);
             } else {
-                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE, ", COL%d %s", i, g_args.datatype[i]);
+                len = snprintf(tblColsBuf + len, MAX_SQL_SIZE, ", COL%d %s", j, g_args.datatype[j]);
             }
             len = strlen(tblColsBuf);
+            j++;
         }
 
         len = snprintf(tblColsBuf + len, MAX_SQL_SIZE - len, ")");
 
-        debugPrint("DEBUG - %s() LN%d: %s\n", __func__, __LINE__,
-                tblColsBuf);
+        debugPrint("DEBUG - %s() LN%d: dbName: %s num of tb: %d schema: %s\n", __func__, __LINE__,
+                g_Dbs.db[i].dbName, g_args.num_of_tables, tblColsBuf);
         startMultiThreadCreateChildTable(
               tblColsBuf,
               g_Dbs.threadCountByCreateTbl,
-              g_args.num_of_DPT,
+              g_args.num_of_tables,
               g_Dbs.db[i].dbName,
               NULL);
     }