diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 1caacd9f2480b054f680f034b7bc34b1544aa397..045f459f8ecf276276cb4067067b255d6a0f8703 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -185,6 +185,7 @@ typedef struct SArguments_S {
   bool     insert_only;
   bool     answer_yes;
   bool     debug_print;
+  bool     verbose_print;
   char *   output_file;
   int      mode;
   char *   datatype[MAX_NUM_DATATYPE + 1];
@@ -489,6 +490,7 @@ SArguments g_args = {
                      false,           // use_metric
                      false,           // insert_only
                      false,           // debug_print
+                     false,           // verbose_print
                      false,           // answer_yes;
                      "./output.txt",  // output_file
                      0,               // mode : sync or async
@@ -526,7 +528,11 @@ static SQueryMetaInfo  g_queryInfo;
 static FILE *          g_fpOfInsertResult = NULL;
 
 #define debugPrint(fmt, ...) \
-    do { if (g_args.debug_print) fprintf(stderr, fmt, __VA_ARGS__); } while(0)
+    do { if (g_args.debug_print || g_args.verbose_print) \
+      fprintf(stderr, "DEBG: "fmt, __VA_ARGS__); } while(0)
+#define verbosePrint(fmt, ...) \
+    do { if (g_args.verbose_print) fprintf(stderr, "VERB: "fmt, __VA_ARGS__); } while(0)
+
 ///////////////////////////////////////////////////
 
 void printHelp() {
@@ -691,6 +697,8 @@ void parse_args(int argc, char *argv[], SArguments *arguments) {
       arguments->answer_yes = true;
     } else if (strcmp(argv[i], "-g") == 0) {
       arguments->debug_print = true;
+    } else if (strcmp(argv[i], "-gg") == 0) {
+      arguments->verbose_print = true;
     } else if (strcmp(argv[i], "-c") == 0) {
       strcpy(configDir, argv[++i]);
     } else if (strcmp(argv[i], "-O") == 0) {
@@ -748,7 +756,7 @@ void parse_args(int argc, char *argv[], SArguments *arguments) {
         printf("\n");
     }
     printf("# Insertion interval:                %d\n", arguments->insert_interval);
-    printf("# Number of Columns per record:      %d\n", arguments->num_of_RPR);
+    printf("# Number of records per req:         %d\n", arguments->num_of_RPR);
     printf("# Number of Threads:                 %d\n", arguments->num_of_threads);
     printf("# Number of Tables:                  %d\n", arguments->num_of_tables);
     printf("# Number of Data per Table:          %d\n", arguments->num_of_DPT);
@@ -805,7 +813,7 @@ static int queryDbExec(TAOS *taos, char *command, int type) {
   }
 
   if (code != 0) {
-    debugPrint("DEBUG %s() LN%d - command: %s\n", __func__, __LINE__, command);
+    debugPrint("%s() LN%d - command: %s\n", __func__, __LINE__, command);
     fprintf(stderr, "Failed to run %s, reason: %s\n", command, taos_errstr(res));
     taos_free_result(res);
     //taos_close(taos);
@@ -1986,7 +1994,7 @@ static int createSuperTable(TAOS * taos, char* dbName, SSuperTable*  superTbls,
     exit(-1);
   }
   snprintf(superTbls->colsOfCreateChildTable, len+20, "(ts timestamp%s)", cols);
-  debugPrint("DEBUG - %s() LN%d: %s\n", __func__, __LINE__, superTbls->colsOfCreateChildTable);
+  verbosePrint("%s() LN%d: %s\n", __func__, __LINE__, superTbls->colsOfCreateChildTable);
 
   if (use_metric) {
     char tags[STRING_LEN] = "\0";
@@ -2039,13 +2047,13 @@ static int createSuperTable(TAOS * taos, char* dbName, SSuperTable*  superTbls,
     snprintf(command, BUFFER_SIZE,
             "create table if not exists %s.%s (ts timestamp%s) tags %s",
             dbName, superTbls->sTblName, cols, tags);
-    debugPrint("DEBUG - %s() LN%d: %s\n", __func__, __LINE__, command);
+    verbosePrint("%s() LN%d: %s\n", __func__, __LINE__, command);
 
     if (0 != queryDbExec(taos, command, NO_INSERT_TYPE)) {
         fprintf(stderr, "create supertable %s failed!\n\n", superTbls->sTblName);
         return -1;
     }
-    debugPrint("DEBUG - create supertable %s success!\n\n", superTbls->sTblName);
+    debugPrint("create supertable %s success!\n\n", superTbls->sTblName);
   }
   return 0;
 }
@@ -2064,7 +2072,7 @@ static int createDatabases() {
   for (int i = 0; i < g_Dbs.dbCount; i++) {   
     if (g_Dbs.db[i].drop) {
       sprintf(command, "drop database if exists %s;", g_Dbs.db[i].dbName);
-      debugPrint("DEBUG %s() %d command: %s\n", __func__, __LINE__, command);
+      verbosePrint("%s() %d command: %s\n", __func__, __LINE__, command);
       if (0 != queryDbExec(taos, command, NO_INSERT_TYPE)) {
         taos_close(taos);
         return -1;
@@ -2132,7 +2140,7 @@ static int createDatabases() {
               "precision \'%s\';", g_Dbs.db[i].dbCfg.precision);
     }
 
-    debugPrint("DEBUG %s() %d command: %s\n", __func__, __LINE__, command);
+    debugPrint("%s() %d command: %s\n", __func__, __LINE__, command);
     if (0 != queryDbExec(taos, command, NO_INSERT_TYPE)) {
       taos_close(taos);
       printf("\ncreate database %s failed!\n\n", g_Dbs.db[i].dbName);
@@ -2140,11 +2148,11 @@ static int createDatabases() {
     }
     printf("\ncreate database %s success!\n\n", g_Dbs.db[i].dbName);
 
-    debugPrint("DEBUG %s() %d supertbl count:%d\n", __func__, __LINE__, g_Dbs.db[i].superTblCount);
+    debugPrint("%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);
-      debugPrint("DEBUG %s() %d command: %s\n", __func__, __LINE__, command);
+      verbosePrint("%s() %d command: %s\n", __func__, __LINE__, command);
       if (0 != queryDbExec(taos, command, NO_INSERT_TYPE)) {
         g_Dbs.db[i].superTbls[j].superTblExists = TBL_NO_EXISTS;
         ret = createSuperTable(taos, g_Dbs.db[i].dbName, &g_Dbs.db[i].superTbls[j], g_Dbs.use_metric);
@@ -2232,7 +2240,7 @@ static void* createTable(void *sarg)
     }
 
     len = 0;
-    debugPrint("DEBUG %s() LN%d %s\n", __func__, __LINE__, buffer);
+    verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
     if (0 != queryDbExec(winfo->taos, buffer, NO_INSERT_TYPE)){
       free(buffer);
       return NULL;
@@ -2247,7 +2255,7 @@ static void* createTable(void *sarg)
   }
   
   if (0 != len) {
-    debugPrint("DEBUG %s() %d buffer: %s\n", __func__, __LINE__, buffer);
+    verbosePrint("%s() %d buffer: %s\n", __func__, __LINE__, buffer);
     (void)queryDbExec(winfo->taos, buffer, NO_INSERT_TYPE);
   }
 
@@ -2285,7 +2293,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);
+    verbosePrint("%s() %d db_name: %s\n", __func__, __LINE__, db_name);
     t_info->taos = taos_connect(
             g_Dbs.host,
             g_Dbs.user,
@@ -2336,7 +2344,7 @@ static void createChildTables() {
           continue;
         }
 
-        debugPrint("DEBUG - %s() LN%d: %s\n", __func__, __LINE__,
+        verbosePrint("%s() LN%d: %s\n", __func__, __LINE__,
                 g_Dbs.db[i].superTbls[j].colsOfCreateChildTable);
         startMultiThreadCreateChildTable(
               g_Dbs.db[i].superTbls[j].colsOfCreateChildTable,
@@ -2362,7 +2370,7 @@ static void createChildTables() {
 
         len = snprintf(tblColsBuf + len, MAX_SQL_SIZE - len, ")");
 
-        debugPrint("DEBUG - %s() LN%d: dbName: %s num of tb: %d schema: %s\n", __func__, __LINE__,
+        verbosePrint("%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,
@@ -3223,7 +3231,6 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
         printf("failed to read json, disorderRange not found");
         goto PARSE_OVER;
       }
-      
 
       cJSON* insertRows = cJSON_GetObjectItem(stbInfo, "insert_rows");
       if (insertRows && insertRows->type == cJSON_Number) {
@@ -3587,7 +3594,7 @@ PARSE_OVER:
 }
 
 static bool getInfoFromJsonFile(char* file) {
-    debugPrint("DEBUG - %s %d %s\n", __func__, __LINE__, file);
+    debugPrint("%s %d %s\n", __func__, __LINE__, file);
 
   FILE *fp = fopen(file, "r");
   if (!fp) {
@@ -3746,6 +3753,7 @@ int generateRowData(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable*
       return (-1);
     }
   }
+
   dataLen -= 2;
   dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, ")");
 
@@ -3776,7 +3784,6 @@ static void syncWriteForNumberOfTblInOneSql(
   }
 
   uint64_t time_counter = winfo->start_time;
-  int64_t tmp_time;
   int sampleUsePos;
 
   int64_t st = 0;
@@ -3784,6 +3791,7 @@ static void syncWriteForNumberOfTblInOneSql(
   for (int i = 0; i < superTblInfo->insertRows;) {
     int32_t  tbl_id = 0;
     for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; ) {
+      int64_t tmp_time = 0;
       int inserted = i;
 
       for (int k = 0; k < g_args.num_of_RPR;) {
@@ -3813,7 +3821,7 @@ static void syncWriteForNumberOfTblInOneSql(
             if (0 == len) {
               len += snprintf(pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      "insert into %s.%s%d using %s.%s tags %s values ", 
+                      "insert into %s.%s%d using %s.%s tags %s values ",
                       winfo->db_name, 
                       superTblInfo->childTblPrefix, 
                       tbl_id, 
@@ -3823,7 +3831,7 @@ static void syncWriteForNumberOfTblInOneSql(
             } else {
               len += snprintf(pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      " %s.%s%d using %s.%s tags %s values ", 
+                      " %s.%s%d using %s.%s tags %s values ",
                       winfo->db_name, 
                       superTblInfo->childTblPrefix, 
                       tbl_id, 
@@ -3836,13 +3844,13 @@ static void syncWriteForNumberOfTblInOneSql(
             if (0 == len) {
               len += snprintf(pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      "insert into %s.%s values ", 
+                      "insert into %s.%s values ",
                       winfo->db_name, 
                       superTblInfo->childTblName + tbl_id * TSDB_TABLE_NAME_LEN);
             } else {
               len += snprintf(pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      " %s.%s values ", 
+                      " %s.%s values ",
                       winfo->db_name, 
                       superTblInfo->childTblName + tbl_id * TSDB_TABLE_NAME_LEN);
             }
@@ -3850,14 +3858,14 @@ static void syncWriteForNumberOfTblInOneSql(
             if (0 == len) {
               len += snprintf(pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      "insert into %s.%s%d values ", 
+                      "insert into %s.%s%d values ",
                       winfo->db_name, 
                       superTblInfo->childTblPrefix, 
                       tbl_id);
             } else {
               len += snprintf(pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      " %s.%s%d values ", 
+                      " %s.%s%d values ",
                       winfo->db_name, 
                       superTblInfo->childTblPrefix, 
                       tbl_id);
@@ -3892,7 +3900,7 @@ static void syncWriteForNumberOfTblInOneSql(
               } else {
                 retLen = generateRowData(pstr + len, 
                         superTblInfo->maxSqlLen - len, 
-                        tmp_time += superTblInfo->timeStampStep, 
+                        tmp_time += superTblInfo->timeStampStep,
                         superTblInfo);
               }
               if (retLen < 0) {
@@ -3920,7 +3928,7 @@ static void syncWriteForNumberOfTblInOneSql(
 send_to_server:
         if (g_args.insert_interval && (g_args.insert_interval > (et - st))) {
             int sleep_time = g_args.insert_interval - (et -st);
-            debugPrint("DEBUG sleep: %d ms\n", sleep_time);
+            printf("sleep: %d ms specified by insert_interval\n", sleep_time);
             taosMsleep(sleep_time); // ms
         }
 
@@ -3937,7 +3945,7 @@ send_to_server:
           int64_t endTs;
           startTs = taosGetTimestampUs();
 
-          debugPrint("DEBUG %s() LN%d buff: %s\n", __func__, __LINE__, buffer);
+          debugPrint("%s() LN%d buff: %s\n", __func__, __LINE__, buffer);
           int affectedRows = queryDbExec(
                   winfo->taos, buffer, INSERT_TYPE);
 
@@ -3950,16 +3958,16 @@ send_to_server:
             if (delay < winfo->minDelay) winfo->minDelay = delay;
             winfo->cntDelay++;
             winfo->totalDelay += delay;
-            //winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;      
+            winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;
+            winfo->totalAffectedRows += affectedRows;
           }
-          totalAffectedRows += affectedRows;
 
           int64_t  currentPrintTime = taosGetTimestampMs();
           if (currentPrintTime - lastPrintTime > 30*1000) {
             printf("thread[%d] has currently inserted rows: %"PRId64 ", affected rows: %"PRId64 "\n", 
                     winfo->threadID, 
-                    totalRowsInserted, 
-                    totalAffectedRows);
+                    winfo->totalRowsInserted,
+                    winfo->totalAffectedRows);
             lastPrintTime = currentPrintTime;
           }
           //int64_t t2 = taosGetTimestampMs();          
@@ -4090,15 +4098,18 @@ static void* syncWrite(void *sarg) {
   uint64_t st = 0;
   uint64_t et = 0;
 
-  for (int i = 0; i < g_args.num_of_DPT;) {
+  winfo->totalRowsInserted = 0;
+  winfo->totalAffectedRows = 0;
 
-    for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; tID++) {
-      int inserted = i;
+  for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; tID++) {
+    for (int i = 0; i < g_args.num_of_DPT;) {
+
+      int tblInserted = i;
       int64_t tmp_time = time_counter;
 
       char *pstr = buffer;
       pstr += sprintf(pstr,
-              "insert into %s.%s%d values",
+              "insert into %s.%s%d values ",
               winfo->db_name, g_args.tb_prefix, tID);
       int k;
       for (k = 0; k < g_args.num_of_RPR;) {
@@ -4122,31 +4133,34 @@ static void* syncWrite(void *sarg) {
         }
 
         pstr += sprintf(pstr, " %s", data);
-        inserted++;
+        tblInserted++;
         k++;
+        i++;
 
-        if (inserted >= g_args.num_of_DPT)
+        if (tblInserted >= g_args.num_of_DPT)
             break;
       }
 
+      winfo->totalRowsInserted += k;
       /* puts(buffer); */
       int64_t startTs;
       int64_t endTs;
       startTs = taosGetTimestampUs();
       //queryDB(winfo->taos, buffer);
-        if (i > 0 && g_args.insert_interval 
+      if (i > 0 && g_args.insert_interval 
             && (g_args.insert_interval > (et - st) )) {
             int sleep_time = g_args.insert_interval - (et -st);
-            debugPrint("DEBUG sleep: %d ms\n", sleep_time);
+            printf("sleep: %d ms specified by insert_interval\n", sleep_time);
             taosMsleep(sleep_time); // ms
-        }
+      }
 
-        if (g_args.insert_interval) {
+      if (g_args.insert_interval) {
             st = taosGetTimestampMs();
-        }
-      debugPrint("DEBUG - %s() LN%d %s\n", __func__, __LINE__, buffer);
+      }
+      verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
       int affectedRows = queryDbExec(winfo->taos, buffer, 1);
-      
+
+      verbosePrint("%s() LN%d: affectedRows:%d\n", __func__, __LINE__, affectedRows);
       if (0 <= affectedRows){
         endTs = taosGetTimestampUs();
         int64_t delay = endTs - startTs;
@@ -4156,27 +4170,31 @@ static void* syncWrite(void *sarg) {
             winfo->minDelay = delay;
         winfo->cntDelay++;
         winfo->totalDelay += delay;
-        //winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;      
+        winfo->totalAffectedRows += affectedRows;
+        winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;      
       }
 
-        if (g_args.insert_interval) {
+      verbosePrint("%s() LN%d: totalaffectedRows:%"PRId64"\n", __func__, __LINE__, winfo->totalAffectedRows);
+      if (g_args.insert_interval) {
             et = taosGetTimestampMs();
-        }
+      }
 
-      if (tID == winfo->end_table_id) {
-        i = inserted;
-        time_counter = tmp_time;
+      if (tblInserted >= g_args.num_of_DPT) {
+            break;
       }
-    }
+    }   // num_of_DPT
+  } // tId
+
+  printf("====thread[%d] completed total inserted rows: %"PRId64 ", total affected rows: %"PRId64 "====\n", 
+          winfo->threadID, 
+          winfo->totalRowsInserted, 
+          winfo->totalAffectedRows);
 
-  }
   return NULL;
 }
 
 
 static void* syncWriteWithStb(void *sarg) {
-  uint64_t    totalRowsInserted = 0;
-  uint64_t    totalAffectedRows = 0;
   uint64_t    lastPrintTime = taosGetTimestampMs();
 
   threadInfo *winfo = (threadInfo *)sarg; 
@@ -4232,27 +4250,44 @@ static void* syncWriteWithStb(void *sarg) {
     return NULL;
   }
 
-  int64_t time_counter = winfo->start_time;
   uint64_t st = 0;
   uint64_t et = 0;
 
-  debugPrint("DEBUG - %s() LN%d insertRows=%"PRId64"\n", __func__, __LINE__, superTblInfo->insertRows);
+  winfo->totalRowsInserted = 0;
+  winfo->totalAffectedRows = 0;
 
-  for (int i = 0; i < superTblInfo->insertRows;) {
+  int sampleUsePos;
 
-    for (uint32_t tID = winfo->start_table_id; tID <= winfo->end_table_id; tID++) {
-      uint64_t inserted = i;
-      uint64_t tmp_time = time_counter;
+  debugPrint("%s() LN%d insertRows=%"PRId64"\n", __func__, __LINE__, superTblInfo->insertRows);
 
-      int sampleUsePos = samplePos;
-      int k = 0;
-      debugPrint("DEBUG - %s() LN%d num_of_RPR=%d\n", __func__, __LINE__, g_args.num_of_RPR);
-      for (k = 0; k < g_args.num_of_RPR;) {
-        int len = 0;
-        memset(buffer, 0, superTblInfo->maxSqlLen);
-        char *pstr = buffer;
+  for (uint32_t tID = winfo->start_table_id; tID <= winfo->end_table_id;
+        tID++) {
+    int64_t start_time = winfo->start_time;
+
+    for (int i = 0; i < superTblInfo->insertRows;) {
+
+      int64_t tblInserted = i;
+
+      if (i > 0 && g_args.insert_interval 
+            && (g_args.insert_interval > (et - st) )) {
+        int sleep_time = g_args.insert_interval - (et -st);
+        printf("sleep: %d ms specified by insert_interval\n", sleep_time);
+        taosMsleep(sleep_time); // ms
+      }
 
-        if (AUTO_CREATE_SUBTBL == superTblInfo->autoCreateTable) {
+      if (g_args.insert_interval) {
+        st = taosGetTimestampMs();
+      }
+
+      sampleUsePos = samplePos;
+      verbosePrint("%s() LN%d num_of_RPR=%d\n", __func__, __LINE__, g_args.num_of_RPR);
+
+      memset(buffer, 0, superTblInfo->maxSqlLen);
+      int len = 0;
+
+      char *pstr = buffer;
+
+      if (AUTO_CREATE_SUBTBL == superTblInfo->autoCreateTable) {
           char* tagsValBuf = NULL;
           if (0 == superTblInfo->tagSource) {
             tagsValBuf = generateTagVaulesForStb(superTblInfo);
@@ -4275,27 +4310,29 @@ static void* syncWriteWithStb(void *sarg) {
                   superTblInfo->sTblName, 
                   tagsValBuf);
           tmfree(tagsValBuf);
-        } else if (TBL_ALREADY_EXISTS == superTblInfo->childTblExists) {
+      } else if (TBL_ALREADY_EXISTS == superTblInfo->childTblExists) {
           len += snprintf(pstr + len, 
                   superTblInfo->maxSqlLen - len, 
                   "insert into %s.%s values", 
                   winfo->db_name, 
                   superTblInfo->childTblName + tID * TSDB_TABLE_NAME_LEN);
-        } else {
+      } else {
           len += snprintf(pstr + len, 
                   superTblInfo->maxSqlLen - len, 
                   "insert into %s.%s%d values", 
                   winfo->db_name, 
                   superTblInfo->childTblPrefix, 
                   tID);
-        }
+      }
 
+      int k;
+      for (k = 0; k < g_args.num_of_RPR;) {
         int retLen = 0;
         if (0 == strncasecmp(superTblInfo->dataSource, "sample", strlen("sample"))) {
             retLen = getRowDataFromSample(
                     pstr + len, 
                     superTblInfo->maxSqlLen - len, 
-                    tmp_time += superTblInfo->timeStampStep, 
+                    start_time + superTblInfo->timeStampStep * i,
                     superTblInfo, 
                     &sampleUsePos, 
                     fp, 
@@ -4307,54 +4344,44 @@ static void* syncWriteWithStb(void *sarg) {
             int rand_num = rand_tinyint() % 100;
             if (0 != superTblInfo->disorderRatio 
                     && rand_num < superTblInfo->disorderRatio) {
-              int64_t d = tmp_time - rand() % superTblInfo->disorderRange;
+              int64_t d = start_time - rand() % superTblInfo->disorderRange;
               retLen = generateRowData(
                       pstr + len, 
-                      superTblInfo->maxSqlLen - len, d, 
+                      superTblInfo->maxSqlLen - len,
+                      d, 
                       superTblInfo);
               //printf("disorder rows, rand_num:%d, last ts:%"PRId64" current ts:%"PRId64"\n", rand_num, tmp_time, d);
         } else {
               retLen = generateRowData(
                       pstr + len, 
                       superTblInfo->maxSqlLen - len, 
-                      tmp_time += superTblInfo->timeStampStep, 
+                      start_time + superTblInfo->timeStampStep * i, 
                       superTblInfo);
             }
             if (retLen < 0) {
               goto free_and_statistics_2;
             }
         }
-/*        len += retLen;
-*/
-        inserted++;
+
+        len += retLen;
+        verbosePrint("%s() LN%d retLen=%d len=%d k=%d buffer=%s\n", __func__, __LINE__, retLen, len, k, buffer);
+
+        tblInserted++;
         k++;
-        totalRowsInserted++;
-  
-        if (inserted > superTblInfo->insertRows)
-            break;
-/*        if (inserted >= superTblInfo->insertRows 
-                  || (superTblInfo->maxSqlLen - len) < (superTblInfo->lenOfOneRow + 128)) 
-              break;
-*/
-        if (i > 0 && g_args.insert_interval 
-                && (g_args.insert_interval > (et - st) )) {
-            int sleep_time = g_args.insert_interval - (et -st);
-            debugPrint("DEBUG sleep: %d ms\n", sleep_time);
-            taosMsleep(sleep_time); // ms
-        }
+        i++;
 
-        if (g_args.insert_interval) {
-            st = taosGetTimestampMs();
-        }
+        if (tblInserted >= superTblInfo->insertRows)
+            break;
+      }
+  
+      winfo->totalRowsInserted += k;
 
-        if (0 == strncasecmp(superTblInfo->insertMode, "taosc", strlen("taosc"))) {
-          //printf("===== sql: %s \n\n", buffer);
-          //int64_t t1 = taosGetTimestampMs();
+      if (0 == strncasecmp(superTblInfo->insertMode, "taosc", strlen("taosc"))) {
           int64_t startTs;
           int64_t endTs;
           startTs = taosGetTimestampUs();
 
-          debugPrint("DEBUG %s() LN%d %s\n", __func__, __LINE__, buffer);
+          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
           int affectedRows = queryDbExec(winfo->taos, buffer, INSERT_TYPE);
 
           if (0 > affectedRows){
@@ -4366,76 +4393,52 @@ static void* syncWriteWithStb(void *sarg) {
             if (delay < winfo->minDelay) winfo->minDelay = delay;
             winfo->cntDelay++;
             winfo->totalDelay += delay;
-            //winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;      
           }
-          totalAffectedRows += affectedRows;
+          winfo->totalAffectedRows += affectedRows;
 
           int64_t  currentPrintTime = taosGetTimestampMs();
           if (currentPrintTime - lastPrintTime > 30*1000) {
             printf("thread[%d] has currently inserted rows: %"PRId64 ", affected rows: %"PRId64 "\n", 
                     winfo->threadID, 
-                    totalRowsInserted, 
-                    totalAffectedRows);
+                    winfo->totalRowsInserted, 
+                    winfo->totalAffectedRows);
             lastPrintTime = currentPrintTime;
           }
-          //int64_t t2 = taosGetTimestampMs();
-          //printf("taosc insert sql return, Spent %.4f seconds \n", (double)(t2 - t1)/1000.0);  
-        } else {
-          //int64_t t1 = taosGetTimestampMs();
+      } else {
           int retCode = postProceSql(g_Dbs.host, g_Dbs.port, buffer);
-          //int64_t t2 = taosGetTimestampMs();          
-          //printf("http insert sql return, Spent %ld ms \n", t2 - t1);
           
           if (0 != retCode) {
             printf("========restful return fail, threadID[%d]\n", winfo->threadID);
             goto free_and_statistics_2;
           }
-        }
-        if (g_args.insert_interval) {
-            et = taosGetTimestampMs();
-        }
-/*
-        if (loop_cnt) {
-          loop_cnt--;
-          if ((1 == loop_cnt) && (0 != nrecords_last_req)) {
-            nrecords_cur_req = nrecords_last_req;
-          } else if (0 == loop_cnt){
-            nrecords_cur_req = nrecords_no_last_req;
-            loop_cnt = loop_cnt_orig;
-            break;
-          }  
-        } else {
-          break;
-        }    
-        */
+      }
+      if (g_args.insert_interval) {
+        et = taosGetTimestampMs();
       }
 
-      if (tID == winfo->end_table_id) {
+      if (tblInserted >= superTblInfo->insertRows)
+        break;
+    }   // num_of_DPT
+
+    if (tID == winfo->end_table_id) {
         if (0 == strncasecmp(
                     superTblInfo->dataSource, "sample", strlen("sample"))) {
           samplePos = sampleUsePos;
         } 
 
-        i = inserted;
-        time_counter = tmp_time;
-      }
     }
-
     //printf("========loop %d childTables duration:%"PRId64 "========inserted rows:%d\n", winfo->end_table_id - winfo->start_table_id, et - st, i);
-  }
+  } // tID
 
 free_and_statistics_2:
   tmfree(buffer);
   tmfree(sampleDataBuf);
   tmfclose(fp);
 
-  winfo->totalRowsInserted = totalRowsInserted;
-  winfo->totalAffectedRows = totalAffectedRows;
-  
   printf("====thread[%d] completed total inserted rows: %"PRId64 ", total affected rows: %"PRId64 "====\n", 
           winfo->threadID, 
-          totalRowsInserted, 
-          totalAffectedRows);
+          winfo->totalRowsInserted, 
+          winfo->totalAffectedRows);
   return NULL;
 }
 
@@ -4453,7 +4456,8 @@ void callBack(void *param, TAOS_RES *res, int code) {
   char *data   = calloc(1, MAX_DATA_SIZE);
   char *pstr = buffer;
   pstr += sprintf(pstr, "insert into %s.%s%d values", winfo->db_name, winfo->tb_prefix, winfo->start_table_id);
-  if (winfo->counter >= winfo->superTblInfo->insertRows) {
+//  if (winfo->counter >= winfo->superTblInfo->insertRows) {
+  if (winfo->counter >= g_args.num_of_RPR) {
     winfo->start_table_id++;
     winfo->counter = 0;
   }
@@ -4644,12 +4648,12 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision,
     if (superTblInfo) {
         superTblInfo->totalAffectedRows += t_info->totalAffectedRows;
         superTblInfo->totalRowsInserted += t_info->totalRowsInserted;
-
-        totalDelay  += t_info->totalDelay;
-        cntDelay   += t_info->cntDelay;
-        if (t_info->maxDelay > maxDelay) maxDelay = t_info->maxDelay;
-        if (t_info->minDelay < minDelay) minDelay = t_info->minDelay;    
     }
+
+    totalDelay  += t_info->totalDelay;
+    cntDelay   += t_info->cntDelay;
+    if (t_info->maxDelay > maxDelay) maxDelay = t_info->maxDelay;
+    if (t_info->minDelay < minDelay) minDelay = t_info->minDelay;    
   }
   cntDelay -= 1;
 
@@ -4698,11 +4702,12 @@ void *readTable(void *sarg) {
   }
 
     int num_of_DPT;
-  if (rinfo->superTblInfo) {
+/*  if (rinfo->superTblInfo) {
     num_of_DPT = rinfo->superTblInfo->insertRows; //  nrecords_per_table;
   } else {
+  */
       num_of_DPT = g_args.num_of_DPT;
-  }
+//  }
 
   int num_of_tables = rinfo->end_table_id - rinfo->start_table_id + 1;
   int totalData = num_of_DPT * num_of_tables;
@@ -4836,7 +4841,7 @@ int insertTestProcess() {
   if (ret == -1)
     exit(EXIT_FAILURE);
 
-  debugPrint("DEBUG - %d result file: %s\n", __LINE__, g_Dbs.resultFile);
+  debugPrint("%d result file: %s\n", __LINE__, g_Dbs.resultFile);
   g_fpOfInsertResult = fopen(g_Dbs.resultFile, "a");
   if (NULL == g_fpOfInsertResult) {
     fprintf(stderr, "Failed to open %s for save result\n", g_Dbs.resultFile);
@@ -5072,7 +5077,7 @@ static int queryTestProcess() {
         
         char sqlStr[MAX_TB_NAME_SIZE*2];
         sprintf(sqlStr, "use %s", g_queryInfo.dbName);
-        debugPrint("DEBUG %s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
+        verbosePrint("%s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
         (void)queryDbExec(t_info->taos, sqlStr, NO_INSERT_TYPE);
       } else {
         t_info->taos = NULL;
@@ -5183,7 +5188,7 @@ void *subSubscribeProcess(void *sarg) {
 
   char sqlStr[MAX_TB_NAME_SIZE*2];
   sprintf(sqlStr, "use %s", g_queryInfo.dbName);
-    debugPrint("DEBUG %s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
+  debugPrint("%s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
   if (0 != queryDbExec(winfo->taos, sqlStr, NO_INSERT_TYPE)){
     return NULL;
   }
@@ -5249,7 +5254,7 @@ void *superSubscribeProcess(void *sarg) {
 
   char sqlStr[MAX_TB_NAME_SIZE*2];
   sprintf(sqlStr, "use %s", g_queryInfo.dbName);
-    debugPrint("DEBUG %s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
+  debugPrint("%s() %d sqlStr: %s\n", __func__, __LINE__, sqlStr);
   if (0 != queryDbExec(winfo->taos, sqlStr, NO_INSERT_TYPE)) {
     return NULL;
   }
@@ -5509,7 +5514,7 @@ void setParaFromArg(){
             "2017-07-14 10:40:00.000", MAX_TB_NAME_SIZE);
     g_Dbs.db[0].superTbls[0].timeStampStep = 10;
   
-    g_Dbs.db[0].superTbls[0].insertRows = g_args.num_of_DPT;
+   g_Dbs.db[0].superTbls[0].insertRows = g_args.num_of_DPT;
     g_Dbs.db[0].superTbls[0].maxSqlLen = TSDB_PAYLOAD_SIZE;
 
     g_Dbs.db[0].superTbls[0].columnCount = 0;
@@ -5614,7 +5619,8 @@ void querySqlFile(TAOS* taos, char* sqlFile)
     }
 
     memcpy(cmd + cmd_len, line, read_len);
-    debugPrint("DEBUG %s() LN%d cmd: %s\n", __func__, __LINE__, cmd);
+    verbosePrint("%s() LN%d cmd: %s\n", __func__, __LINE__, cmd);
+    queryDbExec(taos, cmd, NO_INSERT_TYPE);
     if (0 != queryDbExec(taos, cmd, NO_INSERT_TYPE)) {
         printf("queryDbExec %s failed!\n", cmd);
         tmfree(cmd);
@@ -5708,7 +5714,7 @@ static void testCmdLine() {
 int main(int argc, char *argv[]) {
   parse_args(argc, argv, &g_args);
 
-  debugPrint("DEBUG - meta file: %s\n", g_args.metaFile);
+  debugPrint("meta file: %s\n", g_args.metaFile);
 
   if (g_args.metaFile) {
     initOfInsertMeta();