Merge branch '2.0' of https://github.com/taosdata/TDengine into refact/code_format

docs/en/14-reference/05-taosbenchmark.md

@@ -5,7 +5,7 @@ toc_max_heading_level: 4
 description: "taosBenchmark (once called taosdemo ) is a tool for testing the performance of TDengine."
 ---
 
-## Introduction
+# Introduction
 
 taosBenchmark (formerly taosdemo ) is a tool for testing the performance of TDengine products. taosBenchmark can test the performance of TDengine's insert, query, and subscription functions and simulate large amounts of data generated by many devices. taosBenchmark can be configured to generate user defined databases, supertables, subtables, and the time series data to populate these for performance benchmarking. taosBenchmark is highly configurable and some of the configurations include the time interval for inserting data, the number of working threads and the capability to insert disordered data. The installer provides taosdemo as a soft link to taosBenchmark for compatibility with past users.
 
@@ -334,9 +334,9 @@ The configuration parameters for specifying super table tag columns and data col
 
 - **name** : The name of the column, if used together with count, e.g. "name": "current", "count":3, then the names of the 3 columns are current, current_2. current_3.
 
-- **min**: The minimum value of the column/label of the data type.
+- **min**: The minimum value of the column/label of the data type. The generated value will equal or large than the minimum value.
 
-- **max**: The maximum value of the column/label of the data type.
+- **max**: The maximum value of the column/label of the data type. The generated value will less than the maxium value.
 
 - **values**: The value field of the nchar/binary column/label, which will be chosen randomly from the values.
 

docs/zh/14-reference/05-taosbenchmark.md

@@ -334,9 +334,9 @@ taosBenchmark -A INT,DOUBLE,NCHAR,BINARY\(16\)
 
 - **name** : 列的名字，若与 count 同时使用，比如 "name"："current", "count":3, 则 3 个列的名字分别为 current, current_2. current_3。
 
-- **min** : 数据类型的 列/标签 的最小值。
+- **min** : 数据类型的 列/标签 的最小值。生成的值将大于或等于最小值。
 
-- **max** : 数据类型的 列/标签 的最大值。
+- **max** : 数据类型的 列/标签 的最大值。生成的值将小于最小值。
 
 - **values** : nchar/binary 列/标签的值域，将从值中随机选择。
 

source/dnode/vnode/src/vnd/vnodeSvr.c

@@ -819,11 +819,12 @@ static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq
   int32_t        tsize, ret;
   SEncoder       encoder = {0};
   SArray        *newTbUids = NULL;
+  SVStatis       statis = {0};
   terrno = TSDB_CODE_SUCCESS;
 
   pRsp->code = 0;
   pSubmitReq->version = version;
-  atomic_fetch_add_64(&pVnode->statis.nBatchInsert, 1);
+  statis.nBatchInsert = 1;
 
 #ifdef TD_DEBUG_PRINT_ROW
   vnodeDebugPrintSubmitMsg(pVnode, pReq, __func__);
@@ -943,18 +944,21 @@ _exit:
 
   taosArrayDestroyEx(submitRsp.pArray, tFreeSSubmitBlkRsp);
 
-  atomic_fetch_add_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
-  atomic_fetch_add_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
-
   // TODO: the partial success scenario and the error case
   // => If partial success, extract the success submitted rows and reconstruct a new submit msg, and push to level
   // 1/level 2.
   // TODO: refactor
   if ((terrno == TSDB_CODE_SUCCESS) && (pRsp->code == TSDB_CODE_SUCCESS)) {
-    atomic_fetch_add_64(&pVnode->statis.nBatchInsertSuccess, 1);
+    statis.nBatchInsertSuccess = 1;
     tdProcessRSmaSubmit(pVnode->pSma, pReq, STREAM_INPUT__DATA_SUBMIT);
   }
 
+  // N.B. not strict as the following procedure is not atomic
+  atomic_add_fetch_64(&pVnode->statis.nInsert, submitRsp.numOfRows);
+  atomic_add_fetch_64(&pVnode->statis.nInsertSuccess, submitRsp.affectedRows);
+  atomic_add_fetch_64(&pVnode->statis.nBatchInsert, statis.nBatchInsert);
+  atomic_add_fetch_64(&pVnode->statis.nBatchInsertSuccess, statis.nBatchInsertSuccess);
+
   vDebug("vgId:%d, submit success, index:%" PRId64, pVnode->config.vgId, version);
   return 0;
 }