Merge branch 'develop' into feature/TD-1568

README.md

@@ -57,9 +57,7 @@ sudo apt-get install -y  maven
 
 ### Centos 7:
 ```bash
-sudo yum install -y gcc gcc-c++ make cmake3 epel-release git
-sudo yum remove -y cmake
-sudo ln -s /usr/bin/cmake3 /usr/bin/cmake
+sudo yum install -y gcc gcc-c++ make cmake git
 ```
 
 To install openjdk-8:

src/client/src/tscSystem.c

@@ -83,7 +83,7 @@ int32_t tscAcquireRpc(const char *key, const char *user, const char *secretEncry
   memset(&rpcInit, 0, sizeof(rpcInit));
   rpcInit.localPort = 0;
   rpcInit.label = "TSC";
-  rpcInit.numOfThreads = tscNumOfThreads * 2;    
+  rpcInit.numOfThreads = tscNumOfThreads;    
   rpcInit.cfp = tscProcessMsgFromServer;
   rpcInit.sessions = tsMaxConnections;
   rpcInit.connType = TAOS_CONN_CLIENT;
@@ -159,8 +159,6 @@ void taos_init_imp(void) {
   if (tscNumOfThreads < 2) {
     tscNumOfThreads = 2;
   }
-  taosTmrThreads = tscNumOfThreads;
-
   tscQhandle = taosInitScheduler(queueSize, tscNumOfThreads, "tsc");
   if (NULL == tscQhandle) {
     tscError("failed to init scheduler");

src/kit/taosdemo/taosdemo.c

@@ -3072,9 +3072,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       cJSON* insertRows = cJSON_GetObjectItem(stbInfo, "insert_rows");
       if (insertRows && insertRows->type == cJSON_Number) {
         g_Dbs.db[i].superTbls[j].insertRows = insertRows->valueint;
-        if (0 == g_Dbs.db[i].superTbls[j].insertRows) {
-          g_Dbs.db[i].superTbls[j].insertRows = 0x7FFFFFFFFFFFFFFF;
-        }
+        //if (0 == g_Dbs.db[i].superTbls[j].insertRows) {
+        //  g_Dbs.db[i].superTbls[j].insertRows = 0x7FFFFFFFFFFFFFFF;
+        //}
       } else if (!insertRows) {
         g_Dbs.db[i].superTbls[j].insertRows = 0x7FFFFFFFFFFFFFFF;
       } else {
@@ -4271,7 +4271,7 @@ void startMultiThreadInsertData(int threads, char* db_name, char* precision, SSu
   }
   cntDelay -= 1;
 
-  assert(cntDelay != 0);
+  if (cntDelay == 0)    cntDelay = 1;
   avgDelay = (double)totalDelay / cntDelay;
 
   double end = getCurrentTime();
@@ -4481,6 +4481,9 @@ int insertTestProcess() {
   for (int i = 0; i < g_Dbs.dbCount; i++) {    
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
       SSuperTable* superTblInfo = &g_Dbs.db[i].superTbls[j];
+      if (0 == g_Dbs.db[i].superTbls[j].insertRows) {
+        continue;
+      }
       startMultiThreadInsertData(g_Dbs.threadCount, g_Dbs.db[i].dbName, g_Dbs.db[i].dbCfg.precision, superTblInfo);
     }
   }  

src/rpc/src/rpcMain.c

@@ -246,8 +246,12 @@ void *rpcOpen(const SRpcInit *pInit) {
 
   if(pInit->label) tstrncpy(pRpc->label, pInit->label, sizeof(pRpc->label));
   pRpc->connType = pInit->connType;
+  if (pRpc->connType == TAOS_CONN_CLIENT) {
+    pRpc->numOfThreads = pInit->numOfThreads;
+  } else {
+    pRpc->numOfThreads = pInit->numOfThreads>TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS:pInit->numOfThreads;
+  }
   pRpc->idleTime = pInit->idleTime;
-  pRpc->numOfThreads = pInit->numOfThreads>TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS:pInit->numOfThreads;
   pRpc->localPort = pInit->localPort;
   pRpc->afp = pInit->afp;
   pRpc->sessions = pInit->sessions+1;