Merge branch 'develop' into feature/2.0tsdb

src/client/inc/tscUtil.h

@@ -87,6 +87,16 @@ typedef struct SVgroupTableInfo {
   SArray*       itemList;   //SArray<STableIdInfo>
 } SVgroupTableInfo;
 
+static FORCE_INLINE SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex) {
+  assert(pCmd != NULL && subClauseIndex >= 0 && subClauseIndex < TSDB_MAX_UNION_CLAUSE);
+
+  if (pCmd->pQueryInfo == NULL || subClauseIndex >= pCmd->numOfClause) {
+    return NULL;
+  }
+
+  return pCmd->pQueryInfo[subClauseIndex];
+}
+
 int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, const char* name,
                            STableMeta* pTableMeta, STableDataBlocks** dataBlocks);
 void tscDestroyDataBlock(STableDataBlocks* pDataBlock);

src/client/src/tscAsync.c

@@ -477,7 +477,13 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
           tscDebug("%p redo parse sql string to build submit block", pSql);
 
           pCmd->parseFinished = false;
-          if ((code = tsParseSql(pSql, true)) == TSDB_CODE_SUCCESS) {
+          code = tsParseSql(pSql, true);
+
+          if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+            return;
+          }
+
+          if (code == TSDB_CODE_SUCCESS) {
             /*
              * Discard previous built submit blocks, and then parse the sql string again and build up all submit blocks,
              * and send the required submit block according to index value in supporter to server.

src/client/src/tscFunctionImpl.c

@@ -340,13 +340,12 @@ bool stableQueryFunctChanged(int32_t funcId) {
  */
 void resetResultInfo(SResultInfo *pResInfo) { pResInfo->initialized = false; }
 
-void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable) {
+void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable, char* buf) {
   assert(pResInfo->interResultBuf == NULL);
   
   pResInfo->bufLen = size;
   pResInfo->superTableQ = superTable;
-  
-  pResInfo->interResultBuf = calloc(1, (size_t)size);
+  pResInfo->interResultBuf = buf;
 }
 
 // set the query flag to denote that query is completed

src/client/src/tscParseInsert.c

@@ -1310,6 +1310,11 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
     tscDebug("%p resume to parse sql: %s", pSql, pCmd->curSql);
   }
   
+  ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  if (TSDB_CODE_SUCCESS != ret) {
+    return ret;
+  }
+
   if (tscIsInsertData(pSql->sqlstr)) {
     /*
      * Set the fp before parse the sql string, in case of getTableMeta failed, in which
@@ -1326,11 +1331,6 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
     
     ret = tsParseInsertSql(pSql);
   } else {
-    ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
-    if (TSDB_CODE_SUCCESS != ret) {
-      return ret;
-    }
-
     SSqlInfo SQLInfo = qSQLParse(pSql->sqlstr);
     ret = tscToSQLCmd(pSql, &SQLInfo);
     SQLInfoDestroy(&SQLInfo);

src/client/src/tscUtil.c

@@ -1464,16 +1464,6 @@ STableMetaInfo* tscGetMetaInfo(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   return pQueryInfo->pTableMetaInfo[tableIndex];
 }
 
-SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex) {
-  assert(pCmd != NULL && subClauseIndex >= 0 && subClauseIndex < TSDB_MAX_UNION_CLAUSE);
-
-  if (pCmd->pQueryInfo == NULL || subClauseIndex >= pCmd->numOfClause) {
-    return NULL;
-  }
-
-  return pCmd->pQueryInfo[subClauseIndex];
-}
-
 int32_t tscGetQueryInfoDetailSafely(SSqlCmd* pCmd, int32_t subClauseIndex, SQueryInfo** pQueryInfo) {
   int32_t ret = TSDB_CODE_SUCCESS;
 
@@ -2097,7 +2087,7 @@ void tscTryQueryNextClause(SSqlObj* pSql, void (*queryFp)()) {
 }
 
 void tscGetResultColumnChr(SSqlRes* pRes, SFieldInfo* pFieldInfo, int32_t columnIndex) {
-  SFieldSupInfo* pInfo = taosArrayGet(pFieldInfo->pSupportInfo, columnIndex);//tscFieldInfoGetSupp(pFieldInfo, columnIndex);
+  SFieldSupInfo* pInfo = taosArrayGet(pFieldInfo->pSupportInfo, columnIndex);
   assert(pInfo->pSqlExpr != NULL);
 
   int32_t type = pInfo->pSqlExpr->resType;
@@ -2112,7 +2102,7 @@ void tscGetResultColumnChr(SSqlRes* pRes, SFieldInfo* pFieldInfo, int32_t column
     if (isNull(pData, type)) {
       pRes->tsrow[columnIndex] = NULL;
     } else {
-      pRes->tsrow[columnIndex] = pData + VARSTR_HEADER_SIZE;
+      pRes->tsrow[columnIndex] = ((tstr*)pData)->data;
     }
   
     if (realLen < pInfo->pSqlExpr->resBytes - VARSTR_HEADER_SIZE) { // todo refactor

src/cq/src/cqMain.c

@@ -269,8 +269,14 @@ static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
     void* val = row[i];
     if (val == NULL) {
       val = getNullValue(c->type);
-    } else if (IS_VAR_DATA_TYPE(c->type)) {
+    } else if (c->type == TSDB_DATA_TYPE_BINARY) {
       val = ((char*)val) - sizeof(VarDataLenT);
+    } else if (c->type == TSDB_DATA_TYPE_NCHAR) {
+      char buf[TSDB_MAX_NCHAR_LEN];
+      size_t len = taos_fetch_lengths(tres)[i];
+      taosMbsToUcs4(val, len, buf, sizeof(buf), &len);
+      memcpy(val + sizeof(VarDataLenT), buf, len);
+      varDataLen(val) = len;
     }
     tdAppendColVal(trow, val, c->type, c->bytes, c->offset);
   }

src/mnode/src/mnodeSdb.c

@@ -471,8 +471,8 @@ static int32_t sdbInsertHash(SSdbTable *pTable, SSdbOper *pOper) {
     atomic_add_fetch_32(&pTable->autoIndex, 1);
   }
 
-  sdbDebug("table:%s, insert record:%s to hash, rowSize:%d numOfRows:%" PRId64 " ver:%" PRIu64 ", msg:%p", pTable->tableName,
-           sdbGetKeyStrFromObj(pTable, pOper->pObj), pOper->rowSize, pTable->numOfRows, sdbGetVersion(), pOper->pMsg);
+  sdbDebug("table:%s, insert record:%s to hash, rowSize:%d numOfRows:%" PRId64 ", msg:%p", pTable->tableName,
+           sdbGetKeyStrFromObj(pTable, pOper->pObj), pOper->rowSize, pTable->numOfRows, pOper->pMsg);
 
   (*pTable->insertFp)(pOper);
   return TSDB_CODE_SUCCESS;
@@ -490,8 +490,8 @@ static int32_t sdbDeleteHash(SSdbTable *pTable, SSdbOper *pOper) {
   taosHashRemove(pTable->iHandle, key, keySize);
   atomic_sub_fetch_32(&pTable->numOfRows, 1);
   
-  sdbDebug("table:%s, delete record:%s from hash, numOfRows:%" PRId64 " ver:%" PRIu64 ", msg:%p", pTable->tableName,
-           sdbGetKeyStrFromObj(pTable, pOper->pObj), pTable->numOfRows, sdbGetVersion(), pOper->pMsg);
+  sdbDebug("table:%s, delete record:%s from hash, numOfRows:%" PRId64 ", msg:%p", pTable->tableName,
+           sdbGetKeyStrFromObj(pTable, pOper->pObj), pTable->numOfRows, pOper->pMsg);
 
   int8_t *updateEnd = pOper->pObj + pTable->refCountPos - 1;
   *updateEnd = 1;
@@ -501,8 +501,8 @@ static int32_t sdbDeleteHash(SSdbTable *pTable, SSdbOper *pOper) {
 }
 
 static int32_t sdbUpdateHash(SSdbTable *pTable, SSdbOper *pOper) {
-  sdbDebug("table:%s, update record:%s in hash, numOfRows:%" PRId64 " ver:%" PRIu64 ", msg:%p", pTable->tableName,
-           sdbGetKeyStrFromObj(pTable, pOper->pObj), pTable->numOfRows, sdbGetVersion(), pOper->pMsg);
+  sdbDebug("table:%s, update record:%s in hash, numOfRows:%" PRId64 ", msg:%p", pTable->tableName,
+           sdbGetKeyStrFromObj(pTable, pOper->pObj), pTable->numOfRows, pOper->pMsg);
 
   (*pTable->updateFp)(pOper);
   return TSDB_CODE_SUCCESS;
@@ -967,7 +967,11 @@ static void *sdbWorkerFp(void *param) {
       }
 
       int32_t code = sdbWrite(pOper, pHead, type);
-      if (pOper && code <= 0) pOper->retCode = code;
+      if (code > 0) code = 0;
+      if (pOper)
+        pOper->retCode = code;
+      else
+        pHead->len = code;  // hackway
     }
 
     walFsync(tsSdbObj.wal);
@@ -982,7 +986,8 @@ static void *sdbWorkerFp(void *param) {
         sdbDecRef(pOper->table, pOper->pObj);
         sdbConfirmForward(NULL, pOper, pOper->retCode);
       } else if (type == TAOS_QTYPE_FWD) {
-        syncConfirmForward(tsSdbObj.sync, pHead->version, TSDB_CODE_SUCCESS);
+        pHead = (SWalHead *)item;
+        syncConfirmForward(tsSdbObj.sync, pHead->version, pHead->len);
         taosFreeQitem(item);
       } else {
         taosFreeQitem(item);

src/mnode/src/mnodeShow.c

@@ -310,7 +310,8 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
     
     if (pDb->status != TSDB_DB_STATUS_READY) {
       mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
-      return TSDB_CODE_MND_DB_IN_DROPPING;
+      code = TSDB_CODE_MND_DB_IN_DROPPING;
+      goto connect_over;
     }
     mnodeDecDbRef(pDb);
   }
@@ -355,7 +356,7 @@ static int32_t mnodeProcessUseMsg(SMnodeMsg *pMsg) {
   int32_t code = TSDB_CODE_SUCCESS;
   if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pUseDbMsg->db);
   if (pMsg->pDb == NULL) {
-    code = TSDB_CODE_MND_INVALID_DB;
+    return TSDB_CODE_MND_INVALID_DB;
   }
   
   if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {

src/query/inc/qExecutor.h

@@ -172,6 +172,7 @@ typedef struct SQueryRuntimeEnv {
   bool                 topBotQuery;      // false
   bool                 groupbyNormalCol; // denote if this is a groupby normal column query
   bool                 hasTagResults;    // if there are tag values in final result or not
+  int32_t              interBufSize;     // intermediate buffer sizse
   int32_t              prevGroupId;      // previous executed group id
   SDiskbasedResultBuf* pResultBuf;       // query result buffer based on blocked-wised disk file
 } SQueryRuntimeEnv;

src/query/inc/qUtil.h

@@ -15,6 +15,8 @@
 #ifndef TDENGINE_QUERYUTIL_H
 #define TDENGINE_QUERYUTIL_H
 
+int32_t getOutputInterResultBufSize(SQuery* pQuery);
+
 void clearTimeWindowResBuf(SQueryRuntimeEnv* pRuntimeEnv, SWindowResult* pOneOutputRes);
 void copyTimeWindowResBuf(SQueryRuntimeEnv* pRuntimeEnv, SWindowResult* dst, const SWindowResult* src);
 
@@ -35,7 +37,7 @@ SWindowResult *getWindowResult(SWindowResInfo *pWindowResInfo, int32_t slot);
 #define curTimeWindow(_winres)  ((_winres)->curIndex)
 bool isWindowResClosed(SWindowResInfo *pWindowResInfo, int32_t slot);
 
-void createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, SPosInfo *posInfo);
+void createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, SPosInfo *posInfo, size_t interBufSize);
 
 char *getPosInResultPage(SQueryRuntimeEnv *pRuntimeEnv, int32_t columnIndex, SWindowResult *pResult);
 

src/query/inc/tsqlfunction.h

@@ -272,7 +272,7 @@ bool top_bot_datablock_filter(SQLFunctionCtx *pCtx, int32_t functionId, char *mi
 bool stableQueryFunctChanged(int32_t funcId);
 
 void resetResultInfo(SResultInfo *pResInfo);
-void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable);
+void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable, char* buf);
 
 static FORCE_INLINE void initResultInfo(SResultInfo *pResInfo) {
   pResInfo->initialized = true;  // the this struct has been initialized flag

src/query/src/qUtil.c

@@ -17,15 +17,24 @@
 
 #include "hash.h"
 #include "taosmsg.h"
-#include "qextbuffer.h"
-#include "ttime.h"
-
-#include "qfill.h"
 #include "ttime.h"
 
 #include "qExecutor.h"
 #include "qUtil.h"
 
+int32_t getOutputInterResultBufSize(SQuery* pQuery) {
+  int32_t size = 0;
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    assert(pQuery->pSelectExpr[i].interBytes <= DEFAULT_INTERN_BUF_PAGE_SIZE);
+    size += pQuery->pSelectExpr[i].interBytes;
+  }
+
+  assert(size > 0);
+
+  return size;
+}
+
 int32_t initWindowResInfo(SWindowResInfo *pWindowResInfo, SQueryRuntimeEnv *pRuntimeEnv, int32_t size,
                           int32_t threshold, int16_t type) {
   pWindowResInfo->capacity = size;
@@ -43,7 +52,7 @@ int32_t initWindowResInfo(SWindowResInfo *pWindowResInfo, SQueryRuntimeEnv *pRun
   pWindowResInfo->pResult = calloc(threshold, sizeof(SWindowResult));
   for (int32_t i = 0; i < pWindowResInfo->capacity; ++i) {
     SPosInfo posInfo = {-1, -1};
-    createQueryResultInfo(pRuntimeEnv->pQuery, &pWindowResInfo->pResult[i], pRuntimeEnv->stableQuery, &posInfo);
+    createQueryResultInfo(pRuntimeEnv->pQuery, &pWindowResInfo->pResult[i], pRuntimeEnv->stableQuery, &posInfo, pRuntimeEnv->interBufSize);
   }
   
   return TSDB_CODE_SUCCESS;
@@ -54,11 +63,7 @@ void destroyTimeWindowRes(SWindowResult *pWindowRes, int32_t nOutputCols) {
     return;
   }
 
-  // TODO opt malloc strategy
-  for (int32_t i = 0; i < nOutputCols; ++i) {
-    free(pWindowRes->resultInfo[i].interResultBuf);
-  }
-  
+  free(pWindowRes->resultInfo[0].interResultBuf);
   free(pWindowRes->resultInfo);
 }
 
@@ -241,10 +246,9 @@ void clearTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pWindow
   }
   
   pWindowRes->numOfRows = 0;
-  //  pWindowRes->nAlloc = 0;
   pWindowRes->pos = (SPosInfo){-1, -1};
   pWindowRes->status.closed = false;
-  pWindowRes->window = (STimeWindow){0, 0};
+  pWindowRes->window = TSWINDOW_INITIALIZER;
 }
 
 /**
@@ -254,7 +258,6 @@ void clearTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pWindow
  */
 void copyTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *dst, const SWindowResult *src) {
   dst->numOfRows = src->numOfRows;
-  //  dst->nAlloc = src->nAlloc;
   dst->window = src->window;
   dst->status = src->status;
   

src/rpc/src/rpcMain.c

@@ -1366,6 +1366,7 @@ static int32_t rpcCompressRpcMsg(char* pCont, int32_t contLen) {
   }
   
   int32_t compLen = LZ4_compress_default(pCont, buf, contLen, contLen + overhead);
+  tDebug("compress rpc msg, before:%d, after:%d, overhead:%d", contLen, compLen, overhead);
   
   /*
    * only the compressed size is less than the value of contLen - overhead, the compression is applied
@@ -1378,7 +1379,7 @@ static int32_t rpcCompressRpcMsg(char* pCont, int32_t contLen) {
     memcpy(pCont + overhead, buf, compLen);
     
     pHead->comp = 1;
-    //tDebug("compress rpc msg, before:%d, after:%d", contLen, compLen);
+    tDebug("compress rpc msg, before:%d, after:%d", contLen, compLen);
     finalLen = compLen + overhead;
   } else {
     finalLen = contLen;

tests/pytest/import_merge/importCSV.py

+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import csv 
+import random
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.csvfile = "/tmp/file.csv"
+        self.rows = 10000
+        self.ntables = 1
+        self.startTime = 1520000010000
+    def genRandomStr(self, maxLen):
+        H = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+        salt = ''
+        if maxLen <= 1:
+            maxLen = 2
+        l = random.randint(1,maxLen)
+        for i in range(l):
+            salt += random.choice(H)
+        return salt
+    def createCSVFile(self):
+        f = open(self.csvfile,'w',encoding='utf-8') 
+        csv_writer = csv.writer(f, quoting=csv.QUOTE_NONNUMERIC) 
+        for i in range(self.rows):   
+            csv_writer.writerow([self.startTime + i, 
+                                self.genRandomStr(5),
+                                self.genRandomStr(6),
+                                self.genRandomStr(7),
+                                self.genRandomStr(8),
+                                self.genRandomStr(9),
+                                self.genRandomStr(10),
+                                self.genRandomStr(11),
+                                self.genRandomStr(12),
+                                self.genRandomStr(13),
+                                self.genRandomStr(14)])
+        f.close()
+    def destroyCSVFile(self):
+        os.remove(self.csvfile) 
+    def run(self):
+        self.createCSVFile()
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+        tdSql.execute('''create table tbx (ts TIMESTAMP, 
+                         collect_area NCHAR(5), 
+                         device_id BINARY(6), 
+                         imsi BINARY(7),  
+                         imei BINARY(8),  
+                         mdn BINARY(9), 
+                         net_type BINARY(10), 
+                         mno NCHAR(11), 
+                         province NCHAR(12), 
+                         city NCHAR(13), 
+                         alarm BINARY(14))''')
+    
+        tdSql.execute("import into tbx file \'%s\'"%(self.csvfile))
+        tdSql.query('select * from tbx')
+        tdSql.checkRows(self.rows)
+
+    def stop(self):
+        self.destroyCSVFile()
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+        tdDnodes.stop(1)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/util/dnodes.py

@@ -22,23 +22,47 @@ class TDSimClient:
     def __init__(self):
         self.testCluster = False
 
+        self.cfgDict = {
+            "numOfLogLines": "100000000",
+            "numOfThreadsPerCore": "2.0",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "anyIp": "0",
+            "sdbDebugFlag": "135",
+            "rpcDebugFlag": "135",
+            "tmrDebugFlag": "131",
+            "cDebugFlag": "135",
+            "udebugFlag": "135",
+            "jnidebugFlag": "135",
+            "qdebugFlag": "135",
+            }
+
     def init(self, path):
         self.__init__()
         self.path = path
 
+    def getLogDir(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        return self.logDir
+
     def getCfgDir(self):
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
         return self.cfgDir
 
     def setTestCluster(self, value):
         self.testCluster = value
 
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
     def cfg(self, option, value):
         cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
 
     def deploy(self):
-        self.logDir = "%s/sim/psim/log" % (self.path,)
+        self.logDir = "%s/sim/psim/log" % (self.path)
         self.cfgDir = "%s/sim/psim/cfg" % (self.path)
         self.cfgPath = "%s/sim/psim/cfg/taos.cfg" % (self.path)
 
@@ -46,11 +70,11 @@ class TDSimClient:
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
     
-        cmd = "rm -rf " + self.cfgDir
+        cmd = "mkdir -p " + self.logDir
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
 
-        cmd = "mkdir -p " + self.logDir
+        cmd = "rm -rf " + self.cfgDir
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
 
@@ -66,19 +90,10 @@ class TDSimClient:
             self.cfg("masterIp", "192.168.0.1")
             self.cfg("secondIp", "192.168.0.2")
         self.cfg("logDir", self.logDir)
-        self.cfg("numOfLogLines", "100000000")
-        self.cfg("numOfThreadsPerCore", "2.0")
-        self.cfg("locale", "en_US.UTF-8")
-        self.cfg("charset", "UTF-8")
-        self.cfg("asyncLog", "0")
-        self.cfg("anyIp", "0")
-        self.cfg("sdbDebugFlag", "135")
-        self.cfg("rpcDebugFlag", "135")
-        self.cfg("tmrDebugFlag", "131")
-        self.cfg("cDebugFlag", "135")
-        self.cfg("udebugFlag", "135")
-        self.cfg("jnidebugFlag", "135")
-        self.cfg("qdebugFlag", "135")
+
+        for key, value in self.cfgDict.items():
+            self.cfg(key, value)
+
         tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
 
 
@@ -378,6 +393,9 @@ class TDDnodes:
         for i in range(len(self.dnodes)):
             self.dnodes[i].init(self.path)
 
+        self.sim = TDSimClient()
+        self.sim.init(self.path)
+
     def setTestCluster(self, value):
         self.testCluster = value
 
@@ -385,8 +403,6 @@ class TDDnodes:
         self.valgrind = value
 
     def deploy(self, index):
-        self.sim = TDSimClient()
-        self.sim.init(self.path)
         self.sim.setTestCluster(self.testCluster)
 
         if (self.simDeployed == False):
@@ -474,5 +490,11 @@ class TDDnodes:
     def getSimCfgPath(self):
         return self.sim.getCfgDir()
 
+    def getSimLogPath(self):
+        return self.sim.getLogDir()
+
+    def addSimExtraCfg(self, option, value):
+        self.sim.addExtraCfg(option, value)
+
 
 tdDnodes = TDDnodes()

tests/pytest/util/sql.py

@@ -71,7 +71,8 @@ class TDSql:
         except Exception as e:
             caller = inspect.getframeinfo(inspect.stack()[1][0])
             args = (caller.filename, caller.lineno, sql, repr(e))
-            tdLog.exit("%s(%d) failed: sql:%s, %s" % args)
+            tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
+            raise Exception(repr(e))
         return self.queryRows
 
     def waitedQuery(self, sql, expectRows, timeout):
@@ -89,7 +90,8 @@ class TDSql:
         except Exception as e:
             caller = inspect.getframeinfo(inspect.stack()[1][0])
             args = (caller.filename, caller.lineno, sql, repr(e))
-            tdLog.exit("%s(%d) failed: sql:%s, %s" % args)
+            tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
+            raise Exception(repr(e))
         return (self.queryRows, timeout)
 
     def checkRows(self, expectRows):
@@ -158,7 +160,8 @@ class TDSql:
         except Exception as e:
             caller = inspect.getframeinfo(inspect.stack()[1][0])
             args = (caller.filename, caller.lineno, sql, repr(e))
-            tdLog.exit("%s(%d) failed: sql:%s, %s" % args)
+            tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
+            raise Exception(repr(e))
         return self.affectedRows
 
     def checkAffectedRows(self, expectAffectedRows):

tests/script/general/parser/fill_us.sim

 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/parser/testSuite.sim

+sleep 2000
 run general/parser/alter.sim
 sleep 2000
 run general/parser/alter1.sim
@@ -7,7 +8,6 @@ sleep 2000
 run general/parser/auto_create_tb.sim
 sleep 2000
 run general/parser/auto_create_tb_drop_tb.sim
-
 sleep 2000
 run general/parser/col_arithmetic_operation.sim
 sleep 2000
@@ -23,65 +23,61 @@ run general/parser/create_tb.sim
 sleep 2000
 run general/parser/dbtbnameValidate.sim
 sleep 2000
+run general/parser/fill.sim
+sleep 2000
+run general/parser/fill_stb.sim
+sleep 2000                                    
+#run general/parser/fill_us.sim               #
+sleep 2000
+run general/parser/first_last.sim
+sleep 2000
 run general/parser/import_commit1.sim
 sleep 2000
 run general/parser/import_commit2.sim
 sleep 2000
 run general/parser/import_commit3.sim
 sleep 2000
+#run general/parser/import_file.sim
+sleep 2000
 run general/parser/insert_tb.sim
 sleep 2000
-run general/parser/first_last.sim
+run general/parser/tags_dynamically_specifiy.sim
 sleep 2000
-#run general/parser/import_file.sim
+run general/parser/interp.sim
 sleep 2000
 run general/parser/lastrow.sim
 sleep 2000
-run general/parser/nchar.sim
-sleep 2000
-#run general/parser/null_char.sim
+run general/parser/limit.sim
 sleep 2000
-run general/parser/single_row_in_tb.sim
+run general/parser/limit1.sim
 sleep 2000
-run general/parser/select_from_cache_disk.sim
+run general/parser/limit1_tblocks100.sim
 sleep 2000
-run general/parser/selectResNum.sim
+run general/parser/limit2.sim
 sleep 2000
 run general/parser/mixed_blocks.sim
 sleep 2000
-run general/parser/limit1.sim
+run general/parser/nchar.sim
 sleep 2000
-run general/parser/limit.sim
+run general/parser/null_char.sim
 sleep 2000
-run general/parser/limit1_tblocks100.sim
+run general/parser/selectResNum.sim
 sleep 2000
 run general/parser/select_across_vnodes.sim
 sleep 2000
-run general/parser/slimit1.sim
-sleep 2000
-run general/parser/tbnameIn.sim
-sleep 2000
-run general/parser/projection_limit_offset.sim
-sleep 2000
-run general/parser/limit2.sim
-sleep 2000
-run general/parser/fill.sim
+run general/parser/select_from_cache_disk.sim
 sleep 2000
-run general/parser/fill_stb.sim
+run general/parser/set_tag_vals.sim
 sleep 2000
-run general/parser/where.sim
+run general/parser/single_row_in_tb.sim
 sleep 2000
 run general/parser/slimit.sim
 sleep 2000
-run general/parser/select_with_tags.sim
-sleep 2000
-run general/parser/interp.sim
+run general/parser/slimit1.sim
 sleep 2000
-run general/parser/tags_dynamically_specifiy.sim
+run general/parser/slimit_alter_tags.sim
 sleep 2000
-run general/parser/groupby.sim
-sleep 2000
-run general/parser/set_tag_vals.sim
+run general/parser/tbnameIn.sim
 sleep 2000
 run general/parser/slimit_alter_tags.sim  # persistent failed
 sleep 2000
@@ -89,11 +85,19 @@ run general/parser/join.sim
 sleep 2000
 run general/parser/join_multivnode.sim
 sleep 2000
-run general/parser/repeatAlter.sim
+run general/parser/projection_limit_offset.sim
+sleep 2000
+run general/parser/select_with_tags.sim
+sleep 2000
+run general/parser/groupby.sim
+sleep 2000
+run general/parser/union.sim
+sleep 2000
+run general/parser/sliding.sim
 sleep 2000
-run general/parser/binary_escapeCharacter.sim
+run general/parser/fill_us.sim
 sleep 2000
-run general/parser/bug.sim
+run general/parser/tags_filter.sim
 
 #sleep 2000
 #run general/parser/repeatStream.sim

tests/script/unique/cluster/client1_0.sim

+#system sh/stop_dnodes.sh
+#system sh/deploy.sh -n dnode1 -i 1
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000
+#system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
+#system sh/exec.sh -n dnode1 -s start
+#sql connect
+#$db = db1
+#sql create database $db
+#sql use $db
+#$stb = stb1
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+
+
+
+
+
 $tblStart = 0
-$tblEnd = 10000
+$tblEnd = 1000
 $tsStart = 1325347200000  # 2012-01-01 00:00:00.000
 ###############################################################
 
@@ -10,7 +26,6 @@ $stb = stb1
 
 sql use $db
 
-
 ######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
 $tagPrex = ' . tag
 
@@ -19,12 +34,15 @@ while $i < $tblEnd
   $tb = tb . $i
   $tagBinary = $tagPrex . $i
   $tagBinary = $tagBinary . '
-  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
   $i = $i + 1
 endw 
 
-
 print ====================== client1_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
 
 $rowsPerLoop = 100
 $ts = $tsStart
@@ -54,3 +72,4 @@ while $i < $tblEnd
     print ====================== client1_0  insert data complete once ............
   endi
 endw 
+print ====================== client1_0  success and auto end =====================
\ No newline at end of file

tests/script/unique/cluster/cluster_main.sim

@@ -3,41 +3,49 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
 
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
 system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
 
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode2 -c walLevel -v 1
 system sh/cfg.sh -n dnode3 -c walLevel -v 1
 system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
 
 system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
 
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
 
 system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
 system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
 system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
 system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
 
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 1000
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 1000
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 1000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
 
 system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
 
 print ============== step0: start tarbitrator
 system sh/exec_tarbitrator.sh -s start
@@ -64,407 +72,159 @@ $stb = stb1
 sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
 
 print ============== step4: start 10 client1/ 10 client2/ 10 client3/ 10 client4/ 1 client5
-#run_back unique/cluster/client_test.sim
 run_back unique/cluster/client1_0.sim
-run_back unique/cluster/client1_1.sim
-run_back unique/cluster/client1_2.sim
-run_back unique/cluster/client1_3.sim
-run_back unique/cluster/client2_0.sim
-run_back unique/cluster/client2_1.sim
-run_back unique/cluster/client2_2.sim
-run_back unique/cluster/client2_3.sim
-run_back unique/cluster/client3.sim
-run_back unique/cluster/client4.sim
+#run_back unique/cluster/client1_1.sim
+#run_back unique/cluster/client1_2.sim
+#run_back unique/cluster/client1_3.sim
+#run_back unique/cluster/client2_0.sim
+#run_back unique/cluster/client2_1.sim
+#run_back unique/cluster/client2_2.sim
+#run_back unique/cluster/client2_3.sim
+#run_back unique/cluster/client3.sim
+#run_back unique/cluster/client4.sim
 
 sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
 wait_subsim_insert_data:
+print select count(*) from $stb
 sql select count(*) from $stb
 print data00 $data00
-if $data00 < 1 then
+if $data00 < 1000 then
   sleep 3000
   goto wait_subsim_insert_data
 endi
 
-
 print wait for a while to let clients start insert data
 sleep 5000    
 
 $loop_cnt = 0
 loop_cluster_do:
 print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-print ============== step5: start dnode4 and add into cluster, then wait dnode4 ready
+print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready
 system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
 sql create dnode $hostname4
+sql create dnode $hostname5
 
-wait_dnode4_ready_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 4 then
-  sleep 2000
-  goto wait_dnode4_ready_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-
-if $loop_cnt == 0 then
-  $dnode4Status = $data4_4 
-elif $loop_cnt == 1 then
-  $dnode4Status = $data4_6 
-elif $loop_cnt == 2 then
-  $dnode4Status = $data4_8 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $dnode4Status != ready then
-  sleep 2000
-  goto wait_dnode4_ready_0
-endi
+sleep 5000
 
 
 print ============== step6: stop and drop dnode1, then remove data dir of dnode1 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-
-$cnt = 0
-wait_dnode1_offline_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 4 then
-  sleep 2000
-  goto wait_dnode1_offline_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
- 
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $loop_cnt == 0 then
-  $dnode1Status = $data4_1 
-elif $loop_cnt == 1 then
-  $dnode1Status = $data4_5 
-elif $loop_cnt == 2 then
-  $dnode1Status = $data4_7 
-elif $loop_cnt == 3 then
-  $dnode1Status = $data4_9 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $dnode1Status != offline then
-  sleep 2000
-  goto wait_dnode1_offline_0
-endi
-
-
-
-$cnt = 0
-wait_mnode1_offline_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-print show mnodes
-sql show mnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_mnode1_offline_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$mnode1Status = $data2_1
-$mnode2Status = $data2_2
-$mnode3Status = $data2_3
-$mnode4Status = $data2_4
-
-if $loop_cnt == 0 then
-  $mnode1Status = $data2_1 
-elif $loop_cnt == 1 then
-  $mnode1Status = $data2_5 
-elif $loop_cnt == 2 then
-  $mnode1Status = $data2_7 
-elif $loop_cnt == 3 then
-  $mnode1Status = $data2_9 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $mnode1Status != offline then
-  sleep 2000
-  goto wait_mnode1_offline_0
-endi
-
-
-
+sleep 5000
 sql drop dnode $hostname1
+sleep 5000
+
 system rm -rf ../../../sim/dnode1/data
+sleep 20000
 
-$cnt = 0
-wait_mnode4_slave_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-print show mnodes
 sql show mnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_mnode4_slave_0
-endi
+print show mnodes
+print rows: $rows
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$mnode1Status = $data2_1
-$mnode2Status = $data2_2
-$mnode3Status = $data2_3
-$mnode4Status = $data2_4
-
-if $loop_cnt == 0 then
-  $mnode4Status = $data2_4 
-elif $loop_cnt == 1 then
-  $mnode4Status = $data2_6 
-elif $loop_cnt == 2 then
-  $mnode4Status = $data2_8 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $mnode4Status != slave then
-  sleep 2000
-  goto wait_mnode4_slave_0
-endi
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+return -1
 
-print ============== step7: stop dnode2, waiting dnode4 
+print ============== step7: stop dnode2 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
 
-$cnt = 0
-wait_dnode2_offline_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode2_offline_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $dnode2Status != offline then
-  sleep 2000
-  goto wait_dnode2_offline_0
-endi
-
-sleep 3000
-print show mnodes
 sql show mnodes
+print show mnodes
+print rows: $rows
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step8: restart dnode2, then wait sync end
 system sh/exec.sh -n dnode2 -s start
-
-$cnt = 0
-wait_dnode2_ready_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode2_ready_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $dnode2Status != ready then
-  sleep 2000
-  goto wait_dnode2_ready_0
-endi
-
-sleep 3000
-print show mnodes
+sleep 20000
 sql show mnodes
+print show mnodes
+print rows: $rows
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step9: stop dnode3, then wait sync end
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
-sleep 3000
-
-$cnt = 0
-wait_dnode3_offline_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode3_offline_0
-endi
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $dnode3Status != offline then
-  sleep 2000
-  goto wait_dnode3_offline_0
-endi
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step10: restart dnode3, then wait sync end
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
-
-$cnt = 0
-wait_dnode3_ready_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode3_ready_0
-endi
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $dnode3Status != ready then
-  sleep 2000
-  goto wait_dnode3_ready_0
-endi
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step11: stop dnode4, then wait sync end
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
-sleep 3000
-
-$cnt = 0
-wait_dnode4_offline_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode4_offline_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-
-if $loop_cnt == 0 then
-  $dnode4Status = $data4_4 
-elif $loop_cnt == 1 then
-  $dnode4Status = $data4_6 
-elif $loop_cnt == 2 then
-  $dnode4Status = $data4_8 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $dnode4Status != offline then
-  sleep 2000
-  goto wait_dnode4_offline_0
-endi
+sleep 20000
 
 print ============== step12: restart dnode4, then wait sync end
 system sh/exec.sh -n dnode4 -s start
-sleep 3000
-
-$cnt = 0
-wait_dnode4_ready_1:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode4_ready_1
-endi
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-
-if $loop_cnt == 0 then
-  $dnode4Status = $data4_4 
-elif $loop_cnt == 1 then
-  $dnode4Status = $data4_6 
-elif $loop_cnt == 2 then
-  $dnode4Status = $data4_8 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $dnode4Status != ready then
-  sleep 2000
-  goto wait_dnode4_ready_1
-endi
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step13: alter replica 2
 sql alter database $db replica 2
@@ -476,50 +236,14 @@ if $data04 != 2 then
   return -1
 endi
 
-print ============== step14: stop and drop dnode4, then remove data dir of dnode4 
+print ============== step14: stop and drop dnode4/dnode5, then remove data dir of dnode4/dnode5 
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
-sleep 3000
-
-$cnt = 0
-wait_dnode4_offline_1:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode4_offline_1
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
- 
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-
-if $loop_cnt == 0 then
-  $dnode4Status = $data4_4 
-elif $loop_cnt == 1 then
-  $dnode4Status = $data4_6 
-elif $loop_cnt == 2 then
-  $dnode4Status = $data4_8 
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $dnode4Status != offline then
-  sleep 2000
-  goto wait_dnode4_offline_1
-endi
-
-sleep 3000
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 20000
 sql drop dnode $hostname4
+sql drop dnode $hostname5
 system rm -rf ../../../sim/dnode4/data
-
+system rm -rf ../../../sim/dnode5/data
 
 print ============== step15: alter replica 1
 sql alter database $db replica 1
@@ -530,7 +254,6 @@ if $data04 != 1 then
   return -1
 endi
 
-
 print ============== step16: alter replica 2
 sql alter database $db replica 2
 sql show databases
@@ -546,42 +269,7 @@ system sh/cfg.sh -n dnode1 -c second -v $hostname3
 
 system sh/exec.sh -n dnode1 -s start
 sql create dnode $hostname1
-
-wait_dnode1_ready_0:
-$cnt = $cnt + 1
-if $cnt == 10 then
-  return -1
-endi
-sql show dnodes
-if $rows != 3 then
-  sleep 2000
-  goto wait_dnode1_ready_0
-endi
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
-print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
-print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
-print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
-#$dnode1Status = $data4_1  
-$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
-
-if $loop_cnt == 0 then
-  $dnode1Status = $data4_5 
-elif $loop_cnt == 1 then
-  $dnode1Status = $data4_7 
-elif $loop_cnt == 2 then
-  $dnode1Status = $data4_9
-else then
-  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
-  return
-endi
-
-if $dnode1Status != ready then
-  sleep 2000
-  goto wait_dnode1_ready_0
-endi
+sleep 20000
 
 print ============== step18: alter replica 3
 sql alter database $db replica 3