diff --git a/.travis.yml b/.travis.yml index 7df3a7d7fece1e039a17a3b6bf0e4490b51f455e..37e6e5a6c39085021995e01ad617ab8275e2116a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,15 +32,15 @@ matrix: - cd debug script: - - cmake .. - - make + - cmake .. > /dev/null + - make > /dev/null after_success: - |- case $TRAVIS_OS_NAME in linux) cd ${TRAVIS_BUILD_DIR}/debug - make install || travis_terminate $? + make install > /dev/null || travis_terminate $? pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ @@ -98,11 +98,11 @@ matrix: # Commands to prepare for build_command # ** likely specific to your build ** - build_command_prepend: cmake . + build_command_prepend: cmake . > /dev/null # The command that will be added as an argument to "cov-build" to compile your project for analysis, # ** likely specific to your build ** - build_command: make + build_command: make > /dev/null # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'. # Take care in resource usage, and consider the build frequency allowances per @@ -135,15 +135,15 @@ matrix: - cd debug script: - - cmake -DCOVER=true .. - - make + - cmake -DCOVER=true .. > /dev/null + - make > /dev/null after_success: - |- case $TRAVIS_OS_NAME in linux) cd ${TRAVIS_BUILD_DIR}/debug - make install || travis_terminate $? + make install > /dev/null || travis_terminate $? pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ @@ -208,8 +208,8 @@ matrix: - cd debug script: - - cmake .. - - make + - cmake .. > /dev/null + - make > /dev/null # - os: osx # language: c @@ -225,5 +225,5 @@ matrix: # - cd ${TRAVIS_BUILD_DIR} # - mkdir debug # - cd debug - # - cmake .. - # - make + # - cmake .. > /dev/null + # - make > /dev/null diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 27cd613ac2e0e56e24d7ab4355e6ac6fdbd7c02a..a889fefe0c724d94b1c5dcb86aae638eb8ae4684 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -303,11 +303,8 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg); } -// SSQLToken* pIpAddr = &pInfo->pDCLInfo->a[0]; -// if (!validateIpAddress(pIpAddr->z, pIpAddr->n)) { -// return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg); -// } - + SSQLToken* pIpAddr = &pInfo->pDCLInfo->a[0]; + pIpAddr->n = strdequote(pIpAddr->z); break; } diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 00ffd2ac68df7e760351ac3dba5473fb309db21a..a6575cfb8a7a5dc09ecdd795694f7d97f2513959 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -79,15 +79,18 @@ void tscSetMgmtIpListFromEdge() { if (tscMgmtIpSet.numOfIps != 1) { tscMgmtIpSet.numOfIps = 1; tscMgmtIpSet.inUse = 0; - taosGetFqdnPortFromEp(tsMaster, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); + taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); tscTrace("edge mgmt IP list:"); tscPrintMgmtIp(); } } void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) { - tscTrace("mgmt IP list is changed for ufp is called"); tscMgmtIpSet = *pIpSet; + tscTrace("mgmt IP list is changed for ufp is called, numOfIps:%d inUse:%d", tscMgmtIpSet.numOfIps, tscMgmtIpSet.inUse); + for (int32_t i = 0; i < tscMgmtIpSet.numOfIps; ++i) { + tscTrace("index:%d fqdn:%s port:%d", i, tscMgmtIpSet.fqdn[i], tscMgmtIpSet.port[i]); + } } void tscSetMgmtIpList(SRpcIpSet *pIpList) { diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 45b1cd8c1092be055f2b48500781ab90ba4d6e42..d287a5f433f830bfbe981d4092e0aece638cc325 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -80,8 +80,8 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con strcpy(tscMgmtIpSet.fqdn[0], ip); tscMgmtIpSet.port[0] = port? port: tsMnodeShellPort; } else { - if (tsMaster[0] != 0) { - taosGetFqdnPortFromEp(tsMaster, tscMgmtIpSet.fqdn[tscMgmtIpSet.numOfIps], &tscMgmtIpSet.port[tscMgmtIpSet.numOfIps]); + if (tsFirst[0] != 0) { + taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[tscMgmtIpSet.numOfIps], &tscMgmtIpSet.port[tscMgmtIpSet.numOfIps]); tscMgmtIpSet.numOfIps++; } diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c index 897c63f011b43af064cdcebab99ca575cd49f960..c0ad91cd59a8b638134ab5234402e97922c0ae35 100644 --- a/src/client/src/tscSystem.c +++ b/src/client/src/tscSystem.c @@ -136,9 +136,9 @@ void taos_init_imp() { tscMgmtIpSet.inUse = 0; tscMgmtIpSet.numOfIps = 1; - taosGetFqdnPortFromEp(tsMaster, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); + taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); - if (tsSecond[0] && strcmp(tsSecond, tsMaster) != 0) { + if (tsSecond[0] && strcmp(tsSecond, tsFirst) != 0) { tscMgmtIpSet.numOfIps = 2; taosGetFqdnPortFromEp(tsSecond, tscMgmtIpSet.fqdn[1], &tscMgmtIpSet.port[1]); } diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index d59e24bcc38bf1062ddb48597b1bf0c0078ac154..fe24474b5bf7a495a3bd94f67759234d7a015cbc 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -591,47 +591,44 @@ int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList, return TSDB_CODE_SUCCESS; } -static void trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock) { - int32_t firstPartLen = 0; - - STableMeta* pTableMeta = pTableDataBlock->pTableMeta; +static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock) { + // TODO: optimize this function + int len = 0; + + STableMeta* pTableMeta = pTableDataBlock->pTableMeta; STableComInfo tinfo = tscGetTableInfo(pTableMeta); - SSchema* pSchema = tscGetTableSchema(pTableMeta); - + SSchema* pSchema = tscGetTableSchema(pTableMeta); + + SSubmitBlk* pBlock = pDataBlock; memcpy(pDataBlock, pTableDataBlock->pData, sizeof(SSubmitBlk)); pDataBlock += sizeof(SSubmitBlk); - - int32_t total = sizeof(int32_t)*2; - for(int32_t i = 0; i < tinfo.numOfColumns; ++i) { - switch (pSchema[i].type) { - case TSDB_DATA_TYPE_NCHAR: - case TSDB_DATA_TYPE_BINARY: { - assert(0); // not support binary yet - firstPartLen += sizeof(int32_t);break; - } - default: - firstPartLen += tDataTypeDesc[pSchema[i].type].nSize; - total += tDataTypeDesc[pSchema[i].type].nSize; - } + + int32_t flen = 0; + for (int32_t i = 0; i < tinfo.numOfColumns; ++i) { + flen += TYPE_BYTES[pSchema[i].type]; } - + char* p = pTableDataBlock->pData + sizeof(SSubmitBlk); - - SSubmitBlk* pBlock = (SSubmitBlk*) pTableDataBlock->pData; - int32_t rows = htons(pBlock->numOfRows); - - for(int32_t i = 0; i < rows; ++i) { - *(int32_t*) pDataBlock = total; - pDataBlock += sizeof(int32_t); - - *(int32_t*) pDataBlock = firstPartLen; - pDataBlock += sizeof(int32_t); - - memcpy(pDataBlock, p, pTableDataBlock->rowSize); - - p += pTableDataBlock->rowSize; - pDataBlock += pTableDataBlock->rowSize; + pBlock->len = 0; + for (int32_t i = 0; i < htons(pBlock->numOfRows); ++i) { + SDataRow trow = (SDataRow)pDataBlock; + dataRowSetLen(trow, TD_DATA_ROW_HEAD_SIZE + flen); + + int toffset = 0; + for (int32_t j = 0; j < tinfo.numOfColumns; j++) { + tdAppendColVal(trow, p, pSchema[j].type, pSchema[j].bytes, toffset); + toffset += TYPE_BYTES[pSchema[j].type]; + p += pSchema[j].bytes; + } + + // p += pTableDataBlock->rowSize; + pDataBlock += dataRowLen(trow); + pBlock->len += dataRowLen(trow); } + + len = pBlock->len; + pBlock->len = htonl(pBlock->len); + return len; } int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockList) { @@ -694,7 +691,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi pBlocks->len = htonl(len); // erase the empty space reserved for binary data - trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock); + len = trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock); dataBuf->size += (len + sizeof(SSubmitBlk)); dataBuf->numOfTables += 1; } diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 17aa19cce7be5d5a35707ef68cb297c7ba6889a0..489635420a1f278ec4e52db5e87513d4a9e55239 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -20,6 +20,7 @@ #include #include "taosdef.h" +#include "tutil.h" #ifdef __cplusplus extern "C" { @@ -30,7 +31,7 @@ typedef struct { int8_t type; // Column type int16_t colId; // column ID int32_t bytes; // column bytes - int32_t offset; // point offset in a row data + int32_t offset; // point offset in SDataRow after the header part } STColumn; #define colType(col) ((col)->type) @@ -43,26 +44,25 @@ typedef struct { #define colSetBytes(col, b) (colBytes(col) = (b)) #define colSetOffset(col, o) (colOffset(col) = (o)) -STColumn *tdNewCol(int8_t type, int16_t colId, int16_t bytes); -void tdFreeCol(STColumn *pCol); -void tdColCpy(STColumn *dst, STColumn *src); -void tdSetCol(STColumn *pCol, int8_t type, int16_t colId, int32_t bytes); - // ----------------- TSDB SCHEMA DEFINITION typedef struct { + int totalCols; // Total columns allocated int numOfCols; // Number of columns appended - int padding; // Total columns allocated + int tlen; // maximum length of a SDataRow without the header part + int flen; // First part length in a SDataRow after the header part STColumn columns[]; } STSchema; #define schemaNCols(s) ((s)->numOfCols) +#define schemaTotalCols(s) ((s)->totalCols) +#define schemaTLen(s) ((s)->tlen) +#define schemaFLen(s) ((s)->flen) #define schemaColAt(s, i) ((s)->columns + i) STSchema *tdNewSchema(int32_t nCols); -int tdSchemaAppendCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes); +#define tdFreeSchema(s) tfree((s)) +int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes); STSchema *tdDupSchema(STSchema *pSchema); -void tdFreeSchema(STSchema *pSchema); -void tdUpdateSchema(STSchema *pSchema); int tdGetSchemaEncodeSize(STSchema *pSchema); void * tdEncodeSchema(void *dst, STSchema *pSchema); STSchema *tdDecodeSchema(void **psrc); @@ -70,53 +70,100 @@ STSchema *tdDecodeSchema(void **psrc); // ----------------- Data row structure /* A data row, the format is like below: - * +----------+---------+---------------------------------+---------------------------------+ - * | int32_t | int32_t | | | - * +----------+---------+---------------------------------+---------------------------------+ - * | len | flen | First part | Second part | - * +----------+---------+---------------------------------+---------------------------------+ - * plen: first part length - * len: the length including sizeof(row) + sizeof(len) - * row: actual row data encoding + * |<------------------------------------- len ---------------------------------->| + * |<--Head ->|<--------- flen -------------->| | + * +----------+---------------------------------+---------------------------------+ + * | int32_t | | | + * +----------+---------------------------------+---------------------------------+ + * | len | First part | Second part | + * +----------+---------------------------------+---------------------------------+ */ typedef void *SDataRow; - -#define TD_DATA_ROW_HEAD_SIZE (2 * sizeof(int32_t)) +#define TD_DATA_ROW_HEAD_SIZE sizeof(int32_t) #define dataRowLen(r) (*(int32_t *)(r)) -#define dataRowFLen(r) (*(int32_t *)((char *)(r) + sizeof(int32_t))) -#define dataRowTuple(r) ((char *)(r) + TD_DATA_ROW_HEAD_SIZE) +#define dataRowTuple(r) POINTER_DRIFT(r, TD_DATA_ROW_HEAD_SIZE) #define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r))) #define dataRowSetLen(r, l) (dataRowLen(r) = (l)) -#define dataRowSetFLen(r, l) (dataRowFLen(r) = (l)) -#define dataRowIdx(r, i) ((char *)(r) + i) #define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r)) -#define dataRowAt(r, idx) ((char *)(r) + (idx)) +#define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE) -void tdInitDataRow(SDataRow row, STSchema *pSchema); -int tdMaxRowBytesFromSchema(STSchema *pSchema); -SDataRow tdNewDataRow(int32_t bytes, STSchema *pSchema); SDataRow tdNewDataRowFromSchema(STSchema *pSchema); void tdFreeDataRow(SDataRow row); -int tdAppendColVal(SDataRow row, void *value, STColumn *pCol); -void tdDataRowReset(SDataRow row, STSchema *pSchema); +void tdInitDataRow(SDataRow row, STSchema *pSchema); +int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_t offset); SDataRow tdDataRowDup(SDataRow row); +// NOTE: offset here including the header size +static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t offset) { + switch (type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + return POINTER_DRIFT(row, *(VarDataOffsetT *)POINTER_DRIFT(row, offset)); + break; + default: + return POINTER_DRIFT(row, offset); + break; + } +} + // ----------------- Data column structure typedef struct SDataCol { - int8_t type; - int16_t colId; - int bytes; - int len; - int offset; - void * pData; // Original data + int8_t type; // column type + int16_t colId; // column ID + int bytes; // column data bytes defined + int offset; // data offset in a SDataRow (including the header size) + int spaceSize; // Total space size for this column + int len; // column data length + VarDataOffsetT *dataOff; // For binary and nchar data, the offset in the data column + void * pData; // Actual data pointer } SDataCol; +static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; } + +void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints); +void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoints); +void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints); +void dataColSetOffset(SDataCol *pCol, int nEle); + +bool isNEleNull(SDataCol *pCol, int nEle); +void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints); + +// Get the data pointer from a column-wised data +static FORCE_INLINE void *tdGetColDataOfRow(SDataCol *pCol, int row) { + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + return POINTER_DRIFT(pCol->pData, pCol->dataOff[row]); + break; + + default: + return POINTER_DRIFT(pCol->pData, TYPE_BYTES[pCol->type] * row); + break; + } +} + +static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) { + ASSERT(rows > 0); + + switch (pDataCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + return pDataCol->dataOff[rows - 1] + varDataTLen(tdGetColDataOfRow(pDataCol, rows - 1)); + break; + default: + return TYPE_BYTES[pDataCol->type] * rows; + } +} + + typedef struct { int maxRowSize; int maxCols; // max number of columns int maxPoints; // max number of points + int bufSize; + int numOfPoints; int numOfCols; // Total number of cols int sversion; // TODO: set sversion @@ -125,7 +172,7 @@ typedef struct { } SDataCols; #define keyCol(pCols) (&((pCols)->cols[0])) // Key column -#define dataColsKeyAt(pCols, idx) ((int64_t *)(keyCol(pCols)->pData))[(idx)] +#define dataColsKeyAt(pCols, idx) ((TSKEY *)(keyCol(pCols)->pData))[(idx)] #define dataColsKeyFirst(pCols) dataColsKeyAt(pCols, 0) #define dataColsKeyLast(pCols) dataColsKeyAt(pCols, (pCols)->numOfPoints - 1) diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index de07ae35e52a6b754d1c165941673290f1528d67..7642475f7002fb9a5a77b17c388849291c35a6da 100644 --- a/src/common/inc/tglobal.h +++ b/src/common/inc/tglobal.h @@ -51,7 +51,7 @@ extern int32_t tsVersion; extern int32_t tscEmbedded; extern int64_t tsMsPerDay[2]; -extern char tsMaster[]; +extern char tsFirst[]; extern char tsSecond[]; extern char tsLocalEp[]; extern uint16_t tsServerPort; diff --git a/src/common/inc/tulog.h b/src/common/inc/tulog.h index b5499d81fca796b94071706988053d9811d84d84..143bc56f9ff5a8042fc29fe4497807d815002760 100644 --- a/src/common/inc/tulog.h +++ b/src/common/inc/tulog.h @@ -43,6 +43,8 @@ extern int32_t tscEmbedded; } #define uPrint(...) \ { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } +#define uForcePrint(...) \ + { taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); } #define pError(...) \ { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); } diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index aff6d7f77369b2e22ada1a4e8bbb3531b2eddd90..7321e1c921bab082f3074b087cab12b30da00c4c 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -13,72 +13,7 @@ * along with this program. If not, see . */ #include "tdataformat.h" -#include "tutil.h" - -static int tdFLenFromSchema(STSchema *pSchema); - -/** - * Create a new STColumn object - * ASSUMPTIONS: VALID PARAMETERS - * - * @param type column type - * @param colId column ID - * @param bytes maximum bytes the col taken - * - * @return a STColumn object on success - * NULL for failure - */ -STColumn *tdNewCol(int8_t type, int16_t colId, int16_t bytes) { - if (!isValidDataType(type, 0)) return NULL; - - STColumn *pCol = (STColumn *)calloc(1, sizeof(STColumn)); - if (pCol == NULL) return NULL; - - colSetType(pCol, type); - colSetColId(pCol, colId); - colSetOffset(pCol, -1); - switch (type) { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - colSetBytes(pCol, bytes); - break; - default: - colSetBytes(pCol, TYPE_BYTES[type]); - break; - } - - return pCol; -} - -/** - * Free a STColumn object CREATED with tdNewCol - */ -void tdFreeCol(STColumn *pCol) { - if (pCol) free(pCol); -} - -/** - * Copy from source to destinition - */ -void tdColCpy(STColumn *dst, STColumn *src) { memcpy((void *)dst, (void *)src, sizeof(STColumn)); } - -/** - * Set the column - */ -void tdSetCol(STColumn *pCol, int8_t type, int16_t colId, int32_t bytes) { - colSetType(pCol, type); - colSetColId(pCol, colId); - switch (type) - { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - colSetBytes(pCol, bytes); - break; - default: - colSetBytes(pCol, TYPE_BYTES[type]); - break; - } -} +#include "wchar.h" /** * Create a SSchema object with nCols columns @@ -90,11 +25,15 @@ void tdSetCol(STColumn *pCol, int8_t type, int16_t colId, int32_t bytes) { * NULL for failure */ STSchema *tdNewSchema(int32_t nCols) { - int32_t size = sizeof(STSchema) + sizeof(STColumn) * nCols; + int32_t size = sizeof(STSchema) + sizeof(STColumn) * nCols; STSchema *pSchema = (STSchema *)calloc(1, size); if (pSchema == NULL) return NULL; + pSchema->numOfCols = 0; + pSchema->totalCols = nCols; + pSchema->flen = 0; + pSchema->tlen = 0; return pSchema; } @@ -102,25 +41,34 @@ STSchema *tdNewSchema(int32_t nCols) { /** * Append a column to the schema */ -int tdSchemaAppendCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes) { - // if (pSchema->numOfCols >= pSchema->totalCols) return -1; - if (!isValidDataType(type, 0)) return -1; +int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes) { + if (!isValidDataType(type, 0) || pSchema->numOfCols >= pSchema->totalCols) return -1; STColumn *pCol = schemaColAt(pSchema, schemaNCols(pSchema)); colSetType(pCol, type); colSetColId(pCol, colId); - colSetOffset(pCol, -1); + if (schemaNCols(pSchema) == 0) { + colSetOffset(pCol, 0); + } else { + STColumn *pTCol = schemaColAt(pSchema, schemaNCols(pSchema)-1); + colSetOffset(pCol, pTCol->offset + TYPE_BYTES[pTCol->type]); + } switch (type) { case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_NCHAR: - colSetBytes(pCol, bytes); + colSetBytes(pCol, bytes); // Set as maximum bytes + pSchema->tlen += (TYPE_BYTES[type] + sizeof(VarDataLenT) + bytes); break; default: colSetBytes(pCol, TYPE_BYTES[type]); + pSchema->tlen += TYPE_BYTES[type]; break; } pSchema->numOfCols++; + pSchema->flen += TYPE_BYTES[type]; + + ASSERT(pCol->offset < pSchema->flen); return 0; } @@ -138,40 +86,22 @@ STSchema *tdDupSchema(STSchema *pSchema) { return tSchema; } -/** - * Free the SSchema object created by tdNewSchema or tdDupSchema - */ -void tdFreeSchema(STSchema *pSchema) { - if (pSchema != NULL) free(pSchema); -} - -/** - * Function to update each columns's offset field in the schema. - * ASSUMPTIONS: VALID PARAMETERS - */ -void tdUpdateSchema(STSchema *pSchema) { - STColumn *pCol = NULL; - int32_t offset = TD_DATA_ROW_HEAD_SIZE; - for (int i = 0; i < schemaNCols(pSchema); i++) { - pCol = schemaColAt(pSchema, i); - colSetOffset(pCol, offset); - offset += TYPE_BYTES[pCol->type]; - } -} - /** * Return the size of encoded schema */ int tdGetSchemaEncodeSize(STSchema *pSchema) { - return sizeof(STSchema) + schemaNCols(pSchema) * (T_MEMBER_SIZE(STColumn, type) + T_MEMBER_SIZE(STColumn, colId) + - T_MEMBER_SIZE(STColumn, bytes)); + return T_MEMBER_SIZE(STSchema, totalCols) + + schemaNCols(pSchema) * + (T_MEMBER_SIZE(STColumn, type) + T_MEMBER_SIZE(STColumn, colId) + T_MEMBER_SIZE(STColumn, bytes)); } /** * Encode a schema to dst, and return the next pointer */ void *tdEncodeSchema(void *dst, STSchema *pSchema) { - T_APPEND_MEMBER(dst, pSchema, STSchema, numOfCols); + ASSERT(pSchema->numOfCols == pSchema->totalCols); + + T_APPEND_MEMBER(dst, pSchema, STSchema, totalCols); for (int i = 0; i < schemaNCols(pSchema); i++) { STColumn *pCol = schemaColAt(pSchema, i); T_APPEND_MEMBER(dst, pCol, STColumn, type); @@ -186,13 +116,13 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) { * Decode a schema from a binary. */ STSchema *tdDecodeSchema(void **psrc) { - int numOfCols = 0; + int totalCols = 0; - T_READ_MEMBER(*psrc, int, numOfCols); + T_READ_MEMBER(*psrc, int, totalCols); - STSchema *pSchema = tdNewSchema(numOfCols); + STSchema *pSchema = tdNewSchema(totalCols); if (pSchema == NULL) return NULL; - for (int i = 0; i < numOfCols; i++) { + for (int i = 0; i < totalCols; i++) { int8_t type = 0; int16_t colId = 0; int32_t bytes = 0; @@ -200,7 +130,7 @@ STSchema *tdDecodeSchema(void **psrc) { T_READ_MEMBER(*psrc, int16_t, colId); T_READ_MEMBER(*psrc, int32_t, bytes); - tdSchemaAppendCol(pSchema, type, colId, bytes); + tdSchemaAddCol(pSchema, type, colId, bytes); } return pSchema; @@ -209,53 +139,18 @@ STSchema *tdDecodeSchema(void **psrc) { /** * Initialize a data row */ -void tdInitDataRow(SDataRow row, STSchema *pSchema) { - dataRowSetFLen(row, TD_DATA_ROW_HEAD_SIZE); - dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + tdFLenFromSchema(pSchema)); -} +void tdInitDataRow(SDataRow row, STSchema *pSchema) { dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + schemaFLen(pSchema)); } -/** - * Create a data row with maximum row length bytes. - * - * NOTE: THE AAPLICATION SHOULD MAKE SURE BYTES IS LARGE ENOUGH TO - * HOLD THE WHOE ROW. - * - * @param bytes max bytes a row can take - * @return SDataRow object for success - * NULL for failure - */ -SDataRow tdNewDataRow(int32_t bytes, STSchema *pSchema) { - int32_t size = sizeof(int32_t) + bytes; +SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { + int32_t size = dataRowMaxBytesFromSchema(pSchema); SDataRow row = malloc(size); if (row == NULL) return NULL; tdInitDataRow(row, pSchema); - return row; } -/** - * Get maximum bytes a data row from a schema - * ASSUMPTIONS: VALID PARAMETER - */ -int tdMaxRowBytesFromSchema(STSchema *pSchema) { - // TODO - int bytes = TD_DATA_ROW_HEAD_SIZE; - for (int i = 0; i < schemaNCols(pSchema); i++) { - STColumn *pCol = schemaColAt(pSchema, i); - bytes += TYPE_BYTES[pCol->type]; - - if (pCol->type == TSDB_DATA_TYPE_BINARY || pCol->type == TSDB_DATA_TYPE_NCHAR) { - bytes += pCol->bytes; - } - } - - return bytes; -} - -SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { return tdNewDataRow(tdMaxRowBytesFromSchema(pSchema), pSchema); } - /** * Free the SDataRow object */ @@ -265,28 +160,49 @@ void tdFreeDataRow(SDataRow row) { /** * Append a column value to the data row + * @param type: column type + * @param bytes: column bytes + * @param offset: offset in the data row tuple, not including the data row header */ -int tdAppendColVal(SDataRow row, void *value, STColumn *pCol) { - switch (colType(pCol)) - { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - *(int32_t *)dataRowAt(row, dataRowFLen(row)) = dataRowLen(row); - dataRowFLen(row) += TYPE_BYTES[colType(pCol)]; - memcpy((void *)dataRowAt(row, dataRowLen(row)), value, strlen(value)); - dataRowLen(row) += strlen(value); - break; - default: - memcpy(dataRowAt(row, dataRowFLen(row)), value, TYPE_BYTES[colType(pCol)]); - dataRowFLen(row) += TYPE_BYTES[colType(pCol)]; - break; +int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_t offset) { + ASSERT(value != NULL); + int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE; + char * ptr = POINTER_DRIFT(row, dataRowLen(row)); + + switch (type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + // set offset + *(VarDataOffsetT *)POINTER_DRIFT(row, toffset) = dataRowLen(row); + + // set length + VarDataLenT slen = 0; + if (isNull(value, type)) { + slen = (type == TSDB_DATA_TYPE_BINARY) ? sizeof(int8_t) : sizeof(int32_t); + } else { + if (type == TSDB_DATA_TYPE_BINARY) { + slen = strnlen((char *)value, bytes); + } else { + slen = wcsnlen((wchar_t *)value, (bytes) / TSDB_NCHAR_SIZE) * TSDB_NCHAR_SIZE; + } + } + + ASSERT(slen <= bytes); + *(VarDataLenT *)ptr = slen; + ptr = POINTER_DRIFT(ptr, sizeof(VarDataLenT)); + + memcpy((void *)ptr, value, slen); + dataRowLen(row) += (sizeof(int16_t) + slen); + + break; + default: + memcpy(POINTER_DRIFT(row, toffset), value, TYPE_BYTES[type]); + break; } return 0; } -void tdDataRowReset(SDataRow row, STSchema *pSchema) { tdInitDataRow(row, pSchema); } - SDataRow tdDataRowDup(SDataRow row) { SDataRow trow = malloc(dataRowLen(row)); if (trow == NULL) return NULL; @@ -295,6 +211,119 @@ SDataRow tdDataRowDup(SDataRow row) { return trow; } +void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints) { + pDataCol->type = colType(pCol); + pDataCol->colId = colColId(pCol); + pDataCol->bytes = colBytes(pCol); + pDataCol->offset = colOffset(pCol) + TD_DATA_ROW_HEAD_SIZE; + + pDataCol->len = 0; + if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) { + pDataCol->spaceSize = (sizeof(VarDataLenT) + pDataCol->bytes) * maxPoints; + pDataCol->dataOff = (VarDataOffsetT *)(*pBuf); + pDataCol->pData = POINTER_DRIFT(*pBuf, TYPE_BYTES[pDataCol->type] * maxPoints); + *pBuf = POINTER_DRIFT(*pBuf, pDataCol->spaceSize + TYPE_BYTES[pDataCol->type] * maxPoints); + } else { + pDataCol->spaceSize = pDataCol->bytes * maxPoints; + pDataCol->dataOff = NULL; + pDataCol->pData = *pBuf; + *pBuf = POINTER_DRIFT(*pBuf, pDataCol->spaceSize); + } + +} + +void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoints) { + ASSERT(pCol != NULL && value != NULL); + + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + // set offset + pCol->dataOff[numOfPoints] = pCol->len; + // Copy data + memcpy(POINTER_DRIFT(pCol->pData, pCol->len), value, varDataTLen(value)); + // Update the length + pCol->len += varDataTLen(value); + break; + default: + ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfPoints); + memcpy(POINTER_DRIFT(pCol->pData, pCol->len), value, pCol->bytes); + pCol->len += pCol->bytes; + break; + } +} + +void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints) { + int pointsLeft = numOfPoints - pointsToPop; + + ASSERT(pointsLeft > 0); + + if (pCol->type == TSDB_DATA_TYPE_BINARY || pCol->type == TSDB_DATA_TYPE_NCHAR) { + ASSERT(pCol->len > 0); + VarDataOffsetT toffset = pCol->dataOff[pointsToPop]; + pCol->len = pCol->len - toffset; + ASSERT(pCol->len > 0); + memmove(pCol->pData, POINTER_DRIFT(pCol->pData, toffset), pCol->len); + dataColSetOffset(pCol, pointsLeft); + } else { + ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfPoints); + pCol->len = TYPE_BYTES[pCol->type] * pointsLeft; + memmove(pCol->pData, POINTER_DRIFT(pCol->pData, TYPE_BYTES[pCol->type] * pointsToPop), pCol->len); + } +} + +bool isNEleNull(SDataCol *pCol, int nEle) { + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + for (int i = 0; i < nEle; i++) { + if (!isNull(varDataVal(tdGetColDataOfRow(pCol, i)), pCol->type)) return false; + } + return true; + default: + for (int i = 0; i < nEle; i++) { + if (!isNull(tdGetColDataOfRow(pCol, i), pCol->type)) return false; + } + return true; + } +} + +void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints) { + char *ptr = NULL; + switch (pCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + pCol->len = 0; + for (int i = 0; i < nEle; i++) { + pCol->dataOff[i] = pCol->len; + ptr = (char *)pCol->pData + pCol->len; + varDataLen(ptr) = (pCol->type == TSDB_DATA_TYPE_BINARY) ? sizeof(char) : TSDB_NCHAR_SIZE; + setNull(ptr + sizeof(VarDataLenT), pCol->type, pCol->bytes); + pCol->len += varDataTLen(ptr); + } + + break; + default: + setNullN(pCol->pData, pCol->type, pCol->bytes, nEle); + pCol->len = TYPE_BYTES[pCol->type] * nEle; + break; + } +} + +void dataColSetOffset(SDataCol *pCol, int nEle) { + ASSERT(((pCol->type == TSDB_DATA_TYPE_BINARY) || (pCol->type == TSDB_DATA_TYPE_NCHAR))); + + void * tptr = pCol->pData; + // char *tptr = (char *)(pCol->pData); + + VarDataOffsetT offset = 0; + for (int i = 0; i < nEle; i++) { + pCol->dataOff[i] = offset; + offset += varDataTLen(tptr); + tptr = POINTER_DRIFT(tptr, varDataTLen(tptr)); + } +} + SDataCols *tdNewDataCols(int maxRowSize, int maxCols, int maxRows) { SDataCols *pCols = (SDataCols *)calloc(1, sizeof(SDataCols) + sizeof(SDataCol) * maxCols); if (pCols == NULL) return NULL; @@ -302,8 +331,9 @@ SDataCols *tdNewDataCols(int maxRowSize, int maxCols, int maxRows) { pCols->maxRowSize = maxRowSize; pCols->maxCols = maxCols; pCols->maxPoints = maxRows; + pCols->bufSize = maxRowSize * maxRows; - pCols->buf = malloc(maxRowSize * maxRows); + pCols->buf = malloc(pCols->bufSize); if (pCols->buf == NULL) { free(pCols); return NULL; @@ -317,24 +347,16 @@ void tdInitDataCols(SDataCols *pCols, STSchema *pSchema) { tdResetDataCols(pCols); pCols->numOfCols = schemaNCols(pSchema); - pCols->cols[0].pData = pCols->buf; - int offset = TD_DATA_ROW_HEAD_SIZE; + void *ptr = pCols->buf; for (int i = 0; i < schemaNCols(pSchema); i++) { - if (i > 0) { - pCols->cols[i].pData = (char *)(pCols->cols[i - 1].pData) + schemaColAt(pSchema, i - 1)->bytes * pCols->maxPoints; - } - pCols->cols[i].type = colType(schemaColAt(pSchema, i)); - pCols->cols[i].bytes = colBytes(schemaColAt(pSchema, i)); - pCols->cols[i].offset = offset; - pCols->cols[i].colId = colColId(schemaColAt(pSchema, i)); - - offset += TYPE_BYTES[pCols->cols[i].type]; + dataColInit(pCols->cols + i, schemaColAt(pSchema, i), &ptr, pCols->maxPoints); + ASSERT((char *)ptr - (char *)(pCols->buf) <= pCols->bufSize); } } void tdFreeDataCols(SDataCols *pCols) { if (pCols) { - if (pCols->buf) free(pCols->buf); + tfree(pCols->buf); free(pCols); } } @@ -351,11 +373,24 @@ SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) { pRet->cols[i].type = pDataCols->cols[i].type; pRet->cols[i].colId = pDataCols->cols[i].colId; pRet->cols[i].bytes = pDataCols->cols[i].bytes; - pRet->cols[i].len = pDataCols->cols[i].len; pRet->cols[i].offset = pDataCols->cols[i].offset; + + pRet->cols[i].spaceSize = pDataCols->cols[i].spaceSize; pRet->cols[i].pData = (void *)((char *)pRet->buf + ((char *)(pDataCols->cols[i].pData) - (char *)(pDataCols->buf))); - if (keepData) memcpy(pRet->cols[i].pData, pDataCols->cols[i].pData, pRet->cols[i].bytes * pDataCols->numOfPoints); + if (pRet->cols[i].type == TSDB_DATA_TYPE_BINARY || pRet->cols[i].type == TSDB_DATA_TYPE_NCHAR) { + ASSERT(pDataCols->cols[i].dataOff != NULL); + pRet->cols[i].dataOff = + (int32_t *)((char *)pRet->buf + ((char *)(pDataCols->cols[i].dataOff) - (char *)(pDataCols->buf))); + } + + if (keepData) { + pRet->cols[i].len = pDataCols->cols[i].len; + memcpy(pRet->cols[i].pData, pDataCols->cols[i].pData, pDataCols->cols[i].len); + if (pRet->cols[i].type == TSDB_DATA_TYPE_BINARY || pRet->cols[i].type == TSDB_DATA_TYPE_NCHAR) { + memcpy(pRet->cols[i].dataOff, pDataCols->cols[i].dataOff, sizeof(VarDataOffsetT) * pDataCols->maxPoints); + } + } } return pRet; @@ -364,57 +399,60 @@ SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) { void tdResetDataCols(SDataCols *pCols) { pCols->numOfPoints = 0; for (int i = 0; i < pCols->maxCols; i++) { - pCols->cols[i].len = 0; + dataColReset(pCols->cols + i); } } void tdAppendDataRowToDataCol(SDataRow row, SDataCols *pCols) { + ASSERT(dataColsKeyLast(pCols) < dataRowKey(row)); + for (int i = 0; i < pCols->numOfCols; i++) { SDataCol *pCol = pCols->cols + i; - memcpy((void *)((char *)(pCol->pData) + pCol->len), dataRowAt(row, pCol->offset), pCol->bytes); - pCol->len += pCol->bytes; + void * value = tdGetRowDataOfCol(row, pCol->type, pCol->offset); + + dataColAppendVal(pCol, value, pCols->numOfPoints, pCols->maxPoints); } pCols->numOfPoints++; } + // Pop pointsToPop points from the SDataCols void tdPopDataColsPoints(SDataCols *pCols, int pointsToPop) { int pointsLeft = pCols->numOfPoints - pointsToPop; + if (pointsLeft <= 0) { + tdResetDataCols(pCols); + return; + } for (int iCol = 0; iCol < pCols->numOfCols; iCol++) { - SDataCol *p_col = pCols->cols + iCol; - if (p_col->len > 0) { - p_col->len = TYPE_BYTES[p_col->type] * pointsLeft; - if (pointsLeft > 0) { - memmove((void *)(p_col->pData), (void *)((char *)(p_col->pData) + TYPE_BYTES[p_col->type] * pointsToPop), p_col->len); - } - } + SDataCol *pCol = pCols->cols + iCol; + dataColPopPoints(pCol, pointsToPop, pCols->numOfPoints); } pCols->numOfPoints = pointsLeft; } -/** - * Return the first part length of a data row for a schema - */ -static int tdFLenFromSchema(STSchema *pSchema) { - int ret = 0; - for (int i = 0; i < schemaNCols(pSchema); i++) { - STColumn *pCol = schemaColAt(pSchema, i); - ret += TYPE_BYTES[pCol->type]; - } - - return ret; -} - int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge) { ASSERT(rowsToMerge > 0 && rowsToMerge <= source->numOfPoints); + ASSERT(target->numOfPoints + rowsToMerge <= target->maxPoints); + ASSERT(target->numOfCols == source->numOfCols); - SDataCols *pTarget = tdDupDataCols(target, true); - if (pTarget == NULL) goto _err; - // tdResetDataCols(target); + SDataCols *pTarget = NULL; - int iter1 = 0; - int iter2 = 0; - tdMergeTwoDataCols(target,pTarget, &iter1, source, &iter2, pTarget->numOfPoints + rowsToMerge); + if (dataColsKeyLast(target) < dataColsKeyFirst(source)) { // No overlap + for (int i = 0; i < rowsToMerge; i++) { + for (int j = 0; j < source->numOfCols; j++) { + dataColAppendVal(target->cols + j, tdGetColDataOfRow(source->cols + j, i), target->numOfPoints, + target->maxPoints); + } + } + target->numOfPoints++; + } else { + pTarget = tdDupDataCols(target, true); + if (pTarget == NULL) goto _err; + + int iter1 = 0; + int iter2 = 0; + tdMergeTwoDataCols(target, pTarget, &iter1, source, &iter2, pTarget->numOfPoints + rowsToMerge); + } tdFreeDataCols(pTarget); return 0; @@ -425,6 +463,7 @@ _err: } void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCols *src2, int *iter2, int tRows) { + // TODO: add resolve duplicate key here tdResetDataCols(target); while (target->numOfPoints < tRows) { @@ -436,10 +475,8 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol if (key1 < key2) { for (int i = 0; i < src1->numOfCols; i++) { ASSERT(target->cols[i].type == src1->cols[i].type); - memcpy((void *)((char *)(target->cols[i].pData) + TYPE_BYTES[target->cols[i].type] * target->numOfPoints), - (void *)((char *)(src1->cols[i].pData) + TYPE_BYTES[target->cols[i].type] * (*iter1)), - TYPE_BYTES[target->cols[i].type]); - target->cols[i].len += TYPE_BYTES[target->cols[i].type]; + dataColAppendVal(target->cols[i].pData, tdGetColDataOfRow(src1->cols + i, *iter1), target->numOfPoints, + target->maxPoints); } target->numOfPoints++; @@ -447,15 +484,14 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol } else if (key1 > key2) { for (int i = 0; i < src2->numOfCols; i++) { ASSERT(target->cols[i].type == src2->cols[i].type); - memcpy((void *)((char *)(target->cols[i].pData) + TYPE_BYTES[target->cols[i].type] * target->numOfPoints), - (void *)((char *)(src2->cols[i].pData) + TYPE_BYTES[src2->cols[i].type] * (*iter2)), - TYPE_BYTES[target->cols[i].type]); - target->cols[i].len += TYPE_BYTES[target->cols[i].type]; + dataColAppendVal(target->cols[i].pData, tdGetColDataOfRow(src2->cols + i, *iter2), target->numOfPoints, + target->maxPoints); } target->numOfPoints++; (*iter2)++; } else { + // TODO: deal with duplicate keys ASSERT(false); } } diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 2749d96ff685e90c2e3ab3ff9bb3e4e7a030b64b..eb81070f6dcc9917c12f03b5be88cfa73a690543 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -25,6 +25,7 @@ #include "tutil.h" #include "tlocale.h" #include "ttimezone.h" +#include "tsync.h" char configDir[TSDB_FILENAME_LEN] = "/etc/taos"; char tsVnodeDir[TSDB_FILENAME_LEN] = {0}; @@ -60,8 +61,9 @@ int32_t tscEmbedded = 0; */ int64_t tsMsPerDay[] = {86400000L, 86400000000L}; -char tsMaster[TSDB_FQDN_LEN] = {0}; +char tsFirst[TSDB_FQDN_LEN] = {0}; char tsSecond[TSDB_FQDN_LEN] = {0}; +char tsArbitrator[TSDB_FQDN_LEN] = {0}; char tsLocalEp[TSDB_FQDN_LEN] = {0}; // Local End Point, hostname:port uint16_t tsServerPort = 6030; uint16_t tsMnodeShellPort = 6030; // udp[6030-6034] tcp[6030] @@ -141,6 +143,7 @@ int32_t qdebugFlag = 131; int32_t rpcDebugFlag = 131; int32_t uDebugFlag = 131; int32_t debugFlag = 131; +int32_t sDebugFlag = 131; // the maximum number of results for projection query on super table that are returned from // one virtual node, to order according to timestamp @@ -269,9 +272,9 @@ static void doInitGlobalConfig() { SGlobalCfg cfg = {0}; // ip address - cfg.option = "master"; - cfg.ptr = tsMaster; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; + cfg.option = "first"; + cfg.ptr = tsFirst; + cfg.valType = TAOS_CFG_VTYPE_STRING; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; cfg.minValue = 0; cfg.maxValue = 0; @@ -281,7 +284,7 @@ static void doInitGlobalConfig() { cfg.option = "second"; cfg.ptr = tsSecond; - cfg.valType = TAOS_CFG_VTYPE_IPSTR; + cfg.valType = TAOS_CFG_VTYPE_STRING; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; cfg.minValue = 0; cfg.maxValue = 0; @@ -341,6 +344,16 @@ static void doInitGlobalConfig() { cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); + cfg.option = "arbitrator"; + cfg.ptr = tsArbitrator; + cfg.valType = TAOS_CFG_VTYPE_STRING; + cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; + cfg.minValue = 0; + cfg.maxValue = 0; + cfg.ptrLength = TSDB_FQDN_LEN; + cfg.unitType = TAOS_CFG_UTYPE_NONE; + taosInitConfigOption(cfg); + // dnode configs cfg.option = "numOfThreadsPerCore"; cfg.ptr = &tsNumOfThreadsPerCore; @@ -1012,6 +1025,16 @@ static void doInitGlobalConfig() { cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); + cfg.option = "sDebugFlag"; + cfg.ptr = &sDebugFlag; + cfg.valType = TAOS_CFG_VTYPE_INT32; + cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG; + cfg.minValue = 0; + cfg.maxValue = 255; + cfg.ptrLength = 0; + cfg.unitType = TAOS_CFG_UTYPE_NONE; + taosInitConfigOption(cfg); + cfg.option = "sdbDebugFlag"; cfg.ptr = &sdbDebugFlag; cfg.valType = TAOS_CFG_VTYPE_INT32; @@ -1181,9 +1204,10 @@ void taosInitGlobalCfg() { bool taosCheckGlobalCfg() { taosGetFqdn(tsLocalEp); sprintf(tsLocalEp + strlen(tsLocalEp), ":%d", tsServerPort); + uPrint("localEp is %s", tsLocalEp); - if (tsMaster[0] == 0) { - strcpy(tsMaster, tsLocalEp); + if (tsFirst[0] == 0) { + strcpy(tsFirst, tsLocalEp); } if (tsSecond[0] == 0) { diff --git a/src/common/src/tlocale.c b/src/common/src/tlocale.c index 35a68218f1299e3e71767187cdb155d1d93b0eec..b2631cf08c4699c8ad7a79d80f30a4c81cedb30e 100644 --- a/src/common/src/tlocale.c +++ b/src/common/src/tlocale.c @@ -27,27 +27,20 @@ * In case that the setLocale failed to be executed, the right charset needs to be set. */ void tsSetLocale() { - char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n"; - char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n"; - char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n"; - char *locale = setlocale(LC_CTYPE, tsLocale); // default locale or user specified locale is not valid, abort launch if (locale == NULL) { - printf(msgLocale, tsLocale); - uPrint(msgLocale, tsLocale); + uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale); } if (strlen(tsCharset) == 0) { - printf("%s\n", msgCharset1); - uPrint(msgCharset1); + uForcePrint("failed to get charset, please set the valid charset in config file"); exit(-1); } if (!taosValidateEncodec(tsCharset)) { - printf(msgCharset, tsCharset); - uPrint(msgCharset, tsCharset); + uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset); exit(-1); } } \ No newline at end of file diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c index 2f4aa6ab765c71fa841ff5246e3e88ae37fd054b..d99e916c73974b81ac8e8f08a305445ef76e31e0 100644 --- a/src/common/src/ttypes.c +++ b/src/common/src/ttypes.c @@ -16,33 +16,34 @@ #include "taosdef.h" #include "ttokendef.h" +#include "tscompression.h" const int32_t TYPE_BYTES[11] = { - -1, // TSDB_DATA_TYPE_NULL - sizeof(int8_t), // TSDB_DATA_TYPE_BOOL - sizeof(int8_t), // TSDB_DATA_TYPE_TINYINT - sizeof(int16_t), // TSDB_DATA_TYPE_SMALLINT - sizeof(int32_t), // TSDB_DATA_TYPE_INT - sizeof(int64_t), // TSDB_DATA_TYPE_BIGINT - sizeof(float), // TSDB_DATA_TYPE_FLOAT - sizeof(double), // TSDB_DATA_TYPE_DOUBLE - sizeof(int32_t), // TSDB_DATA_TYPE_BINARY - sizeof(TSKEY), // TSDB_DATA_TYPE_TIMESTAMP - sizeof(int32_t) // TSDB_DATA_TYPE_NCHAR + -1, // TSDB_DATA_TYPE_NULL + sizeof(int8_t), // TSDB_DATA_TYPE_BOOL + sizeof(int8_t), // TSDB_DATA_TYPE_TINYINT + sizeof(int16_t), // TSDB_DATA_TYPE_SMALLINT + sizeof(int32_t), // TSDB_DATA_TYPE_INT + sizeof(int64_t), // TSDB_DATA_TYPE_BIGINT + sizeof(float), // TSDB_DATA_TYPE_FLOAT + sizeof(double), // TSDB_DATA_TYPE_DOUBLE + sizeof(VarDataOffsetT), // TSDB_DATA_TYPE_BINARY + sizeof(TSKEY), // TSDB_DATA_TYPE_TIMESTAMP + sizeof(VarDataOffsetT) // TSDB_DATA_TYPE_NCHAR }; tDataTypeDescriptor tDataTypeDesc[11] = { - {TSDB_DATA_TYPE_NULL, 6, 1, "NOTYPE"}, - {TSDB_DATA_TYPE_BOOL, 4, CHAR_BYTES, "BOOL"}, - {TSDB_DATA_TYPE_TINYINT, 7, CHAR_BYTES, "TINYINT"}, - {TSDB_DATA_TYPE_SMALLINT, 8, SHORT_BYTES, "SMALLINT"}, - {TSDB_DATA_TYPE_INT, 3, INT_BYTES, "INT"}, - {TSDB_DATA_TYPE_BIGINT, 6, LONG_BYTES, "BIGINT"}, - {TSDB_DATA_TYPE_FLOAT, 5, FLOAT_BYTES, "FLOAT"}, - {TSDB_DATA_TYPE_DOUBLE, 6, DOUBLE_BYTES, "DOUBLE"}, - {TSDB_DATA_TYPE_BINARY, 6, 0, "BINARY"}, - {TSDB_DATA_TYPE_TIMESTAMP, 9, LONG_BYTES, "TIMESTAMP"}, - {TSDB_DATA_TYPE_NCHAR, 5, 8, "NCHAR"}, + {TSDB_DATA_TYPE_NULL, 6, 1, "NOTYPE", NULL, NULL}, + {TSDB_DATA_TYPE_BOOL, 4, CHAR_BYTES, "BOOL", tsCompressBool, tsDecompressBool}, + {TSDB_DATA_TYPE_TINYINT, 7, CHAR_BYTES, "TINYINT", tsCompressTinyint, tsDecompressTinyint}, + {TSDB_DATA_TYPE_SMALLINT, 8, SHORT_BYTES, "SMALLINT", tsCompressSmallint, tsDecompressSmallint}, + {TSDB_DATA_TYPE_INT, 3, INT_BYTES, "INT", tsCompressInt, tsDecompressInt}, + {TSDB_DATA_TYPE_BIGINT, 6, LONG_BYTES, "BIGINT", tsCompressBigint, tsDecompressBigint}, + {TSDB_DATA_TYPE_FLOAT, 5, FLOAT_BYTES, "FLOAT", tsCompressFloat, tsDecompressFloat}, + {TSDB_DATA_TYPE_DOUBLE, 6, DOUBLE_BYTES, "DOUBLE", tsCompressDouble, tsDecompressDouble}, + {TSDB_DATA_TYPE_BINARY, 6, 0, "BINARY", tsCompressString, tsDecompressString}, + {TSDB_DATA_TYPE_TIMESTAMP, 9, LONG_BYTES, "TIMESTAMP", tsCompressTimestamp, tsDecompressTimestamp}, + {TSDB_DATA_TYPE_NCHAR, 5, 8, "NCHAR", tsCompressString, tsDecompressString}, }; char tTokenTypeSwitcher[13] = { diff --git a/src/dnode/src/dnodeMClient.c b/src/dnode/src/dnodeMClient.c index 8b3f21b1039c5d93fe8bcb2f91c468afa548c61d..3aa863799b612b0817c9e9951b484566ff263b2d 100644 --- a/src/dnode/src/dnodeMClient.c +++ b/src/dnode/src/dnodeMClient.c @@ -83,17 +83,19 @@ int32_t dnodeInitMClient() { memset(&tsMnodeIpSet, 0, sizeof(SRpcIpSet)); memset(&tsMnodeInfos, 0, sizeof(SDMMnodeInfos)); tsMnodeIpSet.numOfIps = 1; - taosGetFqdnPortFromEp(tsMaster, tsMnodeIpSet.fqdn[0], &tsMnodeIpSet.port[0]); + taosGetFqdnPortFromEp(tsFirst, tsMnodeIpSet.fqdn[0], &tsMnodeIpSet.port[0]); tsMnodeIpSet.port[0] += TSDB_PORT_MNODEDNODE; - if (strcmp(tsSecond, tsMaster) != 0) { + if (strcmp(tsSecond, tsFirst) != 0) { tsMnodeIpSet.numOfIps = 2; taosGetFqdnPortFromEp(tsSecond, tsMnodeIpSet.fqdn[1], &tsMnodeIpSet.port[1]); + tsMnodeIpSet.port[1] += TSDB_PORT_MNODEDNODE; } } else { tsMnodeIpSet.inUse = tsMnodeInfos.inUse; tsMnodeIpSet.numOfIps = tsMnodeInfos.nodeNum; for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { taosGetFqdnPortFromEp(tsMnodeInfos.nodeInfos[i].nodeEp, tsMnodeIpSet.fqdn[i], &tsMnodeIpSet.port[i]); + tsMnodeIpSet.port[i] += TSDB_PORT_MNODEDNODE; } } diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index 43b16ae6ea084e00924af482771cf4129d80fe84..6aa42f05c700d5bd21b160da344a3939e0545918 100644 --- a/src/dnode/src/dnodeMain.c +++ b/src/dnode/src/dnodeMain.c @@ -15,6 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" +#include "taos.h" #include "tglobal.h" #include "trpc.h" #include "tutil.h" @@ -190,6 +191,7 @@ static void dnodeCleanUpSystem() { dnodeCleanupWrite(); dnodeCleanupRead(); dnodeCleanUpModules(); + taos_cleanup(); dnodeCleanupStorage(); taosCloseLog(); } @@ -236,5 +238,5 @@ static int32_t dnodeInitStorage() { static void dnodeCleanupStorage() {} bool dnodeIsFirstDeploy() { - return strcmp(tsMaster, tsLocalEp) == 0; + return strcmp(tsFirst, tsLocalEp) == 0; } diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 68cb2fbfd24e66e4ee945b96e25f6d27382ba7aa..6407b537aedad3b7b31b77b316041b9add1a1e83 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -32,6 +32,13 @@ extern "C" { #define TSKEY int64_t #endif +// ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR +typedef int32_t VarDataOffsetT; +typedef int16_t VarDataLenT; +#define varDataLen(v) ((VarDataLenT *)(v))[0] +#define varDataTLen(v) (sizeof(VarDataLenT) + varDataLen(v)) +#define varDataVal(v) ((void *)((char *)v + sizeof(VarDataLenT))) + // this data type is internally used only in 'in' query to hold the values #define TSDB_DATA_TYPE_ARRAY (TSDB_DATA_TYPE_NCHAR + 1) @@ -121,6 +128,10 @@ typedef struct tDataTypeDescriptor { int16_t nameLen; int32_t nSize; char * aName; + int (*compFunc)(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize); + int (*decompFunc)(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize); } tDataTypeDescriptor; extern tDataTypeDescriptor tDataTypeDesc[11]; @@ -190,7 +201,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_LOCALE_LEN 64 #define TSDB_TIMEZONE_LEN 64 -#define TSDB_FQDN_LEN 64 +#define TSDB_FQDN_LEN 72 #define TSDB_IPv4ADDR_LEN 16 #define TSDB_FILENAME_LEN 128 #define TSDB_METER_VNODE_BITS 20 diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index 9259da85e3d7338709270fb8c6e5239c75c30db8..5b117fbc928c710e2dbcbbe042adfe3b47ffac59 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -104,9 +104,10 @@ void tsdbClearTableCfg(STableCfg *config); int32_t tsdbGetTableTagVal(TsdbRepoT *repo, STableId* id, int32_t colId, int16_t *type, int16_t *bytes, char **val); int32_t tsdbGetTableName(TsdbRepoT *repo, STableId* id, char** name); -int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg); -int tsdbDropTable(TsdbRepoT *pRepo, STableId tableId); -int tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg); +int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg); +int tsdbDropTable(TsdbRepoT *pRepo, STableId tableId); +int tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg); +TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, int64_t uid); // the TSDB repository info typedef struct STsdbRepoInfo { diff --git a/src/inc/tsync.h b/src/inc/tsync.h index 4b766664f368ecb6bdcdd70cdf385eae4a963f2d..797de063b9a77d9780bbea25fcb4d21c1c316d4f 100644 --- a/src/inc/tsync.h +++ b/src/inc/tsync.h @@ -45,8 +45,6 @@ typedef struct { typedef struct { int8_t quorum; // number of confirms required, >=1 int8_t replica; // number of replications, >=1 - uint16_t arbitratorPort; // arbitrator port - char arbitratorFqdn[TSDB_FQDN_LEN]; // arbitrator IP address SNodeInfo nodeInfo[TAOS_SYNC_MAX_REPLICA]; } SSyncCfg; @@ -108,6 +106,7 @@ extern int tsMaxWatchFiles; extern int tsSyncTimer; extern int tsMaxFwdInfo; extern int sDebugFlag; +extern char tsArbitrator[]; extern uint16_t tsSyncPort; #ifdef __cplusplus diff --git a/src/mnode/inc/mgmtDb.h b/src/mnode/inc/mgmtDb.h index 920217b9b8e0cc2d96acfb9fc26d6712cee1f5f1..b00a2bdf3de532755576fd308bf49877b9956b43 100644 --- a/src/mnode/inc/mgmtDb.h +++ b/src/mnode/inc/mgmtDb.h @@ -32,6 +32,7 @@ int32_t mgmtInitDbs(); void mgmtCleanUpDbs(); SDbObj *mgmtGetDb(char *db); SDbObj *mgmtGetDbByTableId(char *db); +void * mgmtGetNextDb(void *pNode, SDbObj **pDb); void mgmtIncDbRef(SDbObj *pDb); void mgmtDecDbRef(SDbObj *pDb); bool mgmtCheckIsMonitorDB(char *db, char *monitordb); diff --git a/src/mnode/inc/mgmtDef.h b/src/mnode/inc/mgmtDef.h index c0fc3ea3d521fadf3d68c5519ab6f00d795f2cf4..34249d3f00cddfca1c73df0732386ba08c6a832f 100644 --- a/src/mnode/inc/mgmtDef.h +++ b/src/mnode/inc/mgmtDef.h @@ -237,7 +237,6 @@ typedef struct { typedef struct { uint8_t msgType; - int8_t usePublicIp; int8_t received; int8_t successed; int8_t expected; diff --git a/src/mnode/inc/mgmtMnode.h b/src/mnode/inc/mgmtMnode.h index cebbc061f65533f21e5aa6cf8b0936bc668f5e40..cb1d009c8c46962903316fb21b8f1c51fd032f76 100644 --- a/src/mnode/inc/mgmtMnode.h +++ b/src/mnode/inc/mgmtMnode.h @@ -33,16 +33,19 @@ void mgmtCleanupMnodes(); int32_t mgmtAddMnode(int32_t dnodeId); int32_t mgmtDropMnode(int32_t dnodeId); +void mgmtDropMnodeLocal(int32_t dnodeId); void * mgmtGetMnode(int32_t mnodeId); int32_t mgmtGetMnodesNum(); void * mgmtGetNextMnode(void *pNode, struct SMnodeObj **pMnode); -void mgmtReleaseMnode(struct SMnodeObj *pMnode); +void mgmtIncMnodeRef(struct SMnodeObj *pMnode); +void mgmtDecMnodeRef(struct SMnodeObj *pMnode); char * mgmtGetMnodeRoleStr(); void mgmtGetMnodeIpSet(SRpcIpSet *ipSet); void mgmtGetMnodeInfos(void *mnodes); + #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtProfile.h b/src/mnode/inc/mgmtProfile.h index 07ed3f0f13b66595ca2bf7f7d48d652e051d150d..f33ff9c3facf8e89b825ca984f66ea0c17b60c75 100644 --- a/src/mnode/inc/mgmtProfile.h +++ b/src/mnode/inc/mgmtProfile.h @@ -24,14 +24,6 @@ extern "C" { int32_t mgmtInitProfile(); void mgmtCleanUpProfile(); -bool mgmtCheckQhandle(uint64_t qhandle); -void mgmtSaveQhandle(void *qhandle); -void mgmtFreeQhandle(void *qhandle); - -void * mgmtMallocQueuedMsg(SRpcMsg *rpcMsg); -void * mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg); -void mgmtFreeQueuedMsg(SQueuedMsg *pMsg); - #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtSdb.h b/src/mnode/inc/mgmtSdb.h index c09d215adb8d29ef24ccd3046c8acd47e977721d..2b96eb4005aa3670b3b40a00d5a0f357457d3d0e 100644 --- a/src/mnode/inc/mgmtSdb.h +++ b/src/mnode/inc/mgmtSdb.h @@ -72,6 +72,7 @@ void sdbCleanUp(); void * sdbOpenTable(SSdbTableDesc *desc); void sdbCloseTable(void *handle); bool sdbIsMaster(); +bool sdbIsServing(); void sdbUpdateMnodeRoles(); int32_t sdbInsertRow(SSdbOper *pOper); diff --git a/src/mnode/inc/mgmtShell.h b/src/mnode/inc/mgmtShell.h index 3941a0a87db5f8bb9f54ed981e1193d6e7a72206..c3ae3e96e885fd55e6517c59d7293d341eaaba9a 100644 --- a/src/mnode/inc/mgmtShell.h +++ b/src/mnode/inc/mgmtShell.h @@ -34,6 +34,14 @@ void mgmtAddToShellQueue(SQueuedMsg *queuedMsg); void mgmtDealyedAddToShellQueue(SQueuedMsg *queuedMsg); void mgmtSendSimpleResp(void *thandle, int32_t code); +bool mgmtCheckQhandle(uint64_t qhandle); +void *mgmtSaveQhandle(void *qhandle, int32_t size); +void mgmtFreeQhandle(void *qhandle, bool forceRemove); + +void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg); +void *mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg); +void mgmtFreeQueuedMsg(SQueuedMsg *pMsg); + #ifdef __cplusplus } #endif diff --git a/src/mnode/inc/mgmtTable.h b/src/mnode/inc/mgmtTable.h index 03d31d8e4bdf0ddf30b4c00140a32dbccbed2b91..9c4aa4a2a550bf0990cb5015716e6e91d9de4ea4 100644 --- a/src/mnode/inc/mgmtTable.h +++ b/src/mnode/inc/mgmtTable.h @@ -22,13 +22,15 @@ extern "C" { #include "mgmtDef.h" -int32_t mgmtInitTables(); -void mgmtCleanUpTables(); -STableObj* mgmtGetTable(char* tableId); -void mgmtIncTableRef(void *pTable); -void mgmtDecTableRef(void *pTable); -void mgmtDropAllChildTables(SDbObj *pDropDb); -void mgmtDropAllSuperTables(SDbObj *pDropDb); +int32_t mgmtInitTables(); +void mgmtCleanUpTables(); +void * mgmtGetTable(char *tableId); +void mgmtIncTableRef(void *pTable); +void mgmtDecTableRef(void *pTable); +void * mgmtGetNextChildTable(void *pNode, SChildTableObj **pTable); +void * mgmtGetNextSuperTable(void *pNode, SSuperTableObj **pTable); +void mgmtDropAllChildTables(SDbObj *pDropDb); +void mgmtDropAllSuperTables(SDbObj *pDropDb); #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtUser.h b/src/mnode/inc/mgmtUser.h index d0fd03de779e2e4e50fb31bd6633fe0c4824f9ac..0a21b1f7044db6349466fff8d5cc5a1bf7a5b80a 100644 --- a/src/mnode/inc/mgmtUser.h +++ b/src/mnode/inc/mgmtUser.h @@ -27,7 +27,7 @@ SUserObj *mgmtGetUser(char *name); void * mgmtGetNextUser(void *pNode, SUserObj **pUser); void mgmtIncUserRef(SUserObj *pUser); void mgmtDecUserRef(SUserObj *pUser); -SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp); +SUserObj *mgmtGetUserFromConn(void *pConn); int32_t mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass); void mgmtDropAllUsers(SAcctObj *pAcct); diff --git a/src/mnode/inc/mgmtVgroup.h b/src/mnode/inc/mgmtVgroup.h index 3f8927fbd05c215a863e2b14c083bffbb9549bcd..3f8dc35a00eb27f37714b3895fe28db6abf4fd99 100644 --- a/src/mnode/inc/mgmtVgroup.h +++ b/src/mnode/inc/mgmtVgroup.h @@ -32,7 +32,8 @@ void mgmtCleanUpVgroups(); SVgObj *mgmtGetVgroup(int32_t vgId); void mgmtIncVgroupRef(SVgObj *pVgroup); void mgmtDecVgroupRef(SVgObj *pVgroup); -void mgmtDropAllVgroups(SDbObj *pDropDb); +void mgmtDropAllDbVgroups(SDbObj *pDropDb); +void mgmtDropAllDnodeVgroups(SDnodeObj *pDropDnode); void * mgmtGetNextVgroup(void *pNode, SVgObj **pVgroup); void mgmtUpdateVgroup(SVgObj *pVgroup); diff --git a/src/mnode/src/mgmtAcct.c b/src/mnode/src/mgmtAcct.c index f9e2c8b105add14976f85b097038f8fce865c46b..9b7815af120cff534137328208502e215414c482 100644 --- a/src/mnode/src/mgmtAcct.c +++ b/src/mnode/src/mgmtAcct.c @@ -27,8 +27,8 @@ #include "mgmtUser.h" void * tsAcctSdb = NULL; -int32_t tsAcctUpdateSize; -static void mgmtCreateRootAcct(); +static int32_t tsAcctUpdateSize; +static void mgmtCreateRootAcct(); static int32_t mgmtActionAcctDestroy(SSdbOper *pOper) { SAcctObj *pAcct = pOper->pObj; diff --git a/src/mnode/src/mgmtBalance.c b/src/mnode/src/mgmtBalance.c index c6c10e0da00e426b9123b31040d8450e59d0d9bc..17d4a4114b6404670c320e2a3d1533754bdfa299 100644 --- a/src/mnode/src/mgmtBalance.c +++ b/src/mnode/src/mgmtBalance.c @@ -35,7 +35,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) { void * pNode = NULL; SDnodeObj *pDnode = NULL; SDnodeObj *pSelDnode = NULL; - float vnodeUsage = 1.0; + float vnodeUsage = 1000.0; while (1) { pNode = mgmtGetNextDnode(pNode, &pDnode); diff --git a/src/mnode/src/mgmtDServer.c b/src/mnode/src/mgmtDServer.c index 9fd928e7da3d1a138ccc138acc3e9e2357213bd8..726554e49028a2dd4e6a0a15afd5a21b7bedcab1 100644 --- a/src/mnode/src/mgmtDServer.c +++ b/src/mnode/src/mgmtDServer.c @@ -107,6 +107,7 @@ static void mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg) { SRpcIpSet ipSet = {0}; dnodeGetMnodeDnodeIpSet(&ipSet); + mTrace("conn from dnode ip:%s user:%s redirect msg, inUse:%d", taosIpStr(connInfo.clientIp), connInfo.user, ipSet.inUse); for (int32_t i = 0; i < ipSet.numOfIps; ++i) { mTrace("index:%d %s:%d", i, ipSet.fqdn[i], ipSet.port[i]); diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c index a78fba22085afc671aab224a7d7e8afaa9b26ecf..3e7577af0696ef591217224d3e08403f16fd5097 100644 --- a/src/mnode/src/mgmtDb.c +++ b/src/mnode/src/mgmtDb.c @@ -36,7 +36,7 @@ #include "mgmtUser.h" #include "mgmtVgroup.h" -void * tsDbSdb = NULL; +static void * tsDbSdb = NULL; static int32_t tsDbUpdateSize; static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate); @@ -82,7 +82,7 @@ static int32_t mgmtDbActionDelete(SSdbOper *pOper) { mgmtDropDbFromAcct(pAcct, pDb); mgmtDropAllChildTables(pDb); mgmtDropAllSuperTables(pDb); - mgmtDropAllVgroups(pDb); + mgmtDropAllDbVgroups(pDb); mgmtDecAcctRef(pAcct); return TSDB_CODE_SUCCESS; @@ -95,6 +95,7 @@ static int32_t mgmtDbActionUpdate(SSdbOper *pOper) { memcpy(pSaved, pDb, pOper->rowSize); free(pDb); } + mgmtDecDbRef(pSaved); return TSDB_CODE_SUCCESS; } @@ -154,6 +155,10 @@ int32_t mgmtInitDbs() { return 0; } +void *mgmtGetNextDb(void *pNode, SDbObj **pDb) { + return sdbFetchRow(tsDbSdb, pNode, (void **)pDb); +} + SDbObj *mgmtGetDb(char *db) { return (SDbObj *)sdbGetRow(tsDbSdb, db); } @@ -174,7 +179,7 @@ SDbObj *mgmtGetDbByTableId(char *tableId) { memset(db, 0, sizeof(db)); strncpy(db, tableId, pos - tableId); - return (SDbObj *)sdbGetRow(tsDbSdb, db); + return mgmtGetDb(db); } static int32_t mgmtCheckDbCfg(SDbCfg *pCfg) { @@ -346,8 +351,27 @@ bool mgmtCheckIsMonitorDB(char *db, char *monitordb) { return (strncasecmp(dbName, monitordb, len) == 0 && len == strlen(monitordb)); } +#if 0 +void mgmtPrintVgroups(SDbObj *pDb, char *oper) { + mPrint("db:%s, vgroup link from head, oper:%s", pDb->name, oper); + SVgObj *pVgroup = pDb->pHead; + while (pVgroup != NULL) { + mPrint("vgId:%d", pVgroup->vgId); + pVgroup = pVgroup->next; + } + + mPrint("db:%s, vgroup link from tail", pDb->name, pDb->numOfVgroups); + pVgroup = pDb->pTail; + while (pVgroup != NULL) { + mPrint("vgId:%d", pVgroup->vgId); + pVgroup = pVgroup->prev; + } +} +#endif + void mgmtAddVgroupIntoDb(SVgObj *pVgroup) { SDbObj *pDb = pVgroup->pDb; + pVgroup->next = pDb->pHead; pVgroup->prev = NULL; @@ -397,7 +421,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) int32_t cols = 0; SSchema *pSchema = pMeta->schema; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; pShow->bytes[cols] = TSDB_DB_NAME_LEN; @@ -545,11 +569,11 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void * SDbObj *pDb = NULL; char * pWrite; int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsDbSdb, pShow->pNode, (void **) &pDb); + pShow->pNode = mgmtGetNextDb(pShow->pNode, &pDb); if (pDb == NULL) break; cols = 0; @@ -674,8 +698,7 @@ static int32_t mgmtSetDbDropping(SDbObj *pDb) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsDbSdb, - .pObj = pDb, - .rowSize = tsDbUpdateSize + .pObj = pDb }; int32_t code = sdbUpdateRow(&oper); @@ -803,8 +826,7 @@ static int32_t mgmtAlterDb(SDbObj *pDb, SCMAlterDbMsg *pAlter) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsDbSdb, - .pObj = pDb, - .rowSize = tsDbUpdateSize + .pObj = pDb }; int32_t code = sdbUpdateRow(&oper); @@ -839,21 +861,21 @@ static void mgmtProcessAlterDbMsg(SQueuedMsg *pMsg) { return; } - SDbObj *pDb = pMsg->pDb = mgmtGetDb(pAlter->db); - if (pDb == NULL) { + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pAlter->db); + if (pMsg->pDb == NULL) { mError("db:%s, failed to alter, invalid db", pAlter->db); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_DB); return; } - int32_t code = mgmtAlterDb(pDb, pAlter); + int32_t code = mgmtAlterDb(pMsg->pDb, pAlter); if (code != TSDB_CODE_SUCCESS) { mError("db:%s, failed to alter, invalid db option", pAlter->db); mgmtSendSimpleResp(pMsg->thandle, code); return; } - mTrace("db:%s, all vgroups is altered", pDb->name); + mTrace("db:%s, all vgroups is altered", pMsg->pDb->name); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); } @@ -884,8 +906,8 @@ static void mgmtProcessDropDbMsg(SQueuedMsg *pMsg) { return; } - SDbObj *pDb = pMsg->pDb = mgmtGetDb(pDrop->db); - if (pDb == NULL) { + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pDrop->db); + if (pMsg->pDb == NULL) { if (pDrop->ignoreNotExists) { mTrace("db:%s, db is not exist, think drop success", pDrop->db); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); @@ -897,30 +919,32 @@ static void mgmtProcessDropDbMsg(SQueuedMsg *pMsg) { } } - if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) { + if (mgmtCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) { mError("db:%s, can't drop monitor database", pDrop->db); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_MONITOR_DB_FORBIDDEN); return; } - int32_t code = mgmtSetDbDropping(pDb); + int32_t code = mgmtSetDbDropping(pMsg->pDb); if (code != TSDB_CODE_SUCCESS) { mError("db:%s, failed to drop, reason:%s", pDrop->db, tstrerror(code)); mgmtSendSimpleResp(pMsg->thandle, code); return; } - SVgObj *pVgroup = pDb->pHead; +#if 0 + SVgObj *pVgroup = pMsg->pDb->pHead; if (pVgroup != NULL) { - mPrint("vgroup:%d, will be dropped", pVgroup->vgId); + mPrint("vgId:%d, will be dropped", pVgroup->vgId); SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); newMsg->ahandle = pVgroup; newMsg->expected = pVgroup->numOfVnodes; mgmtDropVgroup(pVgroup, newMsg); return; } +#endif - mTrace("db:%s, all vgroups is dropped", pDb->name); + mTrace("db:%s, all vgroups is dropped", pMsg->pDb->name); mgmtDropDb(pMsg); } @@ -932,7 +956,7 @@ void mgmtDropAllDbs(SAcctObj *pAcct) { mPrint("acct:%s, all dbs will be dropped from sdb", pAcct->user); while (1) { - pNode = sdbFetchRow(tsDbSdb, pNode, (void **)&pDb); + pNode = mgmtGetNextDb(pNode, &pDb); if (pDb == NULL) break; if (pDb->pAcct == pAcct) { diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c index 97360e49ea6c081106cae7cf1a2f31f692c353c1..c7643b9bf906988bc2668f8c393a38c117b866c7 100644 --- a/src/mnode/src/mgmtDnode.c +++ b/src/mnode/src/mgmtDnode.c @@ -36,9 +36,9 @@ #include "mgmtUser.h" #include "mgmtVgroup.h" -void *tsDnodeSdb = NULL; -int32_t tsDnodeUpdateSize = 0; int32_t tsAccessSquence = 0; +static void *tsDnodeSdb = NULL; +static int32_t tsDnodeUpdateSize = 0; extern void * tsMnodeSdb; extern void * tsVgroupSdb; @@ -73,39 +73,12 @@ static int32_t mgmtDnodeActionInsert(SSdbOper *pOper) { static int32_t mgmtDnodeActionDelete(SSdbOper *pOper) { SDnodeObj *pDnode = pOper->pObj; - void * pNode = NULL; - void * pLastNode = NULL; - SVgObj * pVgroup = NULL; - int32_t numOfVgroups = 0; - - while (1) { - pLastNode = pNode; - pNode = sdbFetchRow(tsVgroupSdb, pNode, (void **)&pVgroup); - if (pVgroup == NULL) break; - - if (pVgroup->vnodeGid[0].dnodeId == pDnode->dnodeId) { - SSdbOper oper = { - .type = SDB_OPER_LOCAL, - .table = tsVgroupSdb, - .pObj = pVgroup, - }; - sdbDeleteRow(&oper); - pNode = pLastNode; - numOfVgroups++; - continue; - } - } - - SMnodeObj *pMnode = mgmtGetMnode(pDnode->dnodeId); - if (pMnode != NULL) { - SSdbOper oper = {.type = SDB_OPER_LOCAL, .table = tsMnodeSdb, .pObj = pMnode}; - sdbDeleteRow(&oper); - mgmtReleaseMnode(pMnode); - } - + + mgmtDropAllDnodeVgroups(pDnode); + mgmtDropMnodeLocal(pDnode->dnodeId); balanceNotify(); - mTrace("dnode:%d, all vgroups:%d is dropped from sdb", pDnode->dnodeId, numOfVgroups); + mTrace("dnode:%d, all vgroups is dropped from sdb", pDnode->dnodeId); return TSDB_CODE_SUCCESS; } @@ -116,6 +89,7 @@ static int32_t mgmtDnodeActionUpdate(SSdbOper *pOper) { memcpy(pSaved, pDnode, pOper->rowSize); free(pDnode); } + mgmtDecDnodeRef(pSaved); return TSDB_CODE_SUCCESS; } @@ -212,7 +186,7 @@ void *mgmtGetDnodeByIp(char *ep) { void * pNode = NULL; while (1) { - pNode = sdbFetchRow(tsDnodeSdb, pNode, (void**)&pDnode); + pNode = mgmtGetNextDnode(pNode, &pDnode); if (pDnode == NULL) break; if (strcmp(ep, pDnode->dnodeEp) == 0) { return pDnode; @@ -235,8 +209,7 @@ void mgmtUpdateDnode(SDnodeObj *pDnode) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsDnodeSdb, - .pObj = pDnode, - .rowSize = tsDnodeUpdateSize + .pObj = pDnode }; sdbUpdateRow(&oper); @@ -336,7 +309,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { SVgObj *pVgroup = mgmtGetVgroup(pVload->vgId); if (pVgroup == NULL) { SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); - mPrint("dnode:%d, vgroup:%d not exist in mnode, drop it", pDnode->dnodeId, pVload->vgId); + mPrint("dnode:%d, vgId:%d not exist in mnode, drop it", pDnode->dnodeId, pVload->vgId); mgmtSendDropVnodeMsg(pVload->vgId, &ipSet, NULL); } else { mgmtUpdateVgroupStatus(pVgroup, pDnode, pVload); @@ -387,6 +360,7 @@ static int32_t mgmtCreateDnode(char *ep) { SDnodeObj *pDnode = mgmtGetDnodeByIp(ep); if (pDnode != NULL) { + mgmtDecDnodeRef(pDnode); mError("dnode:%d is alredy exist, %s:%d", pDnode->dnodeId, pDnode->dnodeFqdn, pDnode->dnodePort); return TSDB_CODE_DNODE_ALREADY_EXIST; } @@ -440,6 +414,7 @@ static int32_t mgmtDropDnodeByIp(char *ep) { return TSDB_CODE_DNODE_NOT_EXIST; } + mgmtDecDnodeRef(pDnode); if (strcmp(pDnode->dnodeEp, dnodeGetMnodeMasterEp()) == 0) { mError("dnode:%d, can't drop dnode:%s which is master", pDnode->dnodeId, ep); return TSDB_CODE_NO_REMOVE_MASTER; @@ -464,6 +439,7 @@ static void mgmtProcessCreateDnodeMsg(SQueuedMsg *pMsg) { if (rpcRsp.code == TSDB_CODE_SUCCESS) { SDnodeObj *pDnode = mgmtGetDnodeByIp(pCreate->ep); mLPrint("dnode:%d, %s is created by %s", pDnode->dnodeId, pCreate->ep, pMsg->pUser->user); + mgmtDecDnodeRef(pDnode); } else { mError("failed to create dnode:%s, reason:%s", pCreate->ep, tstrerror(rpcRsp.code)); } @@ -492,7 +468,7 @@ static void mgmtProcessDropDnodeMsg(SQueuedMsg *pMsg) { } static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->pAcct->user, "root") != 0) { @@ -609,7 +585,7 @@ static bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) { static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->user, "root") != 0) { @@ -719,7 +695,7 @@ static bool mgmtCheckConfigShow(SGlobalCfg *cfg) { static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->user, "root") != 0) { @@ -806,7 +782,7 @@ static int32_t mgmtRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, vo static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { int32_t cols = 0; - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->user, "root") != 0) { diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c index 437563a007cacca39b874741a65f7c93a7e95087..0f18c95539520e637849dc873299c3eec6fc110b 100644 --- a/src/mnode/src/mgmtMain.c +++ b/src/mnode/src/mgmtMain.c @@ -36,7 +36,7 @@ #include "mgmtTable.h" #include "mgmtShell.h" -void *tsMgmtTmr = NULL; +extern void *tsMgmtTmr; static bool tsMgmtIsRunning = false; int32_t mgmtStartSystem() { @@ -51,12 +51,6 @@ int32_t mgmtStartSystem() { mkdir(tsMnodeDir, 0755); } - tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND"); - if (tsMgmtTmr == NULL) { - mError("failed to init timer"); - return -1; - } - if (mgmtInitAccts() < 0) { mError("failed to init accts"); return -1; @@ -130,7 +124,7 @@ int32_t mgmtInitSystem() { struct stat dirstat; bool fileExist = (stat(tsMnodeDir, &dirstat) == 0); - bool asMaster = (strcmp(tsMaster, tsLocalEp) == 0); + bool asMaster = (strcmp(tsFirst, tsLocalEp) == 0); if (asMaster || fileExist) { if (mgmtStartSystem() != 0) { diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c index ccc01fc304c5d1c4d8ca4b2924c6442c85c45924..940fdca4d8bcf8e735a12c73ea9b534578ff697e 100644 --- a/src/mnode/src/mgmtMnode.c +++ b/src/mnode/src/mgmtMnode.c @@ -30,7 +30,7 @@ #include "mgmtShell.h" #include "mgmtUser.h" -void * tsMnodeSdb = NULL; +static void * tsMnodeSdb = NULL; static int32_t tsMnodeUpdateSize = 0; static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); @@ -71,7 +71,7 @@ static int32_t mgmtMnodeActionUpdate(SSdbOper *pOper) { memcpy(pSaved, pMnode, pOper->rowSize); free(pMnode); } - + mgmtDecMnodeRef(pSaved); return TSDB_CODE_SUCCESS; } @@ -97,7 +97,7 @@ static int32_t mgmtMnodeActionRestored() { mgmtGetNextMnode(NULL, &pMnode); if (pMnode != NULL) { pMnode->role = TAOS_SYNC_ROLE_MASTER; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } return TSDB_CODE_SUCCESS; @@ -148,7 +148,11 @@ void *mgmtGetMnode(int32_t mnodeId) { return sdbGetRow(tsMnodeSdb, &mnodeId); } -void mgmtReleaseMnode(SMnodeObj *pMnode) { +void mgmtIncMnodeRef(SMnodeObj *pMnode) { + sdbIncRef(tsMnodeSdb, pMnode); +} + +void mgmtDecMnodeRef(SMnodeObj *pMnode) { sdbDecRef(tsMnodeSdb, pMnode); } @@ -187,7 +191,7 @@ void mgmtGetMnodeIpSet(SRpcIpSet *ipSet) { ipSet->numOfIps++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } @@ -209,7 +213,7 @@ void mgmtGetMnodeInfos(void *param) { } index++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } mnodes->nodeNum = index; @@ -235,8 +239,17 @@ int32_t mgmtAddMnode(int32_t dnodeId) { return code; } +void mgmtDropMnodeLocal(int32_t dnodeId) { + SMnodeObj *pMnode = mgmtGetMnode(dnodeId); + if (pMnode != NULL) { + SSdbOper oper = {.type = SDB_OPER_LOCAL, .table = tsMnodeSdb, .pObj = pMnode}; + sdbDeleteRow(&oper); + mgmtDecMnodeRef(pMnode); + } +} + int32_t mgmtDropMnode(int32_t dnodeId) { - SMnodeObj *pMnode = sdbGetRow(tsMnodeSdb, &dnodeId); + SMnodeObj *pMnode = mgmtGetMnode(dnodeId); if (pMnode == NULL) { return TSDB_CODE_DNODE_NOT_EXIST; } @@ -258,7 +271,7 @@ int32_t mgmtDropMnode(int32_t dnodeId) { static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { sdbUpdateMnodeRoles(); - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) return 0; if (strcmp(pUser->pAcct->user, "root") != 0) { @@ -339,7 +352,7 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi numOfRows++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } pShow->numOfReads += numOfRows; diff --git a/src/mnode/src/mgmtProfile.c b/src/mnode/src/mgmtProfile.c index b52a43569a0c688ace233117530a7f896621fd93..77871f037bcd5e39993febc83082c728e3b773fc 100644 --- a/src/mnode/src/mgmtProfile.c +++ b/src/mnode/src/mgmtProfile.c @@ -561,17 +561,6 @@ int32_t mgmtKillConnection(char *qidstr, void *pConn) { return TSDB_CODE_INVALID_CONNECTION; } -bool mgmtCheckQhandle(uint64_t qhandle) { - return true; -} - -void mgmtSaveQhandle(void *qhandle) { - mTrace("qhandle:%p is allocated", qhandle); -} - -void mgmtFreeQhandle(void *qhandle) { - mTrace("qhandle:%p is freed", qhandle); -} int mgmtGetConns(SShowObj *pShow, void *pConn) { // SAcctObj * pAcct = pConn->pAcct; @@ -686,7 +675,7 @@ int32_t mgmtRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn void mgmtProcessKillQueryMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; - SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle); if (pUser == NULL) { rpcRsp.code = TSDB_CODE_INVALID_USER; rpcSendResponse(&rpcRsp); @@ -710,7 +699,7 @@ void mgmtProcessKillQueryMsg(SQueuedMsg *pMsg) { void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; - SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle); if (pUser == NULL) { rpcRsp.code = TSDB_CODE_INVALID_USER; rpcSendResponse(&rpcRsp); @@ -734,7 +723,7 @@ void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) { void mgmtProcessKillConnectionMsg(SQueuedMsg *pMsg) { SRpcMsg rpcRsp = {.handle = pMsg->thandle, .pCont = NULL, .contLen = 0, .code = 0, .msgType = 0}; - SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pMsg->thandle); if (pUser == NULL) { rpcRsp.code = TSDB_CODE_INVALID_USER; rpcSendResponse(&rpcRsp); @@ -771,52 +760,3 @@ int32_t mgmtInitProfile() { void mgmtCleanUpProfile() { } - -void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg) { - bool usePublicIp = false; - SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle, &usePublicIp); - if (pUser == NULL) { - return NULL; - } - - SQueuedMsg *pMsg = calloc(1, sizeof(SQueuedMsg)); - pMsg->thandle = rpcMsg->handle; - pMsg->msgType = rpcMsg->msgType; - pMsg->contLen = rpcMsg->contLen; - pMsg->pCont = rpcMsg->pCont; - pMsg->pUser = pUser; - pMsg->usePublicIp = usePublicIp; - - return pMsg; -} - -void mgmtFreeQueuedMsg(SQueuedMsg *pMsg) { - if (pMsg != NULL) { - rpcFreeCont(pMsg->pCont); - if (pMsg->pUser) mgmtDecUserRef(pMsg->pUser); - if (pMsg->pDb) mgmtDecDbRef(pMsg->pDb); - if (pMsg->pVgroup) mgmtDecVgroupRef(pMsg->pVgroup); - if (pMsg->pTable) mgmtDecTableRef(pMsg->pTable); - if (pMsg->pAcct) mgmtDecAcctRef(pMsg->pAcct); - if (pMsg->pDnode) mgmtDecDnodeRef(pMsg->pDnode); - free(pMsg); - } -} - -void* mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg) { - SQueuedMsg *pDestMsg = calloc(1, sizeof(SQueuedMsg)); - - pDestMsg->thandle = pSrcMsg->thandle; - pDestMsg->msgType = pSrcMsg->msgType; - pDestMsg->pCont = pSrcMsg->pCont; - pDestMsg->contLen = pSrcMsg->contLen; - pDestMsg->retry = pSrcMsg->retry; - pDestMsg->maxRetry= pSrcMsg->maxRetry; - pDestMsg->pUser = pSrcMsg->pUser; - pDestMsg->usePublicIp = pSrcMsg->usePublicIp; - - pSrcMsg->pCont = NULL; - pSrcMsg->pUser = NULL; - - return pDestMsg; -} \ No newline at end of file diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c index 25e36af6a0e5b84e94f4c0b1c6c579fbdaad4f5b..53b9d2b814630bba44185d8f7b01e6a29a24b306 100644 --- a/src/mnode/src/mgmtSdb.c +++ b/src/mnode/src/mgmtSdb.c @@ -40,7 +40,7 @@ typedef enum { typedef enum { SDB_STATUS_OFFLINE, SDB_STATUS_SERVING, - SDB_ACTION_CLOSING + SDB_STATUS_CLOSING } ESdbStatus; typedef struct _SSdbTable { @@ -107,6 +107,10 @@ bool sdbIsMaster() { return tsSdbObj.role == TAOS_SYNC_ROLE_MASTER; } +bool sdbIsServing() { + return tsSdbObj.status == SDB_STATUS_SERVING; +} + static char *sdbGetActionStr(int32_t action) { switch (action) { case SDB_ACTION_INSERT: @@ -180,7 +184,7 @@ void sdbUpdateMnodeRoles() { if (pMnode != NULL) { pMnode->role = roles.role[i]; sdbPrint("mnode:%d, role:%s", pMnode->mnodeId, mgmtGetMnodeRoleStr(pMnode->role)); - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } } @@ -248,18 +252,12 @@ void sdbUpdateSync() { strcpy(syncCfg.nodeInfo[index].nodeFqdn, pMnode->pDnode->dnodeEp); index++; - mgmtReleaseMnode(pMnode); + mgmtDecMnodeRef(pMnode); } } syncCfg.replica = index; - syncCfg.arbitratorPort = syncCfg.nodeInfo[0].nodePort; - strcpy(syncCfg.arbitratorFqdn, syncCfg.nodeInfo[0].nodeFqdn); - if (syncCfg.replica == 1) { - syncCfg.quorum = 1; - } else { - syncCfg.quorum = 2; - } + syncCfg.quorum = (syncCfg.replica == 1) ? 1:2; bool hasThisDnode = false; for (int32_t i = 0; i < syncCfg.replica; ++i) { @@ -272,9 +270,9 @@ void sdbUpdateSync() { if (!hasThisDnode) return; if (memcmp(&syncCfg, &tsSdbObj.cfg, sizeof(SSyncCfg)) == 0) return; - sdbPrint("work as mnode, replica:%d arbitrator:%s", syncCfg.replica, syncCfg.arbitratorFqdn); + sdbPrint("work as mnode, replica:%d", syncCfg.replica); for (int32_t i = 0; i < syncCfg.replica; ++i) { - sdbPrint("mnode:%d, ip:%s", syncCfg.nodeInfo[i].nodeId, syncCfg.nodeInfo[i].nodeFqdn); + sdbPrint("mnode:%d, %s:%d", syncCfg.nodeInfo[i].nodeId, syncCfg.nodeInfo[i].nodeFqdn, syncCfg.nodeInfo[i].nodePort); } SSyncInfo syncInfo; @@ -320,6 +318,7 @@ int32_t sdbInit() { void sdbCleanUp() { if (tsSdbObj.status != SDB_STATUS_SERVING) return; + tsSdbObj.status = SDB_STATUS_CLOSING; syncStop(tsSdbObj.sync); free(tsSdbObj.sync); walClose(tsSdbObj.wal); @@ -333,7 +332,7 @@ void sdbIncRef(void *handle, void *pRow) { SSdbTable *pTable = handle; int32_t * pRefCount = (int32_t *)(pRow + pTable->refCountPos); atomic_add_fetch_32(pRefCount, 1); - if (0 && strcmp(pTable->tableName, "accounts") == 0) { + if (0 && pTable->tableId == SDB_TABLE_CTABLE) { sdbTrace("table:%s, add ref to record:%s:%s:%d", pTable->tableName, pTable->tableName, sdbGetkeyStr(pTable, pRow), *pRefCount); } @@ -345,7 +344,7 @@ void sdbDecRef(void *handle, void *pRow) { SSdbTable *pTable = handle; int32_t * pRefCount = (int32_t *)(pRow + pTable->refCountPos); int32_t refCount = atomic_sub_fetch_32(pRefCount, 1); - if (0 && strcmp(pTable->tableName, "accounts") == 0) { + if (0 && pTable->tableId == SDB_TABLE_CTABLE) { sdbTrace("table:%s, def ref of record:%s:%s:%d", pTable->tableName, pTable->tableName, sdbGetkeyStr(pTable, pRow), *pRefCount); } diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c index 48066ea8a5aaf33ba58a2741502a48d4e3a60a1b..193521b0260c42213f3d07578fa129a33c206f65 100644 --- a/src/mnode/src/mgmtShell.c +++ b/src/mnode/src/mgmtShell.c @@ -23,6 +23,7 @@ #include "ttimer.h" #include "tgrant.h" #include "tglobal.h" +#include "tcache.h" #include "dnode.h" #include "mgmtDef.h" #include "mgmtLog.h" @@ -50,10 +51,11 @@ static void mgmtProcessHeartBeatMsg(SQueuedMsg *queuedMsg); static void mgmtProcessConnectMsg(SQueuedMsg *queuedMsg); static void mgmtProcessUseMsg(SQueuedMsg *queuedMsg); -extern void *tsMgmtTmr; +void *tsMgmtTmr; static void *tsMgmtShellRpc = NULL; static void *tsMgmtTranQhandle = NULL; static void (*tsMgmtProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SQueuedMsg *) = {0}; +static void *tsQhandleCache = NULL; static SShowMetaFp tsMgmtShowMetaFp[TSDB_MGMT_TABLE_MAX] = {0}; static SShowRetrieveFp tsMgmtShowRetrieveFp[TSDB_MGMT_TABLE_MAX] = {0}; @@ -64,7 +66,9 @@ int32_t mgmtInitShell() { mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_CONNECT, mgmtProcessConnectMsg); mgmtAddShellMsgHandle(TSDB_MSG_TYPE_CM_USE_DB, mgmtProcessUseMsg); + tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND"); tsMgmtTranQhandle = taosInitScheduler(tsMaxShellConns, 1, "mnodeT"); + tsQhandleCache = taosCacheInit(tsMgmtTmr, 2); int32_t numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore / 4.0; if (numOfThreads < 1) { @@ -102,6 +106,12 @@ void mgmtCleanUpShell() { tsMgmtShellRpc = NULL; mPrint("server connection to shell is closed"); } + + if (tsQhandleCache) { + taosCacheEmpty(tsQhandleCache); + taosCacheCleanup(tsQhandleCache); + tsQhandleCache = NULL; + } } void mgmtAddShellMsgHandle(uint8_t showType, void (*fp)(SQueuedMsg *queuedMsg)) { @@ -233,14 +243,15 @@ static void mgmtProcessShowMsg(SQueuedMsg *pMsg) { return; } - SShowObj *pShow = (SShowObj *) calloc(1, sizeof(SShowObj) + htons(pShowMsg->payloadLen)); + int32_t showObjSize = sizeof(SShowObj) + htons(pShowMsg->payloadLen); + SShowObj *pShow = (SShowObj *) calloc(1, showObjSize); pShow->signature = pShow; pShow->type = pShowMsg->type; pShow->payloadLen = htons(pShowMsg->payloadLen); strcpy(pShow->db, pShowMsg->db); memcpy(pShow->payload, pShowMsg->payload, pShow->payloadLen); - mgmtSaveQhandle(pShow); + pShow = mgmtSaveQhandle(pShow, showObjSize); pShowRsp->qhandle = htobe64((uint64_t) pShow); mTrace("show:%p, type:%s, start to get meta", pShow, mgmtGetShowTypeStr(pShowMsg->type)); @@ -255,10 +266,10 @@ static void mgmtProcessShowMsg(SQueuedMsg *pMsg) { rpcSendResponse(&rpcRsp); } else { mError("show:%p, type:%s, failed to get meta, reason:%s", pShow, mgmtGetShowTypeStr(pShowMsg->type), tstrerror(code)); - mgmtFreeQhandle(pShow); + mgmtFreeQhandle(pShow, false); SRpcMsg rpcRsp = { - .handle = pMsg->thandle, - .code = code + .handle = pMsg->thandle, + .code = code }; rpcSendResponse(&rpcRsp); } @@ -284,25 +295,19 @@ static void mgmtProcessRetrieveMsg(SQueuedMsg *pMsg) { SShowObj *pShow = (SShowObj *)pRetrieve->qhandle; mTrace("show:%p, type:%s, retrieve data", pShow, mgmtGetShowTypeStr(pShow->type)); - if (!mgmtCheckQhandle(pRetrieve->qhandle)) { - mError("pShow:%p, query memory is corrupted", pShow); - mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_MEMORY_CORRUPTED); - return; - } else { - if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) { - rowsToRead = pShow->numOfRows - pShow->numOfReads; - } + if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) { + rowsToRead = pShow->numOfRows - pShow->numOfReads; + } - /* return no more than 100 meters in one round trip */ - if (rowsToRead > 100) rowsToRead = 100; + /* return no more than 100 meters in one round trip */ + if (rowsToRead > 100) rowsToRead = 100; - /* - * the actual number of table may be larger than the value of pShow->numOfRows, if a query is - * issued during a continuous create table operation. Therefore, rowToRead may be less than 0. - */ - if (rowsToRead < 0) rowsToRead = 0; - size = pShow->rowSize * rowsToRead; - } + /* + * the actual number of table may be larger than the value of pShow->numOfRows, if a query is + * issued during a continuous create table operation. Therefore, rowToRead may be less than 0. + */ + if (rowsToRead < 0) rowsToRead = 0; + size = pShow->rowSize * rowsToRead; size += 100; SRetrieveTableRsp *pRsp = rpcMallocCont(size); @@ -313,6 +318,7 @@ static void mgmtProcessRetrieveMsg(SQueuedMsg *pMsg) { if (rowsRead < 0) { // TSDB_CODE_ACTION_IN_PROGRESS; rpcFreeCont(pRsp); + mgmtFreeQhandle(pShow, false); return; } @@ -329,7 +335,9 @@ static void mgmtProcessRetrieveMsg(SQueuedMsg *pMsg) { rpcSendResponse(&rpcRsp); if (rowsToRead == 0) { - mgmtFreeQhandle(pShow); + mgmtFreeQhandle(pShow, true); + } else { + mgmtFreeQhandle(pShow, false); } } @@ -413,6 +421,7 @@ static void mgmtProcessConnectMsg(SQueuedMsg *pMsg) { code = TSDB_CODE_INVALID_DB; goto connect_over; } + mgmtDecDbRef(pDb); } SCMConnectRsp *pConnectRsp = rpcMallocCont(sizeof(SCMConnectRsp)); @@ -446,9 +455,8 @@ static void mgmtProcessUseMsg(SQueuedMsg *pMsg) { SCMUseDbMsg *pUseDbMsg = pMsg->pCont; // todo check for priority of current user - pMsg->pDb = mgmtGetDb(pUseDbMsg->db); - int32_t code = TSDB_CODE_SUCCESS; + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pUseDbMsg->db); if (pMsg->pDb == NULL) { code = TSDB_CODE_INVALID_DB; } @@ -462,7 +470,7 @@ static void mgmtProcessUseMsg(SQueuedMsg *pMsg) { */ static bool mgmtCheckTableMetaMsgReadOnly(SQueuedMsg *pMsg) { SCMTableInfoMsg *pInfo = pMsg->pCont; - pMsg->pTable = mgmtGetTable(pInfo->tableId); + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pInfo->tableId); if (pMsg->pTable != NULL) return true; // If table does not exists and autoCreate flag is set, we add the handler into task queue @@ -511,3 +519,79 @@ void mgmtSendSimpleResp(void *thandle, int32_t code) { }; rpcSendResponse(&rpcRsp); } + +bool mgmtCheckQhandle(uint64_t qhandle) { + void *pSaved = taosCacheAcquireByData(tsQhandleCache, (void *)qhandle); + if (pSaved == (void *)qhandle) { + mTrace("qhandle:%p is retrived", qhandle); + return true; + } else { + mTrace("qhandle:%p is already freed", qhandle); + return false; + } +} + +void* mgmtSaveQhandle(void *qhandle, int32_t size) { + if (tsQhandleCache != NULL) { + char key[24]; + sprintf(key, "show:%p", qhandle); + void *newQhandle = taosCachePut(tsQhandleCache, key, qhandle, size, 60); + free(qhandle); + + mTrace("qhandle:%p is saved", newQhandle); + return newQhandle; + } + + return NULL; +} + +void mgmtFreeQhandle(void *qhandle, bool forceRemove) { + mTrace("qhandle:%p is freed", qhandle); + taosCacheRelease(tsQhandleCache, &qhandle, forceRemove); +} + +void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg) { + SUserObj *pUser = mgmtGetUserFromConn(rpcMsg->handle); + if (pUser == NULL) { + return NULL; + } + + SQueuedMsg *pMsg = calloc(1, sizeof(SQueuedMsg)); + pMsg->thandle = rpcMsg->handle; + pMsg->msgType = rpcMsg->msgType; + pMsg->contLen = rpcMsg->contLen; + pMsg->pCont = rpcMsg->pCont; + pMsg->pUser = pUser; + + return pMsg; +} + +void mgmtFreeQueuedMsg(SQueuedMsg *pMsg) { + if (pMsg != NULL) { + rpcFreeCont(pMsg->pCont); + if (pMsg->pUser) mgmtDecUserRef(pMsg->pUser); + if (pMsg->pDb) mgmtDecDbRef(pMsg->pDb); + if (pMsg->pVgroup) mgmtDecVgroupRef(pMsg->pVgroup); + if (pMsg->pTable) mgmtDecTableRef(pMsg->pTable); + if (pMsg->pAcct) mgmtDecAcctRef(pMsg->pAcct); + if (pMsg->pDnode) mgmtDecDnodeRef(pMsg->pDnode); + free(pMsg); + } +} + +void* mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg) { + SQueuedMsg *pDestMsg = calloc(1, sizeof(SQueuedMsg)); + + pDestMsg->thandle = pSrcMsg->thandle; + pDestMsg->msgType = pSrcMsg->msgType; + pDestMsg->pCont = pSrcMsg->pCont; + pDestMsg->contLen = pSrcMsg->contLen; + pDestMsg->retry = pSrcMsg->retry; + pDestMsg->maxRetry= pSrcMsg->maxRetry; + pDestMsg->pUser = pSrcMsg->pUser; + + pSrcMsg->pCont = NULL; + pSrcMsg->pUser = NULL; + + return pDestMsg; +} \ No newline at end of file diff --git a/src/mnode/src/mgmtTable.c b/src/mnode/src/mgmtTable.c index 99a6860d99e280791d4ef96b3412bb6eb7a9a34c..ff65ba4e54d1d3082db4b36cc9e91a11ea8fbdad 100644 --- a/src/mnode/src/mgmtTable.c +++ b/src/mnode/src/mgmtTable.c @@ -41,8 +41,8 @@ #include "mgmtVgroup.h" #include "tcompare.h" -void * tsChildTableSdb; -void * tsSuperTableSdb; +static void * tsChildTableSdb; +static void * tsSuperTableSdb; static int32_t tsChildTableUpdateSize; static int32_t tsSuperTableUpdateSize; static void * mgmtGetChildTable(char *tableId); @@ -97,14 +97,14 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) { SVgObj *pVgroup = mgmtGetVgroup(pTable->vgId); if (pVgroup == NULL) { - mError("ctable:%s, not in vgroup:%d", pTable->info.tableId, pTable->vgId); + mError("ctable:%s, not in vgId:%d", pTable->info.tableId, pTable->vgId); return TSDB_CODE_INVALID_VGROUP_ID; } mgmtDecVgroupRef(pVgroup); SDbObj *pDb = mgmtGetDb(pVgroup->dbName); if (pDb == NULL) { - mError("ctable:%s, vgroup:%d not in db:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); + mError("ctable:%s, vgId:%d not in db:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); return TSDB_CODE_INVALID_DB; } mgmtDecDbRef(pDb); @@ -117,6 +117,7 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) { mgmtDecAcctRef(pAcct); if (pTable->info.type == TSDB_CHILD_TABLE) { + // add ref pTable->superTable = mgmtGetSuperTable(pTable->superTableId); mgmtAddTableIntoStable(pTable->superTable, pTable); grantAdd(TSDB_GRANT_TIMESERIES, pTable->superTable->numOfColumns - 1); @@ -146,7 +147,7 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) { SDbObj *pDb = mgmtGetDb(pVgroup->dbName); if (pDb == NULL) { - mError("ctable:%s, vgroup:%d not in DB:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); + mError("ctable:%s, vgId:%d not in DB:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName); return TSDB_CODE_INVALID_DB; } mgmtDecDbRef(pDb); @@ -186,6 +187,7 @@ static int32_t mgmtChildTableActionUpdate(SSdbOper *pOper) { free(oldSql); free(oldSchema); } + mgmtDecTableRef(pTable); return TSDB_CODE_SUCCESS; } @@ -250,7 +252,7 @@ static int32_t mgmtChildTableActionRestored() { while (1) { pLastNode = pNode; mgmtDecTableRef(pTable); - pNode = sdbFetchRow(tsChildTableSdb, pNode, (void **)&pTable); + pNode = mgmtGetNextChildTable(pNode, &pTable); if (pTable == NULL) break; SDbObj *pDb = mgmtGetDbByTableId(pTable->info.tableId); @@ -268,7 +270,7 @@ static int32_t mgmtChildTableActionRestored() { SVgObj *pVgroup = mgmtGetVgroup(pTable->vgId); if (pVgroup == NULL) { - mError("ctable:%s, failed to get vgroup:%d sid:%d, discard it", pTable->info.tableId, pTable->vgId, pTable->sid); + mError("ctable:%s, failed to get vgId:%d sid:%d, discard it", pTable->info.tableId, pTable->vgId, pTable->sid); pTable->vgId = 0; SSdbOper desc = {0}; desc.type = SDB_OPER_LOCAL; @@ -281,7 +283,7 @@ static int32_t mgmtChildTableActionRestored() { mgmtDecVgroupRef(pVgroup); if (strcmp(pVgroup->dbName, pDb->name) != 0) { - mError("ctable:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it", + mError("ctable:%s, db:%s not match with vgId:%d db:%s sid:%d, discard it", pTable->info.tableId, pDb->name, pTable->vgId, pVgroup->dbName, pTable->sid); pTable->vgId = 0; SSdbOper desc = {0}; @@ -294,7 +296,7 @@ static int32_t mgmtChildTableActionRestored() { } if (pVgroup->tableList == NULL) { - mError("ctable:%s, vgroup:%d tableList is null", pTable->info.tableId, pTable->vgId); + mError("ctable:%s, vgId:%d tableList is null", pTable->info.tableId, pTable->vgId); pTable->vgId = 0; SSdbOper desc = {0}; desc.type = SDB_OPER_LOCAL; @@ -361,7 +363,7 @@ static void mgmtCleanUpChildTables() { static void mgmtAddTableIntoStable(SSuperTableObj *pStable, SChildTableObj *pCtable) { if (pStable->vgLen == 0) { - pStable->vgLen = 10; + pStable->vgLen = 8; pStable->vgList = calloc(pStable->vgLen, sizeof(int32_t)); } @@ -431,11 +433,11 @@ static int32_t mgmtSuperTableActionUpdate(SSdbOper *pOper) { void *oldSchema = pTable->schema; memcpy(pTable, pNew, pOper->rowSize); pTable->schema = pNew->schema; - free(pNew); free(pNew->vgList); + free(pNew); free(oldSchema); } - + mgmtDecTableRef(pTable); return TSDB_CODE_SUCCESS; } @@ -558,20 +560,28 @@ static void *mgmtGetSuperTable(char *tableId) { return sdbGetRow(tsSuperTableSdb, tableId); } -STableObj *mgmtGetTable(char *tableId) { - STableObj *tableInfo = sdbGetRow(tsSuperTableSdb, tableId); - if (tableInfo != NULL) { - return tableInfo; +void *mgmtGetTable(char *tableId) { + void *pTable = mgmtGetSuperTable(tableId); + if (pTable != NULL) { + return pTable; } - tableInfo = sdbGetRow(tsChildTableSdb, tableId); - if (tableInfo != NULL) { - return tableInfo; + pTable = mgmtGetChildTable(tableId); + if (pTable != NULL) { + return pTable; } return NULL; } +void *mgmtGetNextChildTable(void *pNode, SChildTableObj **pTable) { + return sdbFetchRow(tsChildTableSdb, pNode, (void **)pTable); +} + +void *mgmtGetNextSuperTable(void *pNode, SSuperTableObj **pTable) { + return sdbFetchRow(tsSuperTableSdb, pNode, (void **)pTable); +} + void mgmtIncTableRef(void *p1) { STableObj *pTable = (STableObj *)p1; if (pTable->type == TSDB_SUPER_TABLE) { @@ -613,11 +623,18 @@ static void mgmtExtractTableName(char* tableId, char* name) { static void mgmtProcessCreateTableMsg(SQueuedMsg *pMsg) { SCMCreateTableMsg *pCreate = pMsg->pCont; + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pCreate->db); + if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { + mError("table:%s, failed to create, db not selected", pCreate->tableId); + mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); + return; + } + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pCreate->tableId); if (pMsg->pTable != NULL && pMsg->retry == 0) { if (pCreate->getMeta) { mTrace("table:%s, continue to get meta", pCreate->tableId); - mgmtProcessTableMetaMsg(pMsg); + mgmtGetChildTableMeta(pMsg); } else if (pCreate->igExists) { mTrace("table:%s, is already exist", pCreate->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); @@ -628,13 +645,6 @@ static void mgmtProcessCreateTableMsg(SQueuedMsg *pMsg) { return; } - if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDb(pCreate->db); - if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { - mError("table:%s, failed to create, db not selected", pCreate->tableId); - mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); - return; - } - if (pCreate->numOfTags != 0) { mTrace("table:%s, create msg is received from thandle:%p", pCreate->tableId, pMsg->thandle); mgmtProcessCreateSuperTableMsg(pMsg); @@ -646,7 +656,7 @@ static void mgmtProcessCreateTableMsg(SQueuedMsg *pMsg) { static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) { SCMDropTableMsg *pDrop = pMsg->pCont; - pMsg->pDb = mgmtGetDbByTableId(pDrop->tableId); + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(pDrop->tableId); if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { mError("table:%s, failed to drop table, db not selected", pDrop->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); @@ -659,8 +669,8 @@ static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) { return; } - pMsg->pTable = mgmtGetTable(pDrop->tableId); - if (pMsg->pTable == NULL) { + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pDrop->tableId); + if (pMsg->pTable == NULL) { if (pDrop->igNotExists) { mTrace("table:%s, table is not exist, think drop success", pDrop->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_SUCCESS); @@ -683,7 +693,8 @@ static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) { static void mgmtProcessTableMetaMsg(SQueuedMsg *pMsg) { SCMTableInfoMsg *pInfo = pMsg->pCont; - mTrace("table:%s, table meta msg is received from thandle:%p", pInfo->tableId, pMsg->thandle); + pInfo->createFlag = htons(pInfo->createFlag); + mTrace("table:%s, table meta msg is received from thandle:%p, createFlag:%d", pInfo->tableId, pMsg->thandle, pInfo->createFlag); if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(pInfo->tableId); if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { @@ -694,7 +705,7 @@ static void mgmtProcessTableMetaMsg(SQueuedMsg *pMsg) { if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pInfo->tableId); if (pMsg->pTable == NULL) { - if (htons(pInfo->createFlag) != 1) { + if (!pInfo->createFlag) { mError("table:%s, failed to get table meta, table not exist", pInfo->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_TABLE); } else { @@ -786,8 +797,6 @@ static void mgmtProcessDropSuperTableMsg(SQueuedMsg *pMsg) { mgmtDecVgroupRef(pVgroup); } } - //mError("stable:%s, numOfTables:%d not 0", pStable->info.tableId, pStable->numOfTables); - //mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_OTHERS); } else { SSdbOper oper = { .type = SDB_OPER_GLOBAL, @@ -845,8 +854,7 @@ static int32_t mgmtAddSuperTableTag(SSuperTableObj *pStable, SSchema schema[], i SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -873,8 +881,7 @@ static int32_t mgmtDropSuperTableTag(SSuperTableObj *pStable, char *tagName) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -910,8 +917,7 @@ static int32_t mgmtModifySuperTableTagName(SSuperTableObj *pStable, char *oldTag SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -976,8 +982,7 @@ static int32_t mgmtAddSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, SSc SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -1014,8 +1019,7 @@ static int32_t mgmtDropSuperTableColumn(SDbObj *pDb, SSuperTableObj *pStable, ch SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsSuperTableSdb, - .pObj = pStable, - .rowSize = tsSuperTableUpdateSize + .pObj = pStable }; int32_t code = sdbUpdateRow(&oper); @@ -1098,7 +1102,8 @@ int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, v char stableName[TSDB_TABLE_NAME_LEN] = {0}; while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsSuperTableSdb, pShow->pNode, (void **) &pTable); + mgmtDecTableRef(pTable); + pShow->pNode = mgmtGetNextSuperTable(pShow->pNode, &pTable); if (pTable == NULL) break; if (strncmp(pTable->info.tableId, prefix, prefixLen)) { continue; @@ -1134,8 +1139,6 @@ int32_t mgmtRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, v cols++; numOfRows++; - mgmtDecTableRef(pTable); - } pShow->numOfReads += numOfRows; @@ -1154,7 +1157,8 @@ void mgmtDropAllSuperTables(SDbObj *pDropDb) { mPrint("db:%s, all super tables will be dropped from sdb", pDropDb->name); while (1) { - pNode = sdbFetchRow(tsSuperTableSdb, pNode, (void **)&pTable); + pLastNode = pNode; + pNode = mgmtGetNextSuperTable(pNode, &pTable); if (pTable == NULL) break; if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) { @@ -1448,17 +1452,21 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) { } int32_t sid = taosAllocateId(pVgroup->idPool); - if (sid < 0) { - mTrace("tables:%s, no enough sid in vgroup:%d", pVgroup->vgId); + if (sid <= 0) { + mTrace("tables:%s, no enough sid in vgId:%d", pCreate->tableId, pVgroup->vgId); mgmtCreateVgroup(mgmtCloneQueuedMsg(pMsg), pMsg->pDb); return; } if (pMsg->retry == 0) { - pMsg->pTable = (STableObj *)mgmtDoCreateChildTable(pCreate, pVgroup, sid); + if (pMsg->pTable == NULL) { + pMsg->pTable = (STableObj *)mgmtDoCreateChildTable(pCreate, pVgroup, sid); + mgmtIncTableRef(pMsg->pTable); + } } else { - pMsg->pTable = mgmtGetTable(pCreate->tableId); + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pCreate->tableId); } + if (pMsg->pTable == NULL) { mgmtSendSimpleResp(pMsg->thandle, terrno); return; @@ -1474,7 +1482,6 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) { SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); newMsg->ahandle = pMsg->pTable; newMsg->maxRetry = 5; - mgmtIncTableRef(pMsg->pTable); SRpcMsg rpcMsg = { .handle = newMsg, .pCont = pMDCreate, @@ -1488,8 +1495,8 @@ static void mgmtProcessCreateChildTableMsg(SQueuedMsg *pMsg) { static void mgmtProcessDropChildTableMsg(SQueuedMsg *pMsg) { SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable; - SVgObj *pVgroup = pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); - if (pVgroup == NULL) { + if (pMsg->pVgroup == NULL) pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); + if (pMsg->pVgroup == NULL) { mError("table:%s, failed to drop ctable, vgroup not exist", pTable->info.tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_OTHERS); return; @@ -1508,7 +1515,7 @@ static void mgmtProcessDropChildTableMsg(SQueuedMsg *pMsg) { pDrop->sid = htonl(pTable->sid); pDrop->uid = htobe64(pTable->uid); - SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup); + SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pMsg->pVgroup); mTrace("table:%s, send drop ctable msg", pDrop->tableId); SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); @@ -1574,8 +1581,7 @@ static int32_t mgmtAddNormalTableColumn(SDbObj *pDb, SChildTableObj *pTable, SSc SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsChildTableSdb, - .pObj = pTable, - .rowSize = tsChildTableUpdateSize + .pObj = pTable }; int32_t code = sdbUpdateRow(&oper); @@ -1607,8 +1613,7 @@ static int32_t mgmtDropNormalTableColumn(SDbObj *pDb, SChildTableObj *pTable, ch SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsChildTableSdb, - .pObj = pTable, - .rowSize = tsChildTableUpdateSize + .pObj = pTable }; int32_t code = sdbUpdateRow(&oper); @@ -1656,21 +1661,21 @@ static int32_t mgmtDoGetChildTableMeta(SQueuedMsg *pMsg, STableMetaMsg *pMeta) { pMeta->contLen = sizeof(STableMetaMsg) + mgmtSetSchemaFromNormalTable(pMeta->schema, pTable); } - SVgObj *pVgroup = pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); - if (pVgroup == NULL) { + if (pMsg->pVgroup == NULL) pMsg->pVgroup = mgmtGetVgroup(pTable->vgId); + if (pMsg->pVgroup == NULL) { mError("table:%s, failed to get table meta, db not selected", pTable->info.tableId); return TSDB_CODE_INVALID_VGROUP_ID; } - for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId); + for (int32_t i = 0; i < pMsg->pVgroup->numOfVnodes; ++i) { + SDnodeObj *pDnode = mgmtGetDnode(pMsg->pVgroup->vnodeGid[i].dnodeId); if (pDnode == NULL) break; strcpy(pMeta->vgroup.ipAddr[i].fqdn, pDnode->dnodeFqdn); pMeta->vgroup.ipAddr[i].port = htons(pDnode->dnodePort + TSDB_PORT_DNODESHELL); pMeta->vgroup.numOfIps++; mgmtDecDnodeRef(pDnode); } - pMeta->vgroup.vgId = htonl(pVgroup->vgId); + pMeta->vgroup.vgId = htonl(pMsg->pVgroup->vgId); mTrace("table:%s, uid:%" PRIu64 " table meta is retrieved", pTable->info.tableId, pTable->uid); @@ -1691,10 +1696,12 @@ static void mgmtAutoCreateChildTable(SQueuedMsg *pMsg) { strcpy(pCreateMsg->db, pMsg->pDb->name); pCreateMsg->igExists = 1; pCreateMsg->getMeta = 1; + pCreateMsg->contLen = htonl(contLen); memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData)); SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg); pMsg->pCont = newMsg->pCont; + newMsg->msgType = TSDB_MSG_TYPE_CM_CREATE_TABLE; newMsg->pCont = pCreateMsg; mTrace("table:%s, start to create on demand", pInfo->tableId); @@ -1730,7 +1737,8 @@ void mgmtDropAllChildTables(SDbObj *pDropDb) { mPrint("db:%s, all child tables will be dropped from sdb", pDropDb->name); while (1) { - pNode = sdbFetchRow(tsChildTableSdb, pNode, (void **)&pTable); + pLastNode = pNode; + pNode = mgmtGetNextChildTable(pNode, &pTable); if (pTable == NULL) break; if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) { @@ -1758,7 +1766,8 @@ static void mgmtDropAllChildTablesInStable(SSuperTableObj *pStable) { mPrint("stable:%s, all child tables will dropped from sdb", pStable->info.tableId, numOfTables); while (1) { - pNode = sdbFetchRow(tsChildTableSdb, pNode, (void **)&pTable); + pLastNode = pNode; + pNode = mgmtGetNextChildTable(pNode, &pTable); if (pTable == NULL) break; if (pTable->superTable == pStable) { @@ -1778,16 +1787,13 @@ static void mgmtDropAllChildTablesInStable(SSuperTableObj *pStable) { mPrint("stable:%s, all child tables:%d is dropped from sdb", pStable->info.tableId, numOfTables); } -static SChildTableObj* mgmtGetTableByPos(uint32_t dnodeId, int32_t vnode, int32_t sid) { - SDnodeObj *pObj = mgmtGetDnode(dnodeId); +static SChildTableObj* mgmtGetTableByPos(int32_t vnode, int32_t sid) { SVgObj *pVgroup = mgmtGetVgroup(vnode); + if (pVgroup == NULL) return NULL; - if (pObj == NULL || pVgroup == NULL) { - return NULL; - } - - SChildTableObj *pTable = pVgroup->tableList[sid]; + SChildTableObj *pTable = pVgroup->tableList[sid - 1]; mgmtIncTableRef((STableObj *)pTable); + mgmtDecVgroupRef(pVgroup); return pTable; } @@ -1799,7 +1805,7 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg) { pCfg->sid = htonl(pCfg->sid); mTrace("dnode:%s, vnode:%d, sid:%d, receive table config msg", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid); - SChildTableObj *pTable = mgmtGetTableByPos(pCfg->dnode, pCfg->vnode, pCfg->sid); + SChildTableObj *pTable = mgmtGetTableByPos(pCfg->vnode, pCfg->sid); if (pTable == NULL) { mError("dnode:%s, vnode:%d, sid:%d, table not found", taosIpStr(pCfg->dnode), pCfg->vnode, pCfg->sid); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NOT_ACTIVE_TABLE); @@ -1814,6 +1820,7 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg) { mgmtDecTableRef(pTable); return; } + SDnodeObj *pDnode = mgmtGetDnode(pCfg->dnode); SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); SRpcMsg rpcRsp = { @@ -1824,7 +1831,9 @@ static void mgmtProcessTableCfgMsg(SRpcMsg *rpcMsg) { .msgType = TSDB_MSG_TYPE_MD_CREATE_TABLE }; mgmtSendMsgToDnode(&ipSet, &rpcRsp); + mgmtDecTableRef(pTable); + mgmtDecDnodeRef(pDnode); } // handle drop child response @@ -1845,8 +1854,8 @@ static void mgmtProcessDropChildTableRsp(SRpcMsg *rpcMsg) { return; } - SVgObj *pVgroup = queueMsg->pVgroup = mgmtGetVgroup(pTable->vgId); - if (pVgroup == NULL) { + if (queueMsg->pVgroup == NULL) queueMsg->pVgroup = mgmtGetVgroup(pTable->vgId); + if (queueMsg->pVgroup == NULL) { mError("table:%s, failed to get vgroup", pTable->info.tableId); mgmtSendSimpleResp(queueMsg->thandle, TSDB_CODE_INVALID_VGROUP_ID); return; @@ -1865,9 +1874,9 @@ static void mgmtProcessDropChildTableRsp(SRpcMsg *rpcMsg) { return; } - if (pVgroup->numOfTables <= 0) { - mPrint("vgroup:%d, all tables is dropped, drop vgroup", pVgroup->vgId); - mgmtDropVgroup(pVgroup, NULL); + if (queueMsg->pVgroup->numOfTables <= 0) { + mPrint("vgId:%d, all tables is dropped, drop vgroup", queueMsg->pVgroup->vgId); + mgmtDropVgroup(queueMsg->pVgroup, NULL); } mgmtSendSimpleResp(queueMsg->thandle, TSDB_CODE_SUCCESS); @@ -1908,9 +1917,10 @@ static void mgmtProcessCreateChildTableRsp(SRpcMsg *rpcMsg) { } else { mTrace("table:%s, created in dnode, thandle:%p result:%s", pTable->info.tableId, queueMsg->thandle, tstrerror(rpcMsg->code)); - - if (queueMsg->msgType != TSDB_MSG_TYPE_CM_CREATE_TABLE) { - mTrace("table:%s, start to get meta", pTable->info.tableId); + SCMCreateTableMsg *pCreate = queueMsg->pCont; + if (pCreate->getMeta) { + mTrace("table:%s, continue to get meta", pTable->info.tableId); + queueMsg->retry = 0; mgmtAddToShellQueue(queueMsg); } else { mgmtSendSimpleResp(queueMsg->thandle, rpcMsg->code); @@ -1943,8 +1953,8 @@ static void mgmtProcessMultiTableMetaMsg(SQueuedMsg *pMsg) { SChildTableObj *pTable = mgmtGetChildTable(tableId); if (pTable == NULL) continue; - SDbObj *pDb = mgmtGetDbByTableId(tableId); - if (pDb == NULL) continue; + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(tableId); + if (pMsg->pDb == NULL) continue; int availLen = totalMallocLen - pMultiMeta->contLen; if (availLen <= sizeof(STableMetaMsg) + sizeof(SSchema) * TSDB_MAX_COLUMNS) { @@ -2043,7 +2053,8 @@ static int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, int32_t prefixLen = strlen(prefix); while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsChildTableSdb, pShow->pNode, (void **) &pTable); + mgmtDecTableRef(pTable); + pShow->pNode = mgmtGetNextChildTable(pShow->pNode, &pTable); if (pTable == NULL) break; // not belong to current db @@ -2087,7 +2098,6 @@ static int32_t mgmtRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, cols++; numOfRows++; - mgmtDecTableRef(pTable); } pShow->numOfReads += numOfRows; @@ -2103,7 +2113,7 @@ static void mgmtProcessAlterTableMsg(SQueuedMsg *pMsg) { SCMAlterTableMsg *pAlter = pMsg->pCont; mTrace("table:%s, alter table msg is received from thandle:%p", pAlter->tableId, pMsg->thandle); - pMsg->pDb = mgmtGetDbByTableId(pAlter->tableId); + if (pMsg->pDb == NULL) pMsg->pDb = mgmtGetDbByTableId(pAlter->tableId); if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) { mError("table:%s, failed to alter table, db not selected", pAlter->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_DB_NOT_SELECTED); @@ -2116,7 +2126,7 @@ static void mgmtProcessAlterTableMsg(SQueuedMsg *pMsg) { return; } - pMsg->pTable = mgmtGetTable(pAlter->tableId); + if (pMsg->pTable == NULL) pMsg->pTable = mgmtGetTable(pAlter->tableId); if (pMsg->pTable == NULL) { mError("table:%s, failed to alter table, table not exist", pMsg->pTable->tableId); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_TABLE); diff --git a/src/mnode/src/mgmtUser.c b/src/mnode/src/mgmtUser.c index 708f436d0a75b8295128a1bed968f67f81cbf8a7..787459d6675f929d803669aabab07cf0b7d627f8 100644 --- a/src/mnode/src/mgmtUser.c +++ b/src/mnode/src/mgmtUser.c @@ -168,8 +168,7 @@ static int32_t mgmtUpdateUser(SUserObj *pUser) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsUserSdb, - .pObj = pUser, - .rowSize = tsUserUpdateSize + .pObj = pUser }; int32_t code = sdbUpdateRow(&oper); @@ -249,7 +248,7 @@ static int32_t mgmtDropUser(SUserObj *pUser) { } static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { - SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); + SUserObj *pUser = mgmtGetUserFromConn(pConn); if (pUser == NULL) { return TSDB_CODE_NO_USER_FROM_CONN; } @@ -298,7 +297,7 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void char *pWrite; while (numOfRows < rows) { - pShow->pNode = sdbFetchRow(tsUserSdb, pShow->pNode, (void **) &pUser); + pShow->pNode = mgmtGetNextUser(pShow->pNode, &pUser); if (pUser == NULL) break; cols = 0; @@ -329,12 +328,9 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void return numOfRows; } -SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp) { +SUserObj *mgmtGetUserFromConn(void *pConn) { SRpcConnInfo connInfo; if (rpcGetConnInfo(pConn, &connInfo) == 0) { - if (usePublicIp) { - *usePublicIp = (connInfo.serverIp == tsPublicIpInt); - } return mgmtGetUser(connInfo.user); } else { mError("can not get user from conn:%p", pConn); @@ -510,7 +506,7 @@ void mgmtDropAllUsers(SAcctObj *pAcct) { while (1) { pLastNode = pNode; - pNode = sdbFetchRow(tsUserSdb, pNode, (void **)&pUser); + pNode = mgmtGetNextUser(pNode, &pUser); if (pUser == NULL) break; if (strncmp(pUser->acct, pAcct->user, acctNameLen) == 0) { diff --git a/src/mnode/src/mgmtVgroup.c b/src/mnode/src/mgmtVgroup.c index 3143e6065fe8e27c93c6397c70a8b62a91d8527a..839dce5c38a65528e1ea3c0f8c691738476bce45 100644 --- a/src/mnode/src/mgmtVgroup.c +++ b/src/mnode/src/mgmtVgroup.c @@ -36,8 +36,8 @@ #include "mgmtTable.h" #include "mgmtVgroup.h" -void *tsVgroupSdb = NULL; -int32_t tsVgUpdateSize = 0; +static void *tsVgroupSdb = NULL; +static int32_t tsVgUpdateSize = 0; static int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn); @@ -62,6 +62,8 @@ static int32_t mgmtVgroupActionDestroy(SSdbOper *pOper) { static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { SVgObj *pVgroup = pOper->pObj; + + // refer to db SDbObj *pDb = mgmtGetDb(pVgroup->dbName); if (pDb == NULL) { return TSDB_CODE_INVALID_DB; @@ -74,13 +76,13 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { int32_t size = sizeof(SChildTableObj *) * pDb->cfg.maxTables; pVgroup->tableList = calloc(pDb->cfg.maxTables, sizeof(SChildTableObj *)); if (pVgroup->tableList == NULL) { - mError("vgroup:%d, failed to malloc(size:%d) for the tableList of vgroups", pVgroup->vgId, size); + mError("vgId:%d, failed to malloc(size:%d) for the tableList of vgroups", pVgroup->vgId, size); return -1; } pVgroup->idPool = taosInitIdPool(pDb->cfg.maxTables); if (pVgroup->idPool == NULL) { - mError("vgroup:%d, failed to taosInitIdPool for vgroups", pVgroup->vgId); + mError("vgId:%d, failed to taosInitIdPool for vgroups", pVgroup->vgId); tfree(pVgroup->tableList); return -1; } @@ -101,7 +103,7 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { static int32_t mgmtVgroupActionDelete(SSdbOper *pOper) { SVgObj *pVgroup = pOper->pObj; - + if (pVgroup->pDb != NULL) { mgmtRemoveVgroupFromDb(pVgroup); } @@ -140,6 +142,7 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) { if (pDnode != NULL) { atomic_add_fetch_32(&pDnode->openVnodes, 1); } + mgmtDecDnodeRef(pDnode); } } @@ -147,14 +150,15 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) { SDbObj *pDb = pVgroup->pDb; if (pDb != NULL) { if (pDb->cfg.maxTables != oldTables) { - mPrint("vgroup:%d tables change from %d to %d", pVgroup->vgId, oldTables, pDb->cfg.maxTables); + mPrint("vgId:%d tables change from %d to %d", pVgroup->vgId, oldTables, pDb->cfg.maxTables); taosUpdateIdPool(pVgroup->idPool, pDb->cfg.maxTables); int32_t size = sizeof(SChildTableObj *) * pDb->cfg.maxTables; pVgroup->tableList = (SChildTableObj **)realloc(pVgroup->tableList, size); } } - mTrace("vgroup:%d, is updated, tables:%d numOfVnode:%d", pVgroup->vgId, pDb->cfg.maxTables, pVgroup->numOfVnodes); + mgmtDecVgroupRef(pVgroup); + mTrace("vgId:%d, is updated, tables:%d numOfVnode:%d", pVgroup->vgId, pDb->cfg.maxTables, pVgroup->numOfVnodes); return TSDB_CODE_SUCCESS; } @@ -237,8 +241,7 @@ void mgmtUpdateVgroup(SVgObj *pVgroup) { SSdbOper oper = { .type = SDB_OPER_GLOBAL, .table = tsVgroupSdb, - .pObj = pVgroup, - .rowSize = tsVgUpdateSize + .pObj = pVgroup }; sdbUpdateRow(&oper); @@ -261,7 +264,7 @@ void mgmtUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVlo if (!dnodeExist) { SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->dnodeEp); - mError("vgroup:%d, dnode:%d not exist in mnode, drop it", pVload->vgId, pDnode->dnodeId); + mError("vgId:%d, dnode:%d not exist in mnode, drop it", pVload->vgId, pDnode->dnodeId); mgmtSendDropVnodeMsg(pVload->vgId, &ipSet, NULL); return; } @@ -273,7 +276,7 @@ void mgmtUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVlo } if (pVload->cfgVersion != pVgroup->pDb->cfgVersion || pVload->replica != pVgroup->numOfVnodes) { - mError("dnode:%d, vgroup:%d, vnode cfgVersion:%d repica:%d not match with mgmt cfgVersion:%d replica:%d", + mError("dnode:%d, vgId:%d, vnode cfgVersion:%d repica:%d not match with mgmt cfgVersion:%d replica:%d", pDnode->dnodeId, pVload->vgId, pVload->cfgVersion, pVload->replica, pVgroup->pDb->cfgVersion, pVgroup->numOfVnodes); mgmtSendCreateVgroupMsg(pVgroup, NULL); @@ -317,9 +320,9 @@ void mgmtCreateVgroup(SQueuedMsg *pMsg, SDbObj *pDb) { return; } - mPrint("vgroup:%d, is created in mnode, db:%s replica:%d", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes); + mPrint("vgId:%d, is created in mnode, db:%s replica:%d", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - mPrint("vgroup:%d, index:%d, dnode:%d", pVgroup->vgId, i, pVgroup->vnodeGid[i].dnodeId); + mPrint("vgId:%d, index:%d, dnode:%d", pVgroup->vgId, i, pVgroup->vnodeGid[i].dnodeId); } pMsg->ahandle = pVgroup; @@ -331,7 +334,7 @@ void mgmtDropVgroup(SVgObj *pVgroup, void *ahandle) { if (ahandle != NULL) { mgmtSendDropVgroupMsg(pVgroup, ahandle); } else { - mTrace("vgroup:%d, replica:%d is deleting from sdb", pVgroup->vgId, pVgroup->numOfVnodes); + mTrace("vgId:%d, replica:%d is deleting from sdb", pVgroup->vgId, pVgroup->numOfVnodes); mgmtSendDropVgroupMsg(pVgroup, NULL); SSdbOper oper = { .type = SDB_OPER_GLOBAL, @@ -379,6 +382,7 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { if (pShow->payloadLen > 0 ) { pTable = mgmtGetTable(pShow->payload); if (NULL == pTable || pTable->type == TSDB_SUPER_TABLE) { + mgmtDecTableRef(pTable); return TSDB_CODE_INVALID_TABLE_ID; } mgmtDecTableRef(pTable); @@ -505,25 +509,28 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo } void mgmtAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable) { - if (pTable->sid >= 0 && pVgroup->tableList[pTable->sid] == NULL) { - pVgroup->tableList[pTable->sid] = pTable; + if (pTable->sid >= 1 && pVgroup->tableList[pTable->sid - 1] == NULL) { + pVgroup->tableList[pTable->sid - 1] = pTable; taosIdPoolMarkStatus(pVgroup->idPool, pTable->sid); pVgroup->numOfTables++; } - if (pVgroup->numOfTables >= pVgroup->pDb->cfg.maxTables) - mgmtAddVgroupIntoDbTail(pVgroup); + if (pVgroup->numOfTables >= pVgroup->pDb->cfg.maxTables) { + mgmtMoveVgroupToTail(pVgroup); + } + + mgmtIncVgroupRef(pVgroup); } void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable) { - if (pTable->sid >= 0 && pVgroup->tableList[pTable->sid] != NULL) { - pVgroup->tableList[pTable->sid] = NULL; + if (pTable->sid >= 1 && pVgroup->tableList[pTable->sid - 1] != NULL) { + pVgroup->tableList[pTable->sid - 1] = NULL; taosFreeId(pVgroup->idPool, pTable->sid); pVgroup->numOfTables--; } - if (pVgroup->numOfTables >= pVgroup->pDb->cfg.maxTables) - mgmtAddVgroupIntoDbTail(pVgroup); + mgmtMoveVgroupToHead(pVgroup); + mgmtDecVgroupRef(pVgroup); } SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) { @@ -588,7 +595,7 @@ SRpcIpSet mgmtGetIpSetFromIp(char *ep) { } void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) { - mTrace("vgroup:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, pVgroup->vgId, ahandle); + mTrace("vgId:%d, send create vnode:%d msg, ahandle:%p", pVgroup->vgId, pVgroup->vgId, ahandle); SMDCreateVnodeMsg *pCreate = mgmtBuildCreateVnodeMsg(pVgroup); SRpcMsg rpcMsg = { .handle = ahandle, @@ -601,7 +608,7 @@ void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) { } void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) { - mTrace("vgroup:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); + mTrace("vgId:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp); mgmtSendCreateVnodeMsg(pVgroup, &ipSet, ahandle); @@ -619,7 +626,7 @@ static void mgmtProcessCreateVnodeRsp(SRpcMsg *rpcMsg) { } SVgObj *pVgroup = queueMsg->ahandle; - mTrace("vgroup:%d, create vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", + mTrace("vgId:%d, create vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", pVgroup->vgId, tstrerror(rpcMsg->code), queueMsg->received, queueMsg->successed, queueMsg->expected, queueMsg->thandle, rpcMsg->handle); @@ -654,7 +661,7 @@ static SMDDropVnodeMsg *mgmtBuildDropVnodeMsg(int32_t vgId) { } void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) { - mTrace("vgroup:%d, send drop vnode msg, ahandle:%p", vgId, ahandle); + mTrace("vgId:%d, send drop vnode msg, ahandle:%p", vgId, ahandle); SMDDropVnodeMsg *pDrop = mgmtBuildDropVnodeMsg(vgId); SRpcMsg rpcMsg = { .handle = ahandle, @@ -667,7 +674,7 @@ void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) { } static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { - mTrace("vgroup:%d, send drop all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); + mTrace("vgId:%d, send drop all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp); mgmtSendDropVnodeMsg(pVgroup->vgId, &ipSet, ahandle); @@ -675,7 +682,7 @@ static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { } static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg) { - mTrace("drop vnode rsp is received"); + mTrace("drop vnode rsp is received, handle:%p", rpcMsg->handle); if (rpcMsg->handle == NULL) return; SQueuedMsg *queueMsg = rpcMsg->handle; @@ -686,7 +693,7 @@ static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg) { } SVgObj *pVgroup = queueMsg->ahandle; - mTrace("vgroup:%d, drop vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", + mTrace("vgId:%d, drop vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p", pVgroup->vgId, tstrerror(rpcMsg->code), queueMsg->received, queueMsg->successed, queueMsg->expected, queueMsg->thandle, rpcMsg->handle); @@ -736,7 +743,33 @@ static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) { mgmtSendCreateVnodeMsg(pVgroup, &ipSet, NULL); } -void mgmtDropAllVgroups(SDbObj *pDropDb) { +void mgmtDropAllDnodeVgroups(SDnodeObj *pDropDnode) { + void * pNode = NULL; + void * pLastNode = NULL; + SVgObj *pVgroup = NULL; + int32_t numOfVgroups = 0; + + while (1) { + pLastNode = pNode; + pNode = mgmtGetNextVgroup(pNode, &pVgroup); + if (pVgroup == NULL) break; + + if (pVgroup->vnodeGid[0].dnodeId == pDropDnode->dnodeId) { + SSdbOper oper = { + .type = SDB_OPER_LOCAL, + .table = tsVgroupSdb, + .pObj = pVgroup, + }; + sdbDeleteRow(&oper); + pNode = pLastNode; + numOfVgroups++; + continue; + } + mgmtDecVgroupRef(pVgroup); + } +} + +void mgmtDropAllDbVgroups(SDbObj *pDropDb) { void *pNode = NULL; void *pLastNode = NULL; int32_t numOfVgroups = 0; @@ -744,7 +777,8 @@ void mgmtDropAllVgroups(SDbObj *pDropDb) { mPrint("db:%s, all vgroups will be dropped from sdb", pDropDb->name); while (1) { - pNode = sdbFetchRow(tsVgroupSdb, pNode, (void **)&pVgroup); + pLastNode = pNode; + pNode = mgmtGetNextVgroup(pNode, &pVgroup); if (pVgroup == NULL) break; if (pVgroup->pDb == pDropDb) { diff --git a/src/os/darwin/src/darwinPlatform.c b/src/os/darwin/src/darwinPlatform.c index 5ee7889af467041f06fbf2949dd5b65d7001562b..05290c43f4edb6b413266c73ae149da7a967a1b7 100644 --- a/src/os/darwin/src/darwinPlatform.c +++ b/src/os/darwin/src/darwinPlatform.c @@ -151,67 +151,6 @@ int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optle return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen); } -int taosOpenUDClientSocket(char *ip, uint16_t port) { - int sockFd = 0; - struct sockaddr_un serverAddr; - int ret; - char name[128]; - sprintf(name, "%s.%hu", ip, port); - - sockFd = socket(AF_UNIX, SOCK_STREAM, 0); - - if (sockFd < 0) { - uError("failed to open the UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - memset((char *)&serverAddr, 0, sizeof(serverAddr)); - serverAddr.sun_family = AF_UNIX; - strcpy(serverAddr.sun_path + 1, name); - - ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); - - if (ret != 0) { - uError("failed to connect UD socket, name:%d, reason: %s", name, strerror(errno)); - sockFd = -1; - } - - return sockFd; -} - -int taosOpenUDServerSocket(char *ip, uint16_t port) { - struct sockaddr_un serverAdd; - int sockFd; - char name[128]; - - uTrace("open ud socket:%s", name); - sprintf(name, "%s.%hu", ip, port); - - bzero((char *)&serverAdd, sizeof(serverAdd)); - serverAdd.sun_family = AF_UNIX; - strcpy(serverAdd.sun_path + 1, name); - unlink(name); - - if ((sockFd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - uError("failed to open UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - /* bind socket to server address */ - if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) { - uError("bind socket:%s failed, reason:%s", name, strerror(errno)); - tclose(sockFd); - return -1; - } - - if (listen(sockFd, 10) < 0) { - uError("listen socket:%s failed, reason:%s", name, strerror(errno)); - return -1; - } - - return sockFd; -} - int taosInitTimer(void (*callback)(int), int ms) { signal(SIGALRM, callback); @@ -443,4 +382,4 @@ int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) { return writeLen; } -void taosSetCoreDump() {} \ No newline at end of file +void taosSetCoreDump() {} diff --git a/src/os/linux/src/linuxPlatform.c b/src/os/linux/src/linuxPlatform.c index d9d56a2239cab09754d552c829f3834ce102c6e0..72da97287feaf34b9e032cb402628d3293ef030e 100644 --- a/src/os/linux/src/linuxPlatform.c +++ b/src/os/linux/src/linuxPlatform.c @@ -143,68 +143,6 @@ int taosSetNonblocking(int sock, int on) { int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) { return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen); } - -int taosOpenUDClientSocket(char *ip, uint16_t port) { - int sockFd = 0; - struct sockaddr_un serverAddr; - int ret; - char name[128]; - sprintf(name, "%s.%hu", ip, port); - - sockFd = socket(AF_UNIX, SOCK_STREAM, 0); - - if (sockFd < 0) { - uError("failed to open the UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - memset((char *)&serverAddr, 0, sizeof(serverAddr)); - serverAddr.sun_family = AF_UNIX; - strcpy(serverAddr.sun_path + 1, name); - - ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr)); - - if (ret != 0) { - uError("failed to connect UD socket, name:%d, reason: %s", name, strerror(errno)); - sockFd = -1; - } - - return sockFd; -} - -int taosOpenUDServerSocket(char *ip, uint16_t port) { - struct sockaddr_un serverAdd; - int sockFd; - char name[128]; - - uTrace("open ud socket:%s", name); - sprintf(name, "%s.%hu", ip, port); - - bzero((char *)&serverAdd, sizeof(serverAdd)); - serverAdd.sun_family = AF_UNIX; - strcpy(serverAdd.sun_path + 1, name); - unlink(name); - - if ((sockFd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - uError("failed to open UD socket:%s, reason:%s", name, strerror(errno)); - return -1; - } - - /* bind socket to server address */ - if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) { - uError("bind socket:%s failed, reason:%s", name, strerror(errno)); - tclose(sockFd); - return -1; - } - - if (listen(sockFd, 10) < 0) { - uError("listen socket:%s failed, reason:%s", name, strerror(errno)); - return -1; - } - - return sockFd; -} - static void taosDeleteTimer(void *tharg) { timer_t *pTimer = tharg; timer_delete(*pTimer); diff --git a/src/os/linux/src/linuxSysPara.c b/src/os/linux/src/linuxSysPara.c index 98d80ded5d2af81be0fcede60129230c04f2435e..f43ed44a4bab19a8db80bc89fbb5074531edc514 100644 --- a/src/os/linux/src/linuxSysPara.c +++ b/src/os/linux/src/linuxSysPara.c @@ -225,10 +225,11 @@ static void taosGetSystemLocale() { // get and set default locale if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) { locale = setlocale(LC_CTYPE, ""); if (locale == NULL) { - uError("can't get locale from system"); + uForcePrint("can't get locale from system, set it to en_US.UTF-8"); + strcpy(tsLocale, "en_US.UTF-8"); } else { strncpy(tsLocale, locale, tListLen(tsLocale)); - uPrint("locale not configured, set to system default:%s", tsLocale); + uForcePrint("locale not configured, set to system default:%s", tsLocale); } } @@ -243,7 +244,10 @@ static void taosGetSystemLocale() { // get and set default locale strncpy(tsCharset, revisedCharset, tListLen(tsCharset)); free(revisedCharset); - uPrint("charset not configured, set to system default:%s", tsCharset); + uForcePrint("charset not configured, set to system default:%s", tsCharset); + } else { + strcpy(tsCharset, "UTF-8"); + uForcePrint("can't get locale and charset from system, set it to UTF-8"); } } } diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c index f36e0440cb07c20db8894cd400fe4b60041f6452..9b8affcde256065ef97709976afa7b4f5dc8ada5 100644 --- a/src/plugins/http/src/httpServer.c +++ b/src/plugins/http/src/httpServer.c @@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) { pServer->serverPort); return; } else { - httpPrint("http service init success at ip:%s:%u", pServer->serverIp, pServer->serverPort); + httpPrint("http service init success at %u", pServer->serverPort); pServer->online = true; } diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp index dee85ef63002b91e08cf32d7f1eb6417c1afac7c..d767e7ad7b427dd99c841c622a26ccda1a8141e9 100644 --- a/src/query/tests/astTest.cpp +++ b/src/query/tests/astTest.cpp @@ -582,7 +582,7 @@ void exprSerializeTest1() { tExprTreeDestroy(&p1, nullptr); tExprTreeDestroy(&p2, nullptr); - tbufClose(&bw); + // tbufClose(&bw); } void exprSerializeTest2() { @@ -627,7 +627,7 @@ void exprSerializeTest2() { tExprTreeDestroy(&p1, nullptr); tExprTreeDestroy(&p2, nullptr); - tbufClose(&bw); + // tbufClose(&bw); } } // namespace TEST(testCase, astTest) { diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c index f616cd00b7f43430431ee88d14e7356ae9b99077..dfb549b3f9c914fefa396a6cefcd974bc11eff97 100644 --- a/src/rpc/src/rpcMain.c +++ b/src/rpc/src/rpcMain.c @@ -643,10 +643,11 @@ static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) { if (sid) { pConn = pRpc->connList + sid; - } else { - pConn = rpcAllocateServerConn(pRpc, pRecv); + if (pConn->user[0] == 0) pConn = NULL; } + if (pConn == NULL) pConn = rpcAllocateServerConn(pRpc, pRecv); + if (pConn) { if (pConn->linkUid != pHead->linkUid) { tTrace("%s %p, linkUid:0x%x not matched, received:0x%x", pRpc->label, pConn, pConn->linkUid, pHead->linkUid); diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index 8e0064a6ac5d5d2abc30c93566f2e327f59fd162..fb77975d25c742b84f2adb41631cc521e152c4eb 100644 --- a/src/tsdb/inc/tsdbMain.h +++ b/src/tsdb/inc/tsdbMain.h @@ -153,17 +153,16 @@ typedef struct { } SCacheMem; typedef struct { - int maxBytes; int cacheBlockSize; int totalCacheBlocks; STsdbCachePool pool; STsdbCacheBlock *curBlock; SCacheMem * mem; SCacheMem * imem; - TsdbRepoT * pRepo; + TsdbRepoT * pRepo; } STsdbCache; -STsdbCache *tsdbInitCache(int maxBytes, int cacheBlockSize, TsdbRepoT *pRepo); +STsdbCache *tsdbInitCache(int cacheBlockSize, int totalBlocks, TsdbRepoT *pRepo); void tsdbFreeCache(STsdbCache *pCache); void * tsdbAllocFromCache(STsdbCache *pCache, int bytes, TSKEY key); @@ -297,7 +296,7 @@ typedef struct { // TODO: take pre-calculation into account typedef struct { int16_t colId; // Column ID - int16_t len; // Column length + int16_t len; // Column length // TODO: int16_t is not enough int32_t type : 8; int32_t offset : 24; } SCompCol; @@ -426,6 +425,8 @@ typedef struct { SCompData *pCompData; SDataCols *pDataCols[2]; + void *blockBuffer; // Buffer to hold the whole data block + void *compBuffer; // Buffer for temperary compress/decompress purpose } SRWHelper; // --------- Helper state @@ -445,13 +446,11 @@ typedef struct { int tsdbInitReadHelper(SRWHelper *pHelper, STsdbRepo *pRepo); int tsdbInitWriteHelper(SRWHelper *pHelper, STsdbRepo *pRepo); -// int tsdbInitHelper(SRWHelper *pHelper, SHelperCfg *pCfg); void tsdbDestroyHelper(SRWHelper *pHelper); void tsdbResetHelper(SRWHelper *pHelper); // --------- For set operations int tsdbSetAndOpenHelperFile(SRWHelper *pHelper, SFileGroup *pGroup); -// void tsdbSetHelperTable(SRWHelper *pHelper, SHelperTable *pHelperTable, STSchema *pSchema); void tsdbSetHelperTable(SRWHelper *pHelper, STable *pTable, STsdbRepo *pRepo); int tsdbCloseHelperFile(SRWHelper *pHelper, bool hasError); diff --git a/src/tsdb/src/tsdbCache.c b/src/tsdb/src/tsdbCache.c index 3e241773ed27204a4525254b61e07796b395ce02..9351bc602b5f34746381cbc8c712429b02a6561a 100644 --- a/src/tsdb/src/tsdbCache.c +++ b/src/tsdb/src/tsdbCache.c @@ -21,29 +21,25 @@ static int tsdbAllocBlockFromPool(STsdbCache *pCache); static void tsdbFreeBlockList(SList *list); static void tsdbFreeCacheMem(SCacheMem *mem); -STsdbCache *tsdbInitCache(int maxBytes, int cacheBlockSize, TsdbRepoT *pRepo) { +STsdbCache *tsdbInitCache(int cacheBlockSize, int totalBlocks, TsdbRepoT *pRepo) { STsdbCache *pCache = (STsdbCache *)calloc(1, sizeof(STsdbCache)); if (pCache == NULL) return NULL; if (cacheBlockSize < 0) cacheBlockSize = TSDB_DEFAULT_CACHE_BLOCK_SIZE; cacheBlockSize *= (1024 * 1024); - if (maxBytes < 0) maxBytes = cacheBlockSize * TSDB_DEFAULT_TOTAL_BLOCKS; + if (totalBlocks <= 1) totalBlocks = TSDB_DEFAULT_TOTAL_BLOCKS; - pCache->maxBytes = maxBytes; pCache->cacheBlockSize = cacheBlockSize; + pCache->totalCacheBlocks = totalBlocks; pCache->pRepo = pRepo; - int nBlocks = maxBytes / cacheBlockSize + 1; - if (nBlocks <= 1) nBlocks = 2; - pCache->totalCacheBlocks = nBlocks; - STsdbCachePool *pPool = &(pCache->pool); pPool->index = 0; pPool->memPool = tdListNew(sizeof(STsdbCacheBlock *)); if (pPool->memPool == NULL) goto _err; - for (int i = 0; i < nBlocks; i++) { + for (int i = 0; i < totalBlocks; i++) { STsdbCacheBlock *pBlock = (STsdbCacheBlock *)malloc(sizeof(STsdbCacheBlock) + cacheBlockSize); if (pBlock == NULL) { goto _err; diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index 5da8d303d9a155d56519412c38212f4e11b18500..c0f6030fa6498897e7f359c2e106b75a75c60166 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -5,6 +5,7 @@ #include "tsdb.h" #include "tsdbMain.h" #include "tscompression.h" +#include "tchecksum.h" #define TSDB_DEFAULT_PRECISION TSDB_PRECISION_MILLI // default precision #define IS_VALID_PRECISION(precision) (((precision) >= TSDB_PRECISION_MILLI) && ((precision) <= TSDB_PRECISION_NANO)) @@ -157,7 +158,7 @@ static int tsdbRestoreInfo(STsdbRepo *pRepo) { tsdbInitFileGroupIter(pFileH, &iter, TSDB_ORDER_ASC); while ((pFGroup = tsdbGetFileGroupNext(&iter)) != NULL) { if (tsdbSetAndOpenHelperFile(&rhelper, pFGroup) < 0) goto _err; - for (int i = 0; i < pRepo->config.maxTables; i++) { + for (int i = 1; i < pRepo->config.maxTables; i++) { STable * pTable = pMeta->tables[i]; SCompIdx *pIdx = &rhelper.pCompIdx[i]; @@ -202,7 +203,7 @@ TsdbRepoT *tsdbOpenRepo(char *tsdbDir, STsdbAppH *pAppH) { return NULL; } - pRepo->tsdbCache = tsdbInitCache(-1, -1, (TsdbRepoT *)pRepo); + pRepo->tsdbCache = tsdbInitCache(pRepo->config.cacheBlockSize, pRepo->config.totalBlocks, (TsdbRepoT *)pRepo); if (pRepo->tsdbCache == NULL) { tsdbFreeMeta(pRepo->tsdbMeta); free(pRepo->rootDir); @@ -259,7 +260,7 @@ int32_t tsdbCloseRepo(TsdbRepoT *repo) { } pRepo->commit = 1; // Loop to move pData to iData - for (int i = 0; i < pRepo->config.maxTables; i++) { + for (int i = 1; i < pRepo->config.maxTables; i++) { STable *pTable = pRepo->tsdbMeta->tables[i]; if (pTable != NULL && pTable->mem != NULL) { pTable->imem = pTable->mem; @@ -312,7 +313,7 @@ int32_t tsdbTriggerCommit(TsdbRepoT *repo) { } pRepo->commit = 1; // Loop to move pData to iData - for (int i = 0; i < pRepo->config.maxTables; i++) { + for (int i = 1; i < pRepo->config.maxTables; i++) { STable *pTable = pRepo->tsdbMeta->tables[i]; if (pTable != NULL && pTable->mem != NULL) { pTable->imem = pTable->mem; @@ -367,6 +368,15 @@ int tsdbAlterTable(TsdbRepoT *pRepo, STableCfg *pCfg) { return 0; } +TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, int64_t uid) { + STsdbRepo *pRepo = (STsdbRepo *)repo; + + STable *pTable = tsdbGetTableByUid(pRepo->tsdbMeta, uid); + if (pTable == NULL) return -1; + + return TSDB_GET_TABLE_LAST_KEY(pTable); +} + int tsdbDropTable(TsdbRepoT *repo, STableId tableId) { if (repo == NULL) return -1; STsdbRepo *pRepo = (STsdbRepo *)repo; @@ -601,6 +611,10 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) { if (pCfg->maxTables < TSDB_MIN_TABLES || pCfg->maxTables > TSDB_MAX_TABLES) return -1; } + // Since tableId starts from 1, we increase maxTables by 1 + // TODO: take a fancier way to do this + pCfg->maxTables++; + // Check daysPerFile if (pCfg->daysPerFile == -1) { pCfg->daysPerFile = TSDB_DEFAULT_DAYS_PER_FILE; @@ -823,7 +837,7 @@ static int tsdbReadRowsFromCache(SSkipListIterator *pIter, TSKEY maxKey, int max static void tsdbDestroyTableIters(SSkipListIterator **iters, int maxTables) { if (iters == NULL) return; - for (int tid = 0; tid < maxTables; tid++) { + for (int tid = 1; tid < maxTables; tid++) { if (iters[tid] == NULL) continue; tSkipListDestroyIter(iters[tid]); } @@ -835,7 +849,7 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables) SSkipListIterator **iters = (SSkipListIterator **)calloc(maxTables, sizeof(SSkipListIterator *)); if (iters == NULL) return NULL; - for (int tid = 0; tid < maxTables; tid++) { + for (int tid = 1; tid < maxTables; tid++) { STable *pTable = pMeta->tables[tid]; if (pTable == NULL || pTable->imem == NULL) continue; @@ -902,7 +916,7 @@ _exit: free(pCache->imem); pCache->imem = NULL; pRepo->commit = 0; - for (int i = 0; i < pCfg->maxTables; i++) { + for (int i = 1; i < pCfg->maxTables; i++) { STable *pTable = pMeta->tables[i]; if (pTable && pTable->imem) { tsdbFreeMemTable(pTable->imem); @@ -936,7 +950,7 @@ static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SSkipListIterator **iters if (tsdbSetAndOpenHelperFile(pHelper, pGroup) < 0) goto _err; // Loop to commit data in each table - for (int tid = 0; tid < pCfg->maxTables; tid++) { + for (int tid = 1; tid < pCfg->maxTables; tid++) { STable * pTable = pMeta->tables[tid]; if (pTable == NULL) continue; @@ -974,7 +988,6 @@ static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SSkipListIterator **iters // Write the SCompBlock part if (tsdbWriteCompInfo(pHelper) < 0) goto _err; - } if (tsdbWriteCompIdx(pHelper) < 0) goto _err; diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 3ad9b38366f09da0a3a39300f379ac240b1387da..0be77b071948abc360f725502ce195bde7295790 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -129,7 +129,7 @@ int tsdbRestoreTable(void *pHandle, void *cont, int contLen) { void tsdbOrgMeta(void *pHandle) { STsdbMeta *pMeta = (STsdbMeta *)pHandle; - for (int i = 0; i < pMeta->maxTables; i++) { + for (int i = 1; i < pMeta->maxTables; i++) { STable *pTable = pMeta->tables[i]; if (pTable != NULL && pTable->type == TSDB_CHILD_TABLE) { tsdbAddTableIntoIndex(pMeta, pTable); @@ -179,7 +179,7 @@ int32_t tsdbFreeMeta(STsdbMeta *pMeta) { tsdbCloseMetaFile(pMeta->mfh); - for (int i = 0; i < pMeta->maxTables; i++) { + for (int i = 1; i < pMeta->maxTables; i++) { if (pMeta->tables[i] != NULL) { tsdbFreeTable(pMeta->tables[i]); } @@ -246,7 +246,7 @@ int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId* id, int32_t colId, int16_t assert(pCol != NULL); SDataRow row = (SDataRow)pTable->tagVal; - char* d = dataRowAt(row, TD_DATA_ROW_HEAD_SIZE); + char* d = dataRowTuple(row); *val = d; *type = pCol->type; @@ -455,9 +455,8 @@ static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx) { // Update the pMeta->maxCols and pMeta->maxRowBytes if (pTable->type == TSDB_SUPER_TABLE || pTable->type == TSDB_NORMAL_TABLE) { if (schemaNCols(pTable->schema) > pMeta->maxCols) pMeta->maxCols = schemaNCols(pTable->schema); - int bytes = tdMaxRowBytesFromSchema(pTable->schema); + int bytes = dataRowMaxBytesFromSchema(pTable->schema); if (bytes > pMeta->maxRowBytes) pMeta->maxRowBytes = bytes; - tdUpdateSchema(pTable->schema); } return tsdbAddTableIntoMap(pMeta, pTable); @@ -528,5 +527,5 @@ static int tsdbEstimateTableEncodeSize(STable *pTable) { char *getTupleKey(const void * data) { SDataRow row = (SDataRow)data; - return dataRowAt(row, TD_DATA_ROW_HEAD_SIZE); + return POINTER_DRIFT(row, TD_DATA_ROW_HEAD_SIZE); } \ No newline at end of file diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c index 25989a23224993913193e753503a32f3d17a9135..ee2f29ea5558b754147ffc9c0760e8213c854d55 100644 --- a/src/tsdb/src/tsdbRWHelper.c +++ b/src/tsdb/src/tsdbRWHelper.c @@ -131,6 +131,11 @@ static int tsdbInitHelper(SRWHelper *pHelper, STsdbRepo *pRepo, tsdb_rw_helper_t // Init block part if (tsdbInitHelperBlock(pHelper) < 0) goto _err; + pHelper->blockBuffer = + tmalloc(sizeof(SCompData) + (sizeof(SCompCol) + sizeof(TSCKSUM) + COMP_OVERFLOW_BYTES) * pHelper->config.maxCols + + pHelper->config.maxRowSize * pHelper->config.maxRowsPerFileBlock + sizeof(TSCKSUM)); + if (pHelper->blockBuffer == NULL) goto _err; + return 0; _err: @@ -149,6 +154,8 @@ int tsdbInitWriteHelper(SRWHelper *pHelper, STsdbRepo *pRepo) { void tsdbDestroyHelper(SRWHelper *pHelper) { if (pHelper) { + tzfree(pHelper->blockBuffer); + tzfree(pHelper->compBuffer); tsdbDestroyHelperFile(pHelper); tsdbDestroyHelperTable(pHelper); tsdbDestroyHelperBlock(pHelper); @@ -330,7 +337,7 @@ int tsdbWriteDataBlock(SRWHelper *pHelper, SDataCols *pDataCols) { int blkIdx = (pCompBlock == NULL) ? (pIdx->numOfBlocks - 1) : (pCompBlock - pHelper->pCompInfo->blocks); if (pCompBlock == NULL) { // No key overlap, must has last block, just merge with the last block - ASSERT(pIdx->hasLast && pHelper->pCompInfo->blocks[pIdx->numOfSuperBlocks - 1].last); + ASSERT(pIdx->hasLast && pHelper->pCompInfo->blocks[pIdx->numOfBlocks - 1].last); rowsToWrite = tsdbMergeDataWithBlock(pHelper, blkIdx, pDataCols); if (rowsToWrite < 0) goto _err; } else { // Has key overlap @@ -552,61 +559,97 @@ int tsdbLoadBlockDataCols(SRWHelper *pHelper, SDataCols *pDataCols, int blkIdx, return 0; } +static int tsdbCheckAndDecodeColumnData(SDataCol *pDataCol, char *content, int32_t len, int8_t comp, int numOfPoints, + int maxPoints, char *buffer, int bufferSize) { + // Verify by checksum + if (!taosCheckChecksumWhole((uint8_t *)content, len)) return -1; + + // Decode the data + if (comp) { + // // Need to decompress + pDataCol->len = (*(tDataTypeDesc[pDataCol->type].decompFunc))( + content, len - sizeof(TSCKSUM), numOfPoints, pDataCol->pData, pDataCol->spaceSize, comp, buffer, bufferSize); + if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) { + pDataCol->len += (sizeof(int32_t) * maxPoints); + dataColSetOffset(pDataCol, numOfPoints); + } + } else { + // No need to decompress, just memcpy it + switch (pDataCol->type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + pDataCol->len = sizeof(int32_t) * maxPoints; + memcpy((char *)pDataCol->pData + pDataCol->len, content, len - sizeof(TSCKSUM)); + pDataCol->len += (len - sizeof(TSCKSUM)); + dataColSetOffset(pDataCol, numOfPoints); + break; + + default: + pDataCol->len = len - sizeof(TSCKSUM); + memcpy(pDataCol->pData, content, pDataCol->len); + break; + } + } + return 0; +} + /** * Interface to read the data of a sub-block OR the data of a super-block of which (numOfSubBlocks == 1) */ static int tsdbLoadBlockDataImpl(SRWHelper *pHelper, SCompBlock *pCompBlock, SDataCols *pDataCols) { ASSERT(pCompBlock->numOfSubBlocks <= 1); - SCompData *pCompData = (SCompData *)malloc(pCompBlock->len); - if (pCompData == NULL) return -1; + ASSERT(tsizeof(pHelper->blockBuffer) >= pCompBlock->len); + + SCompData *pCompData = (SCompData *)pHelper->blockBuffer; int fd = (pCompBlock->last) ? pHelper->files.lastF.fd : pHelper->files.dataF.fd; if (lseek(fd, pCompBlock->offset, SEEK_SET) < 0) goto _err; if (tread(fd, (void *)pCompData, pCompBlock->len) < pCompBlock->len) goto _err; ASSERT(pCompData->numOfCols == pCompBlock->numOfCols); - // TODO : check the checksum - size_t tsize = sizeof(SCompData) + sizeof(SCompCol) * pCompBlock->numOfCols + sizeof(TSCKSUM); + int32_t tsize = sizeof(SCompData) + sizeof(SCompCol) * pCompBlock->numOfCols + sizeof(TSCKSUM); if (!taosCheckChecksumWhole((uint8_t *)pCompData, tsize)) goto _err; - for (int i = 0; i < pCompData->numOfCols; i++) { - // TODO: check the data checksum - // if (!taosCheckChecksumWhole()) - } - - ASSERT(pCompBlock->numOfCols == pCompData->numOfCols); pDataCols->numOfPoints = pCompBlock->numOfPoints; - int ccol = 0, dcol = 0; - while (true) { - if (ccol >= pDataCols->numOfCols) { - // TODO: Fill rest NULL - break; + // Recover the data + int ccol = 0; + int dcol = 0; + while (dcol < pDataCols->numOfCols) { + SDataCol *pDataCol = &(pDataCols->cols[dcol]); + if (ccol >= pCompData->numOfCols) { + // Set current column as NULL and forward + dataColSetNEleNull(pDataCol, pCompBlock->numOfPoints, pDataCols->maxPoints); + dcol++; + continue; } - if (dcol >= pCompData->numOfCols) break; SCompCol *pCompCol = &(pCompData->cols[ccol]); - SDataCol *pDataCol = &(pDataCols->cols[dcol]); if (pCompCol->colId == pDataCol->colId) { - // TODO: uncompress - memcpy(pDataCol->pData, (void *)(((char *)pCompData) + tsize + pCompCol->offset), pCompCol->len); - ccol++; - dcol++; - } else if (pCompCol->colId > pDataCol->colId) { - // TODO: Fill NULL + if (pCompBlock->algorithm == TWO_STAGE_COMP) { + pHelper->compBuffer = trealloc(pHelper->compBuffer, pCompCol->len + COMP_OVERFLOW_BYTES); + if (pHelper->compBuffer == NULL) goto _err; + } + if (tsdbCheckAndDecodeColumnData(pDataCol, (char *)pCompData + tsize + pCompCol->offset, pCompCol->len, + pCompBlock->algorithm, pCompBlock->numOfPoints, pDataCols->maxPoints, + pHelper->compBuffer, tsizeof(pHelper->compBuffer)) < 0) + goto _err; dcol++; - } else { ccol++; + } else if (pCompCol->colId < pDataCol->colId) { + ccol++; + } else { + // Set current column as NULL and forward + dataColSetNEleNull(pDataCol, pCompBlock->numOfPoints, pDataCols->maxPoints); + dcol++; } } - tfree(pCompData); return 0; _err: - tfree(pCompData); return -1; } @@ -634,36 +677,6 @@ _err: return -1; } -// static int tsdbCheckHelperCfg(SHelperCfg *pCfg) { -// // TODO -// return 0; -// } - -// static void tsdbClearHelperFile(SHelperFile *pHFile) { -// pHFile->fid = -1; -// if (pHFile->headF.fd > 0) { -// close(pHFile->headF.fd); -// pHFile->headF.fd = -1; -// } -// if (pHFile->dataF.fd > 0) { -// close(pHFile->dataF.fd); -// pHFile->dataF.fd = -1; -// } -// if (pHFile->lastF.fd > 0) { -// close(pHFile->lastF.fd); -// pHFile->lastF.fd = -1; -// } -// if (pHFile->nHeadF.fd > 0) { -// close(pHFile->nHeadF.fd); -// pHFile->nHeadF.fd = -1; -// } -// if (pHFile->nLastF.fd > 0) { -// close(pHFile->nLastF.fd); -// pHFile->nLastF.fd = -1; -// } - -// } - static bool tsdbShouldCreateNewLast(SRWHelper *pHelper) { ASSERT(pHelper->files.lastF.fd > 0); struct stat st; @@ -677,81 +690,94 @@ static int tsdbWriteBlockToFile(SRWHelper *pHelper, SFile *pFile, SDataCols *pDa ASSERT(rowsToWrite > 0 && rowsToWrite <= pDataCols->numOfPoints && rowsToWrite <= pHelper->config.maxRowsPerFileBlock); - SCompData *pCompData = NULL; + SCompData *pCompData = (SCompData *)(pHelper->blockBuffer); int64_t offset = 0; offset = lseek(pFile->fd, 0, SEEK_END); if (offset < 0) goto _err; - pCompData = (SCompData *)malloc(sizeof(SCompData) + sizeof(SCompCol) * pDataCols->numOfCols + sizeof(TSCKSUM)); - if (pCompData == NULL) goto _err; - int nColsNotAllNull = 0; - int32_t toffset = 0; for (int ncol = 0; ncol < pDataCols->numOfCols; ncol++) { SDataCol *pDataCol = pDataCols->cols + ncol; SCompCol *pCompCol = pCompData->cols + nColsNotAllNull; - if (0) { - // TODO: all data to commit are NULL + if (isNEleNull(pDataCol, rowsToWrite)) { + // all data to commit are NULL, just ignore it continue; } - // Compress the data here - { - // TODO - } - pCompCol->colId = pDataCol->colId; pCompCol->type = pDataCol->type; - pCompCol->len = TYPE_BYTES[pCompCol->type] * rowsToWrite; // TODO: change it - pCompCol->offset = toffset; nColsNotAllNull++; - - toffset += pCompCol->len; } ASSERT(nColsNotAllNull > 0 && nColsNotAllNull <= pDataCols->numOfCols); - pCompData->delimiter = TSDB_FILE_DELIMITER; - pCompData->uid = pHelper->tableInfo.uid; - pCompData->numOfCols = nColsNotAllNull; - - // Write SCompData + SCompCol part - size_t tsize = sizeof(SCompData) + sizeof(SCompCol) * nColsNotAllNull + sizeof(TSCKSUM); - taosCalcChecksumAppend(0, (uint8_t *)pCompData, tsize); - if (twrite(pFile->fd, (void *)pCompData, tsize) < tsize) goto _err; - // Write true data part - int nCompCol = 0; + // Compress the data if neccessary + int tcol = 0; + int32_t toffset = 0; + int32_t tsize = sizeof(SCompData) + sizeof(SCompCol) * nColsNotAllNull + sizeof(TSCKSUM); + int32_t lsize = tsize; for (int ncol = 0; ncol < pDataCols->numOfCols; ncol++) { - ASSERT(nCompCol < nColsNotAllNull); + if (tcol >= nColsNotAllNull) break; SDataCol *pDataCol = pDataCols->cols + ncol; - SCompCol *pCompCol = pCompData->cols + nCompCol; + SCompCol *pCompCol = pCompData->cols + tcol; - if (pDataCol->colId == pCompCol->colId) { - if (twrite(pFile->fd, (void *)(pDataCol->pData), pCompCol->len) < pCompCol->len) goto _err; - tsize += pCompCol->len; - nCompCol++; + if (pDataCol->colId != pCompCol->colId) continue; + void *tptr = (void *)((char *)pCompData + lsize); + + pCompCol->offset = toffset; + + int32_t tlen = dataColGetNEleLen(pDataCol, rowsToWrite); + + if (pHelper->config.compress) { + if (pHelper->config.compress == TWO_STAGE_COMP) { + pHelper->compBuffer = trealloc(pHelper->compBuffer, tlen + COMP_OVERFLOW_BYTES); + if (pHelper->compBuffer == NULL) goto _err; + } + + pCompCol->len = (*(tDataTypeDesc[pDataCol->type].compFunc))( + (char *)pDataCol->pData, tlen, rowsToWrite, tptr, tsizeof(pHelper->blockBuffer) - lsize, + pHelper->config.compress, pHelper->compBuffer, tsizeof(pHelper->compBuffer)); + } else { + pCompCol->len = tlen; + memcpy(tptr, pDataCol->pData, pCompCol->len); } + + // Add checksum + pCompCol->len += sizeof(TSCKSUM); + taosCalcChecksumAppend(0, (uint8_t *)tptr, pCompCol->len); + + toffset += pCompCol->len; + lsize += pCompCol->len; + tcol++; } + pCompData->delimiter = TSDB_FILE_DELIMITER; + pCompData->uid = pHelper->tableInfo.uid; + pCompData->numOfCols = nColsNotAllNull; + + taosCalcChecksumAppend(0, (uint8_t *)pCompData, tsize); + + // Write the whole block to file + if (twrite(pFile->fd, (void *)pCompData, lsize) < lsize) goto _err; + + // Update pCompBlock membership vairables pCompBlock->last = isLast; pCompBlock->offset = offset; pCompBlock->algorithm = pHelper->config.compress; pCompBlock->numOfPoints = rowsToWrite; pCompBlock->sversion = pHelper->tableInfo.sversion; - pCompBlock->len = (int32_t)tsize; + pCompBlock->len = (int32_t)lsize; pCompBlock->numOfSubBlocks = isSuperBlock ? 1 : 0; pCompBlock->numOfCols = nColsNotAllNull; pCompBlock->keyFirst = dataColsKeyFirst(pDataCols); pCompBlock->keyLast = dataColsKeyAt(pDataCols, rowsToWrite - 1); - tfree(pCompData); return 0; _err: - tfree(pCompData); return -1; } @@ -782,7 +808,7 @@ static int tsdbMergeDataWithBlock(SRWHelper *pHelper, int blkIdx, SDataCols *pDa TSKEY keyFirst = dataColsKeyFirst(pDataCols); SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx < pIdx->numOfSuperBlocks); + ASSERT(blkIdx < pIdx->numOfBlocks); // SCompBlock *pCompBlock = pHelper->pCompInfo->blocks + blkIdx; ASSERT(blockAtIdx(pHelper, blkIdx)->numOfSubBlocks >= 1); @@ -790,7 +816,7 @@ static int tsdbMergeDataWithBlock(SRWHelper *pHelper, int blkIdx, SDataCols *pDa // ASSERT(compareKeyBlock((void *)&keyFirst, (void *)pCompBlock) == 0); if (keyFirst > blockAtIdx(pHelper, blkIdx)->keyLast) { // Merge with the last block by append - ASSERT(blockAtIdx(pHelper, blkIdx)->numOfPoints < pHelper->config.minRowsPerFileBlock && blkIdx == pIdx->numOfSuperBlocks-1); + ASSERT(blockAtIdx(pHelper, blkIdx)->numOfPoints < pHelper->config.minRowsPerFileBlock && blkIdx == pIdx->numOfBlocks-1); int defaultRowsToWrite = pHelper->config.maxRowsPerFileBlock * 4 / 5; // TODO: make a interface rowsWritten = MIN((defaultRowsToWrite - blockAtIdx(pHelper, blkIdx)->numOfPoints), pDataCols->numOfPoints); @@ -961,7 +987,7 @@ static int tsdbAdjustInfoSizeIfNeeded(SRWHelper *pHelper, size_t esize) { static int tsdbInsertSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx) { SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx >= 0 && blkIdx <= pIdx->numOfSuperBlocks); + ASSERT(blkIdx >= 0 && blkIdx <= pIdx->numOfBlocks); ASSERT(pCompBlock->numOfSubBlocks == 1); // Adjust memory if no more room @@ -1004,7 +1030,7 @@ static int tsdbAddSubBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkId ASSERT(pCompBlock->numOfSubBlocks == 0); SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfSuperBlocks); + ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfBlocks); SCompBlock *pSCompBlock = pHelper->pCompInfo->blocks + blkIdx; ASSERT(pSCompBlock->numOfSubBlocks >= 1 && pSCompBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS); @@ -1088,7 +1114,7 @@ static int tsdbUpdateSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int SCompIdx *pIdx = pHelper->pCompIdx + pHelper->tableInfo.tid; - ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfSuperBlocks); + ASSERT(blkIdx >= 0 && blkIdx < pIdx->numOfBlocks); SCompBlock *pSCompBlock = pHelper->pCompInfo->blocks + blkIdx; diff --git a/src/tsdb/tests/tsdbTests.cpp b/src/tsdb/tests/tsdbTests.cpp index 84711b07f866017dd518120976febe5daa68109e..c7ed6fcae11eb3c86c4728c4fd980a10638c16f7 100644 --- a/src/tsdb/tests/tsdbTests.cpp +++ b/src/tsdb/tests/tsdbTests.cpp @@ -27,7 +27,7 @@ typedef struct { static int insertData(SInsertInfo *pInfo) { SSubmitMsg *pMsg = - (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + tdMaxRowBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit); + (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + dataRowMaxBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit); if (pMsg == NULL) return -1; TSKEY start_time = pInfo->startTime; @@ -52,11 +52,12 @@ static int insertData(SInsertInfo *pInfo) { tdInitDataRow(row, pInfo->pSchema); for (int j = 0; j < schemaNCols(pInfo->pSchema); j++) { + STColumn *pTCol = schemaColAt(pInfo->pSchema, j); if (j == 0) { // Just for timestamp - tdAppendColVal(row, (void *)(&start_time), schemaColAt(pInfo->pSchema, j)); + tdAppendColVal(row, (void *)(&start_time), pTCol->type, pTCol->bytes, pTCol->offset); } else { // For int int val = 10; - tdAppendColVal(row, (void *)(&val), schemaColAt(pInfo->pSchema, j)); + tdAppendColVal(row, (void *)(&val), pTCol->type, pTCol->bytes, pTCol->offset); } } pBlock->len += dataRowLen(row); @@ -105,9 +106,9 @@ TEST(TsdbTest, DISABLED_tableEncodeDecode) { for (int i = 0; i < nCols; i++) { if (i == 0) { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); } else { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_INT, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_INT, i, -1); } } @@ -149,9 +150,9 @@ TEST(TsdbTest, createRepo) { for (int i = 0; i < nCols; i++) { if (i == 0) { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_TIMESTAMP, i, -1); } else { - tdSchemaAppendCol(schema, TSDB_DATA_TYPE_INT, i, -1); + tdSchemaAddCol(schema, TSDB_DATA_TYPE_INT, i, -1); } } @@ -244,7 +245,7 @@ TEST(TsdbTest, DISABLED_openRepo) { // tsdbLoadCompCols(&pGroup->files[TSDB_FILE_TYPE_DATA], pBlock, (void *)pCompData); // STable *pTable = tsdbGetTableByUid(pRepo->tsdbMeta, pCompData->uid); - // SDataCols *pDataCols = tdNewDataCols(tdMaxRowBytesFromSchema(tsdbGetTableSchema(pRepo->tsdbMeta, pTable)), 5, 10); + // SDataCols *pDataCols = tdNewDataCols(tdMaxRowBytesFromSchema(tsdbGetTableSchema(pRepo->tsdbMeta, pTable)), 5); // tdInitDataCols(pDataCols, tsdbGetTableSchema(pRepo->tsdbMeta, pTable)); // tsdbLoadDataBlock(&pGroup->files[TSDB_FILE_TYPE_DATA], pBlock, 1, pDataCols, pCompData); diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index a80e81f09fd48e45520bdb5ce2e9851561fd39e9..d4350fc8b250541aa8eed3d7686fd3363734442e 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -11,7 +11,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lz4/inc) AUX_SOURCE_DIRECTORY(src SRC) ADD_LIBRARY(tutil ${SRC}) - TARGET_LINK_LIBRARIES(tutil pthread os m rt) + TARGET_LINK_LIBRARIES(tutil pthread os m rt lz4) FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/) IF (ICONV_INCLUDE_EXIST) ADD_DEFINITIONS(-DUSE_LIBICONV) @@ -68,7 +68,7 @@ ELSEIF (TD_WINDOWS_64) LIST(APPEND SRC ./src/tutil.c) LIST(APPEND SRC ./src/version.c) ADD_LIBRARY(tutil ${SRC}) - TARGET_LINK_LIBRARIES(tutil iconv regex pthread os winmm IPHLPAPI ws2_32) + TARGET_LINK_LIBRARIES(tutil iconv regex pthread os winmm IPHLPAPI ws2_32 lz4) ELSEIF(TD_DARWIN_64) ADD_DEFINITIONS(-DUSE_LIBICONV) LIST(APPEND SRC ./src/hash.c) @@ -105,7 +105,7 @@ ELSEIF(TD_DARWIN_64) LIST(APPEND SRC ./src/version.c) LIST(APPEND SRC ./src/hash.c) ADD_LIBRARY(tutil ${SRC}) - TARGET_LINK_LIBRARIES(tutil iconv pthread os) + TARGET_LINK_LIBRARIES(tutil iconv pthread os lz4) ENDIF() # TARGET_LINK_LIBRARIES(tutil mstorage) diff --git a/src/util/inc/tcache.h b/src/util/inc/tcache.h index a29e720e67904b5ffbc32a575ccb86dd0ccdbabb..2e26f8f0e3f83a4a2d315b9dafc262e8ace4ba7a 100644 --- a/src/util/inc/tcache.h +++ b/src/util/inc/tcache.h @@ -69,6 +69,7 @@ typedef struct { SHashObj * pHashTable; int numOfElemsInTrash; // number of element in trash int16_t deleting; // set the deleting flag to stop refreshing ASAP. + T_REF_DECLARE() #if defined(LINUX) pthread_rwlock_t lock; diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h index 55e282296fac6d179580c53f5384136f2ef290c5..9398ff82439445692b2e1c90041fd0595bbc27c7 100644 --- a/src/util/inc/tscompression.h +++ b/src/util/inc/tscompression.h @@ -21,7 +21,9 @@ extern "C" { #endif #include "taosdef.h" +#include "tutil.h" +#define COMP_OVERFLOW_BYTES 2 #define BITS_PER_BYTE 8 // Masks #define INT64MASK(_x) ((1ul << _x) - 1) @@ -32,43 +34,220 @@ extern "C" { #define ONE_STAGE_COMP 1 #define TWO_STAGE_COMP 2 -int tsCompressTinyint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorithm, - char* const buffer, int bufferSize); -int tsCompressSmallint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressInt(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressBigint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressBool(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorithm, - char* const buffer, int bufferSize); -int tsCompressString(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressFloat(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressDouble(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); -int tsCompressTimestamp(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith, - char* const buffer, int bufferSize); - -int tsDecompressTinyint(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressSmallint(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressInt(const char* const input, int compressedSize, const int nelements, char* const output, int outputSize, - char algorithm, char* const buffer, int bufferSize); -int tsDecompressBigint(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressBool(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressString(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressFloat(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); -int tsDecompressDouble(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorith, char* const buffer, int bufferSize); -int tsDecompressTimestamp(const char* const input, int compressedSize, const int nelements, char* const output, - int outputSize, char algorithm, char* const buffer, int bufferSize); +extern int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type); +extern int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type); +extern int tsCompressBoolImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressBoolImp(const char *const input, const int nelements, char *const output); +extern int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize); +extern int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize); +extern int tsCompressTimestampImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output); +extern int tsCompressDoubleImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output); +extern int tsCompressFloatImp(const char *const input, const int nelements, char *const output); +extern int tsDecompressFloatImp(const char *const input, const int nelements, char *const output); + +static FORCE_INLINE int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, + char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, + char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, + char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressBoolImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressBoolImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressBoolImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressBoolImp(buffer, nelements, output); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + return tsCompressStringImp(input, inputSize, output, outputSize); +} + +static FORCE_INLINE int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + return tsDecompressStringImp(input, compressedSize, output, outputSize); +} + +static FORCE_INLINE int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressFloatImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressFloatImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressFloatImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressFloatImp(buffer, nelements, output); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressDoubleImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressDoubleImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressDoubleImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressDoubleImp(buffer, nelements, output); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, + char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsCompressTimestampImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + int len = tsCompressTimestampImp(input, nelements, buffer); + return tsCompressStringImp(buffer, len, output, outputSize); + } else { + assert(0); + } +} + +static FORCE_INLINE int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output, + int outputSize, char algorithm, char *const buffer, int bufferSize) { + if (algorithm == ONE_STAGE_COMP) { + return tsDecompressTimestampImp(input, nelements, output); + } else if (algorithm == TWO_STAGE_COMP) { + tsDecompressStringImp(input, compressedSize, buffer, bufferSize); + return tsDecompressTimestampImp(buffer, nelements, output); + } else { + assert(0); + } +} #ifdef __cplusplus } diff --git a/src/util/inc/tsocket.h b/src/util/inc/tsocket.h index 60d339fa5c3dffb4011937679acec7c592bfb4dc..309aa80ef6c0ae4e04d20e72ebb0d91835bcb66d 100644 --- a/src/util/inc/tsocket.h +++ b/src/util/inc/tsocket.h @@ -33,10 +33,6 @@ int taosOpenTcpServerSocket(uint32_t ip, uint16_t port); int taosKeepTcpAlive(int sockFd); void taosCloseTcpSocket(int sockFd); -int taosOpenUDServerSocket(uint32_t ip, uint16_t port); -int taosOpenUDClientSocket(uint32_t ip, uint16_t port); -int taosOpenRawSocket(uint32_t ip); - int taosGetFqdn(char *); uint32_t taosGetIpFromFqdn(const char *); void tinet_ntoa(char *ipstr, unsigned int ip); diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h index 68d4b80bc01c569d5b4767bfe247a4490ab61bf5..d272910abf7f8115a99101aa05e8c7b116c6f18a 100644 --- a/src/util/inc/tutil.h +++ b/src/util/inc/tutil.h @@ -44,7 +44,10 @@ extern "C" { #define tclose(x) taosCloseSocket(x) -#ifdef ASSERTION +// Pointer p drift right by b bytes +#define POINTER_DRIFT(p, b) ((void *)((char *)(p) + (b))) + +#ifndef NDEBUG #define ASSERT(x) assert(x) #else #define ASSERT(x) diff --git a/src/util/src/hash.c b/src/util/src/hash.c index 05a99903ba7fd25646c23c46c92fb82b1798c6a1..37e8123170b4a88f234d2bdc98735b46b2061b1a 100644 --- a/src/util/src/hash.c +++ b/src/util/src/hash.c @@ -520,8 +520,8 @@ SHashMutableIterator *taosHashCreateIter(SHashObj *pHashObj) { static SHashNode *getNextHashNode(SHashMutableIterator *pIter) { assert(pIter != NULL); - pIter->entryIndex += 1; - + + pIter->entryIndex++; while (pIter->entryIndex < pIter->pHashObj->capacity) { SHashEntry *pEntry = pIter->pHashObj->hashList[pIter->entryIndex]; if (pEntry->next == NULL) { diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c index e1e76173e62333fa3f4a4b5b6b0f019668242b39..71ce472bd874809db715bdfbe2dccb74b3d8d7ea 100644 --- a/src/util/src/tcache.c +++ b/src/util/src/tcache.c @@ -324,13 +324,26 @@ static void doCleanupDataCache(SCacheObj *pCacheObj) { static void taosCacheRefresh(void *handle, void *tmrId) { SCacheObj *pCacheObj = (SCacheObj *)handle; - if (pCacheObj == NULL || taosHashGetSize(pCacheObj->pHashTable) == 0) { + if (pCacheObj == NULL || T_REF_VAL_GET(pCacheObj) == 0) { uTrace("object is destroyed. no refresh retry"); return; } - if (pCacheObj->deleting == 1) { - doCleanupDataCache(pCacheObj); + int16_t ref = T_REF_INC(pCacheObj); + if (ref == 1) { + T_REF_DEC(pCacheObj); + return; + } + + // todo add the ref before start the timer + int32_t num = taosHashGetSize(pCacheObj->pHashTable); + if (num == 0) { + ref = T_REF_DEC(pCacheObj); + if (ref == 0) { + doCleanupDataCache(pCacheObj); + } else { + taosTmrReset(taosCacheRefresh, pCacheObj->refreshTime, pCacheObj, pCacheObj->tmrCtrl, &pCacheObj->pTimer); + } return; } @@ -355,13 +368,16 @@ static void taosCacheRefresh(void *handle, void *tmrId) { __cache_unlock(pCacheObj); taosHashDestroyIter(pIter); - - if (pCacheObj->deleting == 1) { // clean up resources and abort - doCleanupDataCache(pCacheObj); - } else { + taosTrashEmpty(pCacheObj, false); - taosTmrReset(taosCacheRefresh, pCacheObj->refreshTime, pCacheObj, pCacheObj->tmrCtrl, &pCacheObj->pTimer); - } + + ref = T_REF_DEC(pCacheObj); + if (ref == 0) { + doCleanupDataCache(pCacheObj); + return; + } else { + taosTmrReset(taosCacheRefresh, pCacheObj->refreshTime, pCacheObj, pCacheObj->tmrCtrl, &pCacheObj->pTimer); + } } SCacheObj *taosCacheInit(void *tmrCtrl, int64_t refreshTime) { @@ -399,6 +415,7 @@ SCacheObj *taosCacheInit(void *tmrCtrl, int64_t refreshTime) { return NULL; } + T_REF_INC(pCacheObj); return pCacheObj; } @@ -552,5 +569,8 @@ void taosCacheCleanup(SCacheObj *pCacheObj) { return; } - pCacheObj->deleting = 1; + int32_t ref = T_REF_DEC(pCacheObj); + if (ref == 0) { + doCleanupDataCache(pCacheObj); + } } diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c index 24a53b3fe49a555cf24c605cda4e7c4041086ce8..e3b3d65052e4d34c9c424b565d084ae123efcac0 100644 --- a/src/util/src/tcompression.c +++ b/src/util/src/tcompression.c @@ -56,223 +56,6 @@ const int TEST_NUMBER = 1; #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0) #define SIMPLE8B_MAX_INT64 ((uint64_t)2305843009213693951L) -// Function declarations -int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type); -int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type); -int tsCompressBoolImp(const char *const input, const int nelements, char *const output); -int tsDecompressBoolImp(const char *const input, const int nelements, char *const output); -int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize); -int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize); -int tsCompressTimestampImp(const char *const input, const int nelements, char *const output); -int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output); -int tsCompressDoubleImp(const char *const input, const int nelements, char *const output); -int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output); -int tsCompressFloatImp(const char *const input, const int nelements, char *const output); -int tsDecompressFloatImp(const char *const input, const int nelements, char *const output); - -/* ----------------------------------------------Compression function used by - * others ---------------------------------------------- */ -int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, - char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT); - } else { - assert(0); - } -} - -int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, - char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT); - } else { - assert(0); - } -} - -int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm, - char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT); - } else { - assert(0); - } -} - -int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT); - } else { - assert(0); - } -} - -int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressBoolImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressBoolImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressBoolImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressBoolImp(buffer, nelements, output); - } else { - assert(0); - } -} - -int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - return tsCompressStringImp(input, inputSize, output, outputSize); -} - -int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - return tsDecompressStringImp(input, compressedSize, output, outputSize); -} - -int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressFloatImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressFloatImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressFloatImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressFloatImp(buffer, nelements, output); - } else { - assert(0); - } -} -int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressDoubleImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressDoubleImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressDoubleImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressDoubleImp(buffer, nelements, output); - } else { - assert(0); - } -} - -int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, - char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsCompressTimestampImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - int len = tsCompressTimestampImp(input, nelements, buffer); - return tsCompressStringImp(buffer, len, output, outputSize); - } else { - assert(0); - } -} - -int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output, - int outputSize, char algorithm, char *const buffer, int bufferSize) { - if (algorithm == ONE_STAGE_COMP) { - return tsDecompressTimestampImp(input, nelements, output); - } else if (algorithm == TWO_STAGE_COMP) { - tsDecompressStringImp(input, compressedSize, buffer, bufferSize); - return tsDecompressTimestampImp(buffer, nelements, output); - } else { - assert(0); - } -} - bool safeInt64Add(int64_t a, int64_t b) { if ((a > 0 && b > INT64_MAX - a) || (a < 0 && b < INT64_MIN - a)) return false; return true; diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c index 9fe306921d9c4256844b71556c2129b9a2645f2e..c665ef9679fc0d830ea105512e5b3da5b8d07678 100644 --- a/src/util/src/tsocket.c +++ b/src/util/src/tsocket.c @@ -14,7 +14,6 @@ */ #include "os.h" -#include "tglobal.h" #include "tulog.h" #include "tsocket.h" #include "tutil.h" @@ -26,8 +25,13 @@ int taosGetFqdn(char *fqdn) { struct hostent* h; h = gethostbyname(hostname); - strcpy(fqdn, h->h_name); - return 0; + if (h != NULL) { + strcpy(fqdn, h->h_name); + return 0; + } else { + uError("failed to get host name"); + return -1; + } } uint32_t taosGetIpFromFqdn(const char *fqdn) { @@ -394,38 +398,6 @@ int taosOpenTcpServerSocket(uint32_t ip, uint16_t port) { return sockFd; } -int taosOpenRawSocket(uint32_t ip) { - int fd, hold; - struct sockaddr_in rawAdd; - - uTrace("open udp raw socket:%s", ip); - - fd = (int)socket(AF_INET, SOCK_RAW, IPPROTO_UDP); - if (fd < 0) { - uError("failed to open raw socket: %d (%s)", errno, strerror(errno)); - return -1; - } - - hold = 1; - if (taosSetSockOpt(fd, IPPROTO_IP, IP_HDRINCL, (void *)&hold, sizeof(hold)) < 0) { - uError("failed to set hold option: %d (%s)", errno, strerror(errno)); - close(fd); - return -1; - } - - bzero((char *)&rawAdd, sizeof(rawAdd)); - rawAdd.sin_family = AF_INET; - rawAdd.sin_addr.s_addr = ip; - - if (bind(fd, (struct sockaddr *)&rawAdd, sizeof(rawAdd)) < 0) { - uError("failed to bind RAW socket:(%s)", strerror(errno)); - close(fd); - return -1; - } - - return fd; -} - void tinet_ntoa(char *ipstr, unsigned int ip) { sprintf(ipstr, "%d.%d.%d.%d", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, ip >> 24); } diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c index 47d66a066e17f47ee31da8896e3b320ce8d7ac49..707d6741f78ac40e500d6168e7925b8fbc836bce 100644 --- a/src/util/src/tutil.c +++ b/src/util/src/tutil.c @@ -686,4 +686,4 @@ void taosRemoveDir(char *rootDir) { rmdir(rootDir); uPrint("dir:%s is removed", rootDir); -} \ No newline at end of file +} diff --git a/src/util/tests/CMakeLists.txt b/src/util/tests/CMakeLists.txt index 9f66eba37a3eccf68b7f0b584eb9a28fc0dfcd1d..24098aabc68eace4af899a0f5af0546f2746c498 100644 --- a/src/util/tests/CMakeLists.txt +++ b/src/util/tests/CMakeLists.txt @@ -10,6 +10,7 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR) INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) - ADD_EXECUTABLE(utilTest ${SOURCE_LIST}) +# ADD_EXECUTABLE(utilTest ${SOURCE_LIST}) + ADD_EXECUTABLE(utilTest hashTest.cpp cacheTest.cpp) TARGET_LINK_LIBRARIES(utilTest tutil common gtest pthread) ENDIF() \ No newline at end of file diff --git a/src/util/tests/cacheTest.cpp b/src/util/tests/cacheTest.cpp index 13fb7d7afbdcd669bf107f5869ff7842b34ceee0..b636bcfac0c1252d087f570b0c99a2a2f7ec812b 100644 --- a/src/util/tests/cacheTest.cpp +++ b/src/util/tests/cacheTest.cpp @@ -25,7 +25,7 @@ TEST(testCase, client_cache_test) { const char* key1 = "test1"; char data1[] = "test11"; - char* cachedObj = (char*) taosCachePut(tscCacheHandle, key1, data1, strlen(data1), 1); + char* cachedObj = (char*) taosCachePut(tscCacheHandle, key1, data1, strlen(data1)+1, 1); sleep(REFRESH_TIME_IN_SEC+1); printf("obj is still valid: %s\n", cachedObj); @@ -34,19 +34,17 @@ TEST(testCase, client_cache_test) { taosCacheRelease(tscCacheHandle, (void**) &cachedObj, false); /* the object is cleared by cache clean operation */ - cachedObj = (char*) taosCachePut(tscCacheHandle, key1, data2, strlen(data2), 20); + cachedObj = (char*) taosCachePut(tscCacheHandle, key1, data2, strlen(data2)+1, 20); printf("after updated: %s\n", cachedObj); printf("start to remove data from cache\n"); taosCacheRelease(tscCacheHandle, (void**) &cachedObj, false); printf("end of removing data from cache\n"); - getchar(); - const char* key3 = "test2"; const char* data3 = "kkkkkkk"; - char* cachedObj2 = (char*) taosCachePut(tscCacheHandle, key3, data3, strlen(data3), 1); + char* cachedObj2 = (char*) taosCachePut(tscCacheHandle, key3, data3, strlen(data3) + 1, 1); printf("%s\n", cachedObj2); taosCacheRelease(tscCacheHandle, (void**) &cachedObj2, false); @@ -57,18 +55,18 @@ TEST(testCase, client_cache_test) { char key5[] = "test5"; char data5[] = "data5kkkkk"; - cachedObj2 = (char*) taosCachePut(tscCacheHandle, key5, data5, strlen(data5), 20); + cachedObj2 = (char*) taosCachePut(tscCacheHandle, key5, data5, strlen(data5) + 1, 20); const char* data6= "new Data after updated"; taosCacheRelease(tscCacheHandle, (void**) &cachedObj2, false); - cachedObj2 = (char*) taosCachePut(tscCacheHandle, key5, data6, strlen(data6), 20); + cachedObj2 = (char*) taosCachePut(tscCacheHandle, key5, data6, strlen(data6) + 1, 20); printf("%s\n", cachedObj2); taosCacheRelease(tscCacheHandle, (void**) &cachedObj2, true); const char* data7 = "add call update procedure"; - cachedObj2 = (char*) taosCachePut(tscCacheHandle, key5, data7, strlen(data7), 20); + cachedObj2 = (char*) taosCachePut(tscCacheHandle, key5, data7, strlen(data7) + 1, 20); printf("%s\n=======================================\n\n", cachedObj2); char* cc = (char*) taosCacheAcquireByName(tscCacheHandle, key5); @@ -137,6 +135,4 @@ TEST(testCase, cache_resize_test) { printf("retrieve %d object cost:%" PRIu64 " us,avg:%f\n", num, endTime - startTime, (endTime - startTime)/(double)num); taosCacheCleanup(pCache); - taosMsleep(20000); - getchar(); } \ No newline at end of file diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 2e31b72e8b7eb34f8b98e24d87c5556181a20057..1302ceaff4bd814e163b6048a50b98d90d7f8754 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -96,14 +96,16 @@ int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) { } STsdbCfg tsdbCfg = {0}; - tsdbCfg.precision = pVnodeCfg->cfg.precision; - tsdbCfg.compression = pVnodeCfg->cfg.compression;; tsdbCfg.tsdbId = pVnodeCfg->cfg.vgId; + tsdbCfg.cacheBlockSize = pVnodeCfg->cfg.cacheBlockSize; + tsdbCfg.totalBlocks = pVnodeCfg->cfg.totalBlocks; tsdbCfg.maxTables = pVnodeCfg->cfg.maxTables; tsdbCfg.daysPerFile = pVnodeCfg->cfg.daysPerFile; + tsdbCfg.keep = pVnodeCfg->cfg.daysToKeep; tsdbCfg.minRowsPerFileBlock = pVnodeCfg->cfg.minRowsPerFileBlock; tsdbCfg.maxRowsPerFileBlock = pVnodeCfg->cfg.maxRowsPerFileBlock; - tsdbCfg.keep = pVnodeCfg->cfg.daysToKeep; + tsdbCfg.precision = pVnodeCfg->cfg.precision; + tsdbCfg.compression = pVnodeCfg->cfg.compression;; char tsdbDir[TSDB_FILENAME_LEN] = {0}; sprintf(tsdbDir, "%s/vnode%d/tsdb", tsVnodeDir, pVnodeCfg->cfg.vgId); diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c index a7d1daf77752a99cd400c89d99e3ac72c13fe888..e5a5be4ed5ab5a22a0a850e0adbf07eb2434bc29 100644 --- a/src/vnode/src/vnodeWrite.c +++ b/src/vnode/src/vnodeWrite.c @@ -123,7 +123,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe STSchema *pDestSchema = tdNewSchema(numOfColumns); for (int i = 0; i < numOfColumns; i++) { - tdSchemaAppendCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetSchema(&tCfg, pDestSchema, false); tsdbTableSetName(&tCfg, pTable->tableId, false); @@ -131,7 +131,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe if (numOfTags != 0) { STSchema *pDestTagSchema = tdNewSchema(numOfTags); for (int i = numOfColumns; i < totalCols; i++) { - tdSchemaAppendCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false); tsdbTableSetSName(&tCfg, pTable->superTableId, false); @@ -142,7 +142,8 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe SDataRow dataRow = tdNewDataRowFromSchema(pDestTagSchema); for (int i = 0; i < numOfTags; i++) { - tdAppendColVal(dataRow, pTagData + accumBytes, pDestTagSchema->columns + i); + STColumn *pTCol = schemaColAt(pDestSchema, i); + tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset); accumBytes += htons(pSchema[i + numOfColumns].bytes); } tsdbTableSetTagValue(&tCfg, dataRow, false); @@ -189,14 +190,14 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet STSchema *pDestSchema = tdNewSchema(numOfColumns); for (int i = 0; i < numOfColumns; i++) { - tdSchemaAppendCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetSchema(&tCfg, pDestSchema, false); if (numOfTags != 0) { STSchema *pDestTagSchema = tdNewSchema(numOfTags); for (int i = numOfColumns; i < totalCols; i++) { - tdSchemaAppendCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); + tdSchemaAddCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)); } tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false); @@ -205,7 +206,8 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet SDataRow dataRow = tdNewDataRowFromSchema(pDestTagSchema); for (int i = 0; i < numOfTags; i++) { - tdAppendColVal(dataRow, pTagData + accumBytes, pDestTagSchema->columns + i); + STColumn *pTCol = schemaColAt(pDestTagSchema, i); + tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset); accumBytes += htons(pSchema[i + numOfColumns].bytes); } tsdbTableSetTagValue(&tCfg, dataRow, false); diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh index 71d19df5c0d6dbecf2dbd693f80cfc04335507c3..af597fb6c53123da7eb514967a93cf4d7d162642 100755 --- a/tests/pytest/smoketest.sh +++ b/tests/pytest/smoketest.sh @@ -23,6 +23,17 @@ sleep 1 python3 ./test.py $1 -f insert/tinyint.py python3 ./test.py -s $1 sleep 1 + +python3 ./test.py $1 -f table/column_name.py +python3 ./test.py -s $1 +sleep 1 +python3 ./test.py $1 -f table/column_num.py +python3 ./test.py -s $1 +sleep 1 +python3 ./test.py $1 -f table/db_table.py +python3 ./test.py -s $1 +sleep 1 + python3 ./test.py $1 -f import_merge/importDataLastTO.py python3 ./test.py -s $1 sleep 1 diff --git a/tests/pytest/table/column_name.py b/tests/pytest/table/column_name.py new file mode 100644 index 0000000000000000000000000000000000000000..6c945646d50e0ab99293d6d78d4308488115fd4b --- /dev/null +++ b/tests/pytest/table/column_name.py @@ -0,0 +1,181 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + # TSIM: system sh/stop_dnodes.sh + # TSIM: + # TSIM: system sh/ip.sh -i 1 -s up + # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0 + # TSIM: system sh/exec.sh -n dnode1 -s start + # TSIM: + # TSIM: sleep 3000 + # TSIM: sql connect + # TSIM: + # TSIM: $i = 0 + # TSIM: $dbPrefix = lm_cm_db + # TSIM: $tbPrefix = lm_cm_tb + # TSIM: $db = $dbPrefix . $i + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: print =============== step1 + tdLog.info('=============== step1') + # TSIM: sql create database $db + # TSIM: sql use $db + # TSIM: + # TSIM: sql drop table dd -x step0 + tdLog.info('drop table dd -x step0') + tdSql.error('drop table dd') + # TSIM: return -1 + # TSIM: step0: + # TSIM: + # TSIM: sql create table $tb(ts timestamp, int) -x step1 + tdLog.info('create table tb(ts timestamp, int) -x step1') + tdSql.error('create table tb(ts timestamp, int)') + # TSIM: return -1 + # TSIM: step1: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step2 + tdLog.info('=============== step2') + # TSIM: sql create table $tb (ts timestamp, s int) + tdLog.info('create table tb (ts timestamp, s int)') + tdSql.execute('create table tb (ts timestamp, s int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step3 + tdLog.info('=============== step3') + # TSIM: sql create table $tb (ts timestamp, a0123456789 int) + tdLog.info('create table tb (ts timestamp, a0123456789 int)') + tdSql.execute('create table tb (ts timestamp, a0123456789 int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step4 + tdLog.info('=============== step4') + # TSIM: sql create table $tb (ts timestamp, + # a0123456789012345678901234567890123456789 int) + tdLog.info( + 'create table tb (ts timestamp, a0123456789012345678901234567890123456789 int)') + tdSql.execute( + 'create table tb (ts timestamp, a0123456789012345678901234567890123456789 int)') + # TSIM: sql drop table $tb + tdLog.info('drop table tb') + tdSql.execute('drop table tb') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step5 + tdLog.info('=============== step5') + # TSIM: sql create table $tb (ts timestamp, a0123456789 int) + tdLog.info('create table tb (ts timestamp, a0123456789 int)') + tdSql.execute('create table tb (ts timestamp, a0123456789 int)') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql insert into $tb values (now , 1) + tdLog.info("insert into tb values (now , 1)") + tdSql.execute("insert into tb values (now , 1)") + # TSIM: sql select * from $tb + tdLog.info('select * from tb') + tdSql.query('select * from tb') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop database $db + tdLog.info('drop database db') + tdSql.execute('drop database db') + # TSIM: sql show databases + tdLog.info('show databases') + tdSql.query('show databases') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: + # TSIM: + # TSIM: +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/table/column_num.py b/tests/pytest/table/column_num.py new file mode 100644 index 0000000000000000000000000000000000000000..fca5b01ac231d139d246e75055ce18c58bf14361 --- /dev/null +++ b/tests/pytest/table/column_num.py @@ -0,0 +1,178 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + # TSIM: system sh/stop_dnodes.sh + # TSIM: + # TSIM: system sh/ip.sh -i 1 -s up + # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + # TSIM: system sh/cfg.sh -n dnode1 -c commitLog -v 0 + # TSIM: system sh/exec.sh -n dnode1 -s start + # TSIM: + # TSIM: sleep 3000 + # TSIM: sql connect + # TSIM: + # TSIM: $i = 0 + # TSIM: $dbPrefix = lm_cn_db + # TSIM: $tbPrefix = lm_cn_tb + # TSIM: $db = $dbPrefix . $i + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: print =============== step1 + tdLog.info('=============== step1') + # TSIM: sql create database $db + # TSIM: sql use $db + # TSIM: + # TSIM: sql create table $tb() -x step1 + tdLog.info('create table tb() -x step1') + tdSql.error('create table tb()') + # TSIM: return -1 + # TSIM: step1: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step2 + tdLog.info('=============== step2') + # TSIM: sql create table $tb (ts timestamp) -x step2 + tdLog.info('create table tb (ts timestamp) -x step2') + tdSql.error('create table tb (ts timestamp) ') + # TSIM: return -1 + # TSIM: step2: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step3 + tdLog.info('=============== step3') + # TSIM: sql create table $tb (ts int) -x step3 + tdLog.info('create table tb (ts int) -x step3') + tdSql.error('create table tb (ts int) ') + # TSIM: return -1 + # TSIM: step3: + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step4 + tdLog.info('=============== step4') + # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 + # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 + # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, + # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 + # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, + # b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 + # int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, + # b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 + # int, b28 int,b29 int,b30 int,b31 int,b32 int) + tdLog.info('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)') + tdSql.execute('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: print =============== step5 + tdLog.info('=============== step5') + # TSIM: $i = 1 + # TSIM: $tb = $tbPrefix . $i + # TSIM: + # TSIM: sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 + # int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 + # int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, + # a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 + # int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, + # b4 int, b5 int) + tdLog.info('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)') + tdSql.execute('create table tb1 (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)') + # TSIM: + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 2 then + tdLog.info('tdSql.checkRow(2)') + tdSql.checkRows(2) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql insert into $tb values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 + # , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 + # , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37) + tdLog.info("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)") + tdSql.execute("insert into tb1 values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)") + # TSIM: sql select * from $tb + tdLog.info('select * from tb1') + tdSql.query('select * from tb1') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop table $tb + tdLog.info('drop table tb1') + tdSql.execute('drop table tb1') + # TSIM: sql show tables + tdLog.info('show tables') + tdSql.query('show tables') + # TSIM: if $rows != 1 then + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + # TSIM: return -1 + # TSIM: endi + # TSIM: + # TSIM: sql drop database $db + tdLog.info('drop database db') + tdSql.execute('drop database db') + # TSIM: sql show databases + tdLog.info('show databases') + tdSql.query('show databases') + # TSIM: if $rows != 0 then + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) + # TSIM: return -1 + # TSIM: endi +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/table/db_table.py b/tests/pytest/table/db_table.py new file mode 100644 index 0000000000000000000000000000000000000000..d4a8568375c0d467c195af924058c70c8bbc2ab7 --- /dev/null +++ b/tests/pytest/table/db_table.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + + def run(self): + tdSql.prepare() + + tdLog.info('=============== step1') + tdLog.info('=============== step2') + tdLog.info('create table tb (ts timestamp, speed int)') + tdSql.execute('create table tb (ts timestamp, speed int)') + tdLog.info('=============== step3') + tdLog.info("insert into tb values (now, 1)") + tdSql.execute("insert into tb values (now, 1)") + tdLog.info('=============== step4') + tdLog.info('select * from tb') + tdSql.query('select * from tb') + tdLog.info('tdSql.checkRow(1)') + tdSql.checkRows(1) + tdLog.info('tdSql.checkData(0, 1, 1)') + tdSql.checkData(0, 1, 1) + tdLog.info('=============== step5') + tdLog.info('describe tb') + tdSql.query('describe tb') + tdLog.info('=============== step6') + tdLog.info('drop database db') + tdSql.execute('drop database db') + tdLog.info('show databases') + tdSql.query('show databases') + tdLog.info('tdSql.checkRow(0)') + tdSql.checkRows(0) +# convert end + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/util/log.py b/tests/pytest/util/log.py index 97c8b2ef7f2d2b7b207aa632e07328beab06f440..bcd840999d324ad6cf605645b5cb58815efb9f1c 100644 --- a/tests/pytest/util/log.py +++ b/tests/pytest/util/log.py @@ -23,14 +23,14 @@ class TDLog: self.path = "" def info(self, info): - printf("%s %s" % (datetime.datetime.now(), info)) + print("%s %s" % (datetime.datetime.now(), info)) def sleep(self, sec): - printf("%s sleep %d seconds" % (datetime.datetime.now(), sec)) + print("%s sleep %d seconds" % (datetime.datetime.now(), sec)) time.sleep(sec) def debug(self, err): - printf("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err)) + print("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err)) def success(self, info): printf("\033[1;32m%s %s\033[0m" % (datetime.datetime.now(), info)) @@ -43,7 +43,7 @@ class TDLog: sys.exit(1) def printNoPrefix(self, info): - printf("\033[1;36m%s\033[0m" % (info)) + print("\033[1;36m%s\033[0m" % (info)) tdLog = TDLog() diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index aad021e3b526fb1ef46ad3b6b5918f035e63fd91..c9c2023ffeac5520a448150b12862dbd6d9964e5 100644 --- a/tests/script/basicSuite.sim +++ b/tests/script/basicSuite.sim @@ -1,8 +1,28 @@ ################################# +run general/db/basic1.sim +run general/db/basic2.sim +run general/db/basic3.sim +run general/db/basic4.sim +run general/db/basic5.sim -run general/db/testSuite.sim -run general/insert/testSuite.sim -run general/table/testSuite.sim -run general/user/basicSuite.sim +run general/table/basic1.sim +run general/table/basic2.sim +run general/table/basic3.sim +run general/table/column_num.sim +run general/table/column_name.sim +run general/table/bigint.sim +run general/table/bool.sim +run general/table/double.sim +run general/table/float.sim +run general/table/int.sim +run general/table/smallint.sim +run general/table/tinyint.sim +run general/table/db.table.sim + +run general/user/basic1.sim +run general/user/pass_alter.sim +run general/user/pass_len.sim +run general/user/user_create.sim +run general/user/user_len.sim ################################## diff --git a/tests/script/general/agg/fill.sim b/tests/script/general/agg/fill.sim index 4056b9ef20a0158edf81083f88fad95eb9eb4703..de579238b8badf577b1d57fd5d787d7a0e8ecc76 100644 --- a/tests/script/general/agg/fill.sim +++ b/tests/script/general/agg/fill.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/agg/stream.sim index a024ad9b809f933bfd61052bfc576c5044459b28..2217c39430f4fe35ba9412c98ab99ee19aa3c90e 100644 --- a/tests/script/general/agg/stream.sim +++ b/tests/script/general/agg/stream.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 print ========== step1 diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim index f9bac689fb43b1db17c3209d456f61a69e7a8275..52507b1992175cf538170db63c76174cebee2667 100644 --- a/tests/script/general/alter/cached_schema_after_alter.sim +++ b/tests/script/general/alter/cached_schema_after_alter.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim index be76aaa1c16a660c45e93f61ffad5921efaba3b5..1b77f997ac7e225689b31ed973c1f8df462baaac 100644 --- a/tests/script/general/alter/count.sim +++ b/tests/script/general/alter/count.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim index 0cf70c8549cd0f5c01cb7438c4365c23cc056bb0..7348cc919ee342b2897ab8bdf82b1890d9c7225b 100644 --- a/tests/script/general/alter/import.sim +++ b/tests/script/general/alter/import.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim index c58dce02037c279f4d09f7260272bca74810f34e..0daa9c6432c8db7e11102d47ee8ce8144ff39041 100644 --- a/tests/script/general/alter/insert1.sim +++ b/tests/script/general/alter/insert1.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim index d749ddefb540b2bcb52d6b608bfc54e75e3ba3c0..34f935a04b6cc3d2099cb88f84417513e59dd16a 100644 --- a/tests/script/general/alter/insert2.sim +++ b/tests/script/general/alter/insert2.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim index a58d25c5beb668def72457df16c2d7d69413acc1..defe8d0fc1e9201dd8b3f035dfbe524eb0ae523d 100644 --- a/tests/script/general/alter/metrics.sim +++ b/tests/script/general/alter/metrics.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim index 6a0e62a0bf9aee5ea4dccf947adcbda97ea6423c..34630f4805a92976910616b3f785bbaaaf9465cd 100644 --- a/tests/script/general/alter/table.sim +++ b/tests/script/general/alter/table.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/cache/cache_balance.sim b/tests/script/general/cache/cache_balance.sim index 1bc7d83e73929e381473bb654de89505e983f13d..b71e81023415081d4b4753e5db82a6e016e11370 100644 --- a/tests/script/general/cache/cache_balance.sim +++ b/tests/script/general/cache/cache_balance.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim index 6af54766b886696ff2d3ba771d3a8848525ed84f..18335b60957640fbdd76d2b64105b4bcf471da3d 100644 --- a/tests/script/general/cache/new_metrics.sim +++ b/tests/script/general/cache/new_metrics.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/new_stream.sim b/tests/script/general/cache/new_stream.sim index 38559cb9366745700166196a5db181b7bcb1520b..23904a021044652c308481bad21062909f41233e 100644 --- a/tests/script/general/cache/new_stream.sim +++ b/tests/script/general/cache/new_stream.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim index f4a607bf554feed0c542081cf48dd19a07b263a4..67d02722e21a8177a36a66408f753e60e906be68 100644 --- a/tests/script/general/cache/restart_metrics.sim +++ b/tests/script/general/cache/restart_metrics.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 @@ -47,7 +47,7 @@ endi print =============== step2 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/restart_stream.sim b/tests/script/general/cache/restart_stream.sim index 2f45f1873708704a3436e33561ef710c397f486e..b119dcf8567564f91e1a4895b2ee351363307e31 100644 --- a/tests/script/general/cache/restart_stream.sim +++ b/tests/script/general/cache/restart_stream.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1 @@ -97,7 +97,7 @@ endi print =============== step4 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1 diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim index d7c02116fdc78ac5375d5c77e84090a1cdb64f13..c973293fdc5f56a8b2dfe15a59ebef2dee09bb2a 100644 --- a/tests/script/general/cache/restart_table.sim +++ b/tests/script/general/cache/restart_table.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 @@ -35,7 +35,7 @@ endi print =============== step2 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim index 3bc5d4e06a1eafe93e06aade68600bf338302c20..3a46cc73e856201bf5f45df7680669f76f46b17a 100644 --- a/tests/script/general/column/commit.sim +++ b/tests/script/general/column/commit.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim index 94f5e6bb8a3410100c843db64049e757ebc0da01..119ab0108ce164279514915faccdfb81f894a95a 100644 --- a/tests/script/general/column/metrics.sim +++ b/tests/script/general/column/metrics.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/column/stream.sim b/tests/script/general/column/stream.sim index 5ea04db04b8e2aeaaf4398cf01e6cbdee2a1258c..6972e341970b49afe211006c2b349a5a41d631cd 100644 --- a/tests/script/general/column/stream.sim +++ b/tests/script/general/column/stream.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 print ========== step1 diff --git a/tests/script/general/column/table.sim b/tests/script/general/column/table.sim index 85e11f43f4b6c1674d3119d5057983d11faea929..e4f3bea4664f68179a9ff47da1420f7b8fd6561b 100644 --- a/tests/script/general/column/table.sim +++ b/tests/script/general/column/table.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim index 2323991044b985e22846ce26785f96b0ec314742..fdadfdac73cc98b8762f22b36e8002614b9e90c5 100644 --- a/tests/script/general/compress/commitlog.sim +++ b/tests/script/general/compress/commitlog.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim index 93e807e2dbc77df469fdff9f2a906e4d12d0ecfb..2d222ecbbe308085f75b8064dd00e46aec57d282 100644 --- a/tests/script/general/compress/compress.sim +++ b/tests/script/general/compress/compress.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim index e0053648e2f3b63cb001e6bcb2dc0a65eda46dfd..096875176e3701ad88c6b57a42c3d66e0fb80bc3 100644 --- a/tests/script/general/compress/compress2.sim +++ b/tests/script/general/compress/compress2.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 2 diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim index 13b19300acffdab583e3bb731c395656f4be7a83..a26627d5e3fc33287e7e8f5891cb6b228811d386 100644 --- a/tests/script/general/compress/uncompress.sim +++ b/tests/script/general/compress/uncompress.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compute/avg.sim b/tests/script/general/compute/avg.sim index 9afdce8b14dc95c8cb2a7e7cb7ac6d557bad9e99..ccc996dccb8b919e323a83c94d32dbeb73f3357f 100644 --- a/tests/script/general/compute/avg.sim +++ b/tests/script/general/compute/avg.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim index 889191f46875607184707e15ace6ff3aec3953e7..988ce74a035a8c06bf3d81fcb9fa38c674e92b84 100644 --- a/tests/script/general/compute/bottom.sim +++ b/tests/script/general/compute/bottom.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim index ead4a34a630f0c8552a76a98656c77cb7efd6b6c..e2c352ffd414b6a6e26382bc3c5ecafb765c6c60 100644 --- a/tests/script/general/compute/count.sim +++ b/tests/script/general/compute/count.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim index 7581f6b4bd9985f46d3c3010cf67c73886d3c0ef..bc5799db18fc21810455a237534e5f3983fb236d 100644 --- a/tests/script/general/compute/diff.sim +++ b/tests/script/general/compute/diff.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim index 2c831fc5a322dbe89c5f1a3c1eb76ceb00c6284e..ecd066619821f4bc545d8e8bd1e5a6dd3b798523 100644 --- a/tests/script/general/compute/diff2.sim +++ b/tests/script/general/compute/diff2.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/first.sim b/tests/script/general/compute/first.sim index 9d98b61c1c6026917221c77a4e9231ce2ef87192..947fcf54441ad3b81c334f29fa90e284e4d0d753 100644 --- a/tests/script/general/compute/first.sim +++ b/tests/script/general/compute/first.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim index 36df589be9a43b08c0ac7a1cc3e34aa5929a7dea..d4052a47a1d7e97bba05cc71d5ff0a1eae5eddc2 100644 --- a/tests/script/general/compute/interval.sim +++ b/tests/script/general/compute/interval.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim index ef851e973e1cf7c70e1b4bbe2bb90ac52ce041ba..ffd43689493ce0f467f0200fd1911a5073c3d23f 100644 --- a/tests/script/general/compute/last.sim +++ b/tests/script/general/compute/last.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim index 1f9d7fa4a9ebaa99ed70bba2d91c096c76157047..ccd6be01098263c07f228bf7ad0ef2baf5bbbe23 100644 --- a/tests/script/general/compute/leastsquare.sim +++ b/tests/script/general/compute/leastsquare.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/max.sim b/tests/script/general/compute/max.sim index f8692c467f6aae178bd786bc0542d4cb5ccad48c..d7f80bfef04d6e59e5bfe0eb08e23992c50895ba 100644 --- a/tests/script/general/compute/max.sim +++ b/tests/script/general/compute/max.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim index 5a3f4351d01f192ffe8aaa3b62789cdfc9758cd2..3c123ca967cf5eaa00461ded051bded692c97919 100644 --- a/tests/script/general/compute/min.sim +++ b/tests/script/general/compute/min.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim index 813d212636189ae18f4c8772da1212907db51bd1..784f9ba094f5746559a88bf1b129b4156c740ee5 100644 --- a/tests/script/general/compute/null.sim +++ b/tests/script/general/compute/null.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim index 2b30d4689c7225c40f7f7a84fbe435d4cdde4611..8a4086dd2402a6f4004f9bfe9390b97b20ca2518 100644 --- a/tests/script/general/compute/percentile.sim +++ b/tests/script/general/compute/percentile.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim index b39caea7a29d75b04c4c77b6b857bf60505de173..53a1b9bc01b689ff31fac7c2c6b8cb16e6b4b4fa 100644 --- a/tests/script/general/compute/stddev.sim +++ b/tests/script/general/compute/stddev.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim index e298eabf44fe1f332a087986b0170b568dbd9a53..4e4e75bfe47a9a536621676b286d8f653af61c97 100644 --- a/tests/script/general/compute/sum.sim +++ b/tests/script/general/compute/sum.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim index d36f599b71b810afb54b14388633ce1a3e74001a..54d7699f27bd98e2699d93236c3d6bd563659303 100644 --- a/tests/script/general/compute/top.sim +++ b/tests/script/general/compute/top.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim index c00665743c7f241c3be1421c72264cd8691de406..671d77de8c99c19929f4135b1320746af9b67265 100644 --- a/tests/script/general/db/backup/keep.sim +++ b/tests/script/general/db/backup/keep.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim index a3bd1ae505d733153849e97b7061328acb15f442..9d56e1c5fb99acc39d2e953d1d3600bfcb6d5d4e 100644 --- a/tests/script/general/db/basic.sim +++ b/tests/script/general/db/basic.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 1000 diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim index 094c1a693012607714cb655e1b0f729666a53634..1fa6678ef84849d1eff27caa33c52245cf1dac30 100644 --- a/tests/script/general/db/basic1.sim +++ b/tests/script/general/db/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim index a1e45337076823c6739851976f8a1dea70a180f9..945481d9bf964d52373409ae102f980bfe12bdb7 100644 --- a/tests/script/general/db/basic2.sim +++ b/tests/script/general/db/basic2.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim index 60ff4b74c73fb5f47022e442819a68b6f130a41e..00e3e9d106934fa6f6d61ba73d4033507844520c 100644 --- a/tests/script/general/db/basic3.sim +++ b/tests/script/general/db/basic3.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim index deac9d47b4a4864e10c376ed46098cae3e7f981d..9f8d463a7d8c65556a79e09b000eb5f2b8cb0f81 100644 --- a/tests/script/general/db/basic4.sim +++ b/tests/script/general/db/basic4.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim index 55a42899ec554576495026ff4b912f930fbaa2ba..09ace39bf438c64883e2dbfa04ab212dd5a6b9a0 100644 --- a/tests/script/general/db/basic5.sim +++ b/tests/script/general/db/basic5.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim index 55ed7a1f5cc62f992c46ea15e10c53e315ffd44a..6e21aabb3c62c9d6b8e0e7012403d0337723d376 100644 --- a/tests/script/general/db/delete_reuse1.sim +++ b/tests/script/general/db/delete_reuse1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim index 3014bd4d2004ec836afffcaf47d56baf1f8bf795..95aa3f952600c715955694e32e99286741e303c8 100644 --- a/tests/script/general/db/delete_reuse2.sim +++ b/tests/script/general/db/delete_reuse2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim index b8a268d5bb6cca86a09c373663aaf2727c91ecae..2204e7434f65ae08bdcbd0314fde1ee305da85c1 100644 --- a/tests/script/general/db/delete_reusevnode.sim +++ b/tests/script/general/db/delete_reusevnode.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 @@ -45,8 +45,8 @@ endi 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim index f261b3d1e25769ca42ddfb37e8092562418aea44..dcf74a287da9ea693dd9c78131aaee85dec17f0f 100644 --- a/tests/script/general/db/delete_reusevnode2.sim +++ b/tests/script/general/db/delete_reusevnode2.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim index e06371266f3fcaff9c41872661fcd04e066a5efd..a4be57782e986a98a289ed5ae491b4484653a93c 100644 --- a/tests/script/general/db/delete_writing1.sim +++ b/tests/script/general/db/delete_writing1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim index 751cc26b2f71d12318f814353edc016a3aa86498..75603dcdd8b3b029714735707c7616758c40de3e 100644 --- a/tests/script/general/db/delete_writing2.sim +++ b/tests/script/general/db/delete_writing2.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim index 5e4a891dc243b9d57cda9b67f0055ceade2781d7..1cee902c1aa58cf481de608328d511348c547ee2 100644 --- a/tests/script/general/db/len.sim +++ b/tests/script/general/db/len.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim index e008d95377004155b5a92ab672f9a67d17be2263..7afa42f0c4cea4fdbf51a8206391cf3e3141d582 100644 --- a/tests/script/general/db/repeat.sim +++ b/tests/script/general/db/repeat.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 4 diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim index aed8621116693dbe4e562cd08218c9ce750d17b8..afa11d6542bee705e6a9465431e765fdbcc1d695 100644 --- a/tests/script/general/db/tables.sim +++ b/tests/script/general/db/tables.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim index c2d9d78085ec7c1195f35c3dfb264db63ff746a5..d5a002932e5a4a7114abc7a9325c2932cec62810 100644 --- a/tests/script/general/field/2.sim +++ b/tests/script/general/field/2.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim index 13f4c14f7b87660e2fdf8f21e269c93ca914f269..ed4df854ad84150c926c92864656fc53dc8b48dc 100644 --- a/tests/script/general/field/3.sim +++ b/tests/script/general/field/3.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim index aa8fb822a455d7d8d751f993366e9388a2051bdb..465df43f04f625ec092da59ca8ca0fca41a52754 100644 --- a/tests/script/general/field/4.sim +++ b/tests/script/general/field/4.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim index 9fa08cb799f173fe97c6df741bd5dcef1e8b77ad..e1e3d9a54a2f0e91c8290ee938143d6e7e90d0c7 100644 --- a/tests/script/general/field/5.sim +++ b/tests/script/general/field/5.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim index b2ced5b9dfd3251886765515654a257c425e82d2..72e4b5bf4cfcd7cbf72ed76fd577e9eb5c6c4172 100644 --- a/tests/script/general/field/6.sim +++ b/tests/script/general/field/6.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim index 2093f55de5f6be252093a84486ae5c9884cbe423..2adde6cd3dc902c08019327c13851a260a97e5ad 100644 --- a/tests/script/general/field/bigint.sim +++ b/tests/script/general/field/bigint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim index a49af37806bb5eb0a59957cca64da035190ec71d..1e1a3682b194ed141a2e8267c37018d99a3b3958 100644 --- a/tests/script/general/field/binary.sim +++ b/tests/script/general/field/binary.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim index aa70dbd23edbf41d8cc06a0506c721e46bf3f0c8..41770a399da1a73b293067c90b84277c5575f10e 100644 --- a/tests/script/general/field/bool.sim +++ b/tests/script/general/field/bool.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim index daca74fcdefc39a2b25a126b0d5910f6be651eb1..bf3aa923fd27c32e068f87813bcd70500f7e65a7 100644 --- a/tests/script/general/field/double.sim +++ b/tests/script/general/field/double.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim index 8bdebd6714d8481c33889ef38eea60fe8f555c9d..8e8c3740a870c6588a2cfd8edb549c8ae3c4514a 100644 --- a/tests/script/general/field/float.sim +++ b/tests/script/general/field/float.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim index a3d4c901ebc98b5ddccc89ab7ae0e8e1e54cdca5..a4778279a1104d082c9312938ce007c540aac169 100644 --- a/tests/script/general/field/int.sim +++ b/tests/script/general/field/int.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim index ad844da95de3aa937998afd355b08c2c26545b39..17492123ed4e9e3b4da72775824f6adcd75892e0 100644 --- a/tests/script/general/field/single.sim +++ b/tests/script/general/field/single.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim index 432d766ac271468781c3a68aa33e3922aeaad88e..7b6ea2ce79fb8198395bc08a65b0c502f8cae36e 100644 --- a/tests/script/general/field/smallint.sim +++ b/tests/script/general/field/smallint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim index 9b143e061f523a8713284517894d66934c7846ca..fe6e14f04a631fd57227f6eb3b8fc2ebee6bd765 100644 --- a/tests/script/general/field/tinyint.sim +++ b/tests/script/general/field/tinyint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/grafana.sim b/tests/script/general/http/grafana.sim index 818114f9d77b577a1695b00fd45f138952278a52..4f83accf2d99f24f884afd7de994dca13485c497 100644 --- a/tests/script/general/http/grafana.sim +++ b/tests/script/general/http/grafana.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/general/http/grafana_bug.sim b/tests/script/general/http/grafana_bug.sim index 6f0e687fdaf0916c4130984fbde7198d557ff07a..ac6de5cb3111b33ae648b3257314856e17d9ba9e 100644 --- a/tests/script/general/http/grafana_bug.sim +++ b/tests/script/general/http/grafana_bug.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 2000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/general/http/prepare.sim b/tests/script/general/http/prepare.sim index dcbaa7ef81ea2ac8cc75a6276afc8fefb297389c..11834e1223ce67d20321f6e660a790facc5fca3b 100644 --- a/tests/script/general/http/prepare.sim +++ b/tests/script/general/http/prepare.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim index 50f0223804ac0ee07ef224facd01d0de50452aa8..7cc48bcb7ab6d33d1b84fbb001cd695d72a6102c 100644 --- a/tests/script/general/http/restful.sim +++ b/tests/script/general/http/restful.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim index b42f440068a096491396d4ce706783c0b51f0273..27f2a0625300528ce8eead64775e686be579e5a3 100644 --- a/tests/script/general/http/restful_full.sim +++ b/tests/script/general/http/restful_full.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh #sleep 5000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_insert.sim b/tests/script/general/http/restful_insert.sim index e131e3e53e84adb9cbb4ae62c1f5dea44ac873b1..5a032b0dbe7e784880982dd09791d07050a38b9e 100644 --- a/tests/script/general/http/restful_insert.sim +++ b/tests/script/general/http/restful_insert.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_limit.sim b/tests/script/general/http/restful_limit.sim index 75d83b61b339ccb37292fbaffaf2b10b9d2361d8..190d63f4dbcfb44d24ef8f7ff563391c9b3fba80 100644 --- a/tests/script/general/http/restful_limit.sim +++ b/tests/script/general/http/restful_limit.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim index b782a9b9bf076da1fdcf3af8e9682b980e852337..16bea1ac4b9f3befa86fd685b35e1ffa052f72f0 100644 --- a/tests/script/general/http/telegraf.sim +++ b/tests/script/general/http/telegraf.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0 diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim index 018d9ea7f7e21522eb23737adcc83d55ceac05dc..50370147280789d5edda379dd541c186a4b08d8d 100644 --- a/tests/script/general/import/basic.sim +++ b/tests/script/general/import/basic.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim index 974d9e394f4685b9f9e95ca27279b5a41d1354ae..2197c1d39de4a64f27adce0349d2ae8bcc21f0c7 100644 --- a/tests/script/general/import/commit.sim +++ b/tests/script/general/import/commit.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim index 9fa8f662996d49bdef120b9755d2771c8a2e80a2..77a47a10497bb236dc0960f3b54ec9add8d16fd7 100644 --- a/tests/script/general/import/large.sim +++ b/tests/script/general/import/large.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim index 62fb5e78d4e8c308a523e00db3d8e61f8624bac9..193082097c7bab7c6636d693c2184ca606508e2d 100644 --- a/tests/script/general/import/replica1.sim +++ b/tests/script/general/import/replica1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim index 3b18c7e23ac33f9324ebc505cc7226cf5ac71ee0..9136f1e66f55b5efb2083dbde672dc30d1cf77e1 100644 --- a/tests/script/general/insert/basic.sim +++ b/tests/script/general/insert/basic.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim index ef183bb2f04e4080fd379c8be98119501688b9df..89aad812298070a84edba43f20f0ebd71e54478b 100644 --- a/tests/script/general/insert/insert_drop.sim +++ b/tests/script/general/insert/insert_drop.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim index dff250ba8b0c4ee08895ba1fc72ad360885791cc..d13fb9841d93a755dc4c4034d01f9bdefbc88ea8 100644 --- a/tests/script/general/insert/query_block1_file.sim +++ b/tests/script/general/insert/query_block1_file.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim index b94eb4ecd1aace131524e1410564fae2bd9f854a..c20613e192ced4e12b3521017490570cf315bced 100644 --- a/tests/script/general/insert/query_block1_memory.sim +++ b/tests/script/general/insert/query_block1_memory.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim index 3ce1e51e02431c5b11e03041b410a234594e0704..18a3f407bbbf9ea98034b50864a2b51a70e1a358 100644 --- a/tests/script/general/insert/query_block2_file.sim +++ b/tests/script/general/insert/query_block2_file.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim index 6546d89507b4cf86d13daf7976fb5957bc8acc04..409e84269d04ef8bde9472eb54107951c0651c92 100644 --- a/tests/script/general/insert/query_block2_memory.sim +++ b/tests/script/general/insert/query_block2_memory.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim index d968f1b1f836645239674386c8f19aec2d8233ef..b6e1bf4e55b07bff4bf4965a7a201978f9d33c50 100644 --- a/tests/script/general/insert/query_file_memory.sim +++ b/tests/script/general/insert/query_file_memory.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim index 802efe2ac18740f8d5f1ce8d89477931641c3d7c..901b6409fce2ab4c6f12507bc0fd8ce69118d51a 100644 --- a/tests/script/general/insert/query_multi_file.sim +++ b/tests/script/general/insert/query_multi_file.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim index ecb6dc43d52d3e1e3b0cbbcf1bee62f03100c3c2..c2782ac1e15917c41b055e6a167873e423e4d877 100644 --- a/tests/script/general/insert/tcp.sim +++ b/tests/script/general/insert/tcp.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim index a960fd96fa3983400eb3abb67279d1d9c4e358d3..421b5f7c6a663ddc27906c694cdb9c3760f3ee8a 100644 --- a/tests/script/general/metrics/disk.sim +++ b/tests/script/general/metrics/disk.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim index 0aabadd0e4a6f1960fbaec94176b08173e8be846..f0864034de66d08a5eacfd34dee8a13f2c8c4a03 100644 --- a/tests/script/general/metrics/metrics.sim +++ b/tests/script/general/metrics/metrics.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/values.sim b/tests/script/general/metrics/values.sim index e91a9fee397a562f20a443e38f4e17cd37a04d1a..aa5aecd6acd53952e87e7058f7e650750346aa02 100644 --- a/tests/script/general/metrics/values.sim +++ b/tests/script/general/metrics/values.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim index 3a5c58363ea6595e25a42285e3236f10903868f7..a2642ac7e87bcf7ca42afeef817a1e7ab4fdafa4 100644 --- a/tests/script/general/metrics/vnode3.sim +++ b/tests/script/general/metrics/vnode3.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim index 87e4089d3502cf303babac27e36ef2ae58b8c03d..07b7f71fa44ae270f4a2a3688a082f9c3ef8b001 100644 --- a/tests/script/general/parser/alter.sim +++ b/tests/script/general/parser/alter.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim index 695003c702f251c919f1f242d5619e5641121778..058977f7842e4015b783a64d2084f0d001a5ea7b 100644 --- a/tests/script/general/parser/alter1.sim +++ b/tests/script/general/parser/alter1.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim index 6ef9b812e790151f0c0426481c3e8fd12b991e7f..c0614ec00af35a1771fcf3d43fefc4deef76cb10 100644 --- a/tests/script/general/parser/alter_stable.sim +++ b/tests/script/general/parser/alter_stable.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim index ed3131d2ac0f6f50763773912effce9c095d9a52..f9db56d15c2b9557a4c67702703fbf2f80024ff7 100644 --- a/tests/script/general/parser/auto_create_tb.sim +++ b/tests/script/general/parser/auto_create_tb.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim index 3489aba9fd5e3405bc777fa974ff074d223f7f61..bb27c3e440fa75adb0a5fed17e2f81299e24fc21 100644 --- a/tests/script/general/parser/auto_create_tb_drop_tb.sim +++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim index 6ab86c5ba30269559f04df7404591359b6296046..7342a96f4f7b68f93001c460ca72258cfddef48a 100644 --- a/tests/script/general/parser/binary_escapeCharacter.sim +++ b/tests/script/general/parser/binary_escapeCharacter.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/bug.sim b/tests/script/general/parser/bug.sim index cac74671f328c5b19bc1b2c61854a9077c2442e8..7e7d7e536e07cec47ddcc8425ebc1a3ce4e672e1 100644 --- a/tests/script/general/parser/bug.sim +++ b/tests/script/general/parser/bug.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c dDebugFlag -v 135 diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim index 5b478d7fc227c1a4bb8ef430a533de6e22a659fe..b4ffeadc2316081109619b7f7d4c2de4d290132f 100644 --- a/tests/script/general/parser/col_arithmetic_operation.sim +++ b/tests/script/general/parser/col_arithmetic_operation.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim index 854bb219e507a2f81ab84324d417a1e40c87949e..ead480cad890e2b6bb33aed75b1b6e5108db8ad9 100644 --- a/tests/script/general/parser/columnValue.sim +++ b/tests/script/general/parser/columnValue.sim @@ -1,7 +1,7 @@ #### 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim index 61faad18647d8dd9c6f9d86116d9c7df4f85f019..eab9497b0b8132e87313e0d9e29fc411c54b98ed 100644 --- a/tests/script/general/parser/commit.sim +++ b/tests/script/general/parser/commit.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim index 9bfeef7355c340c151516830d555ad3416a95511..b272ef1ddb6154195b248257d3586a51202bf591 100644 --- a/tests/script/general/parser/create_db.sim +++ b/tests/script/general/parser/create_db.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index 486a1e3fc80be06e1d9fac9952e800ddeec7ef68..83dd09eb8f60532d655191f5399a917eda81f1a1 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim index 489780130a068675166cd4ff37a5b054dc7b54fa..5e3007824aac3587946fa711edba94f257fceb0a 100644 --- a/tests/script/general/parser/create_tb.sim +++ b/tests/script/general/parser/create_tb.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim index 0ec5f3c9aa6545f10ca17058693642169a4dec7a..c4a789da79310f0c0ada15c29200e4065ff3a31a 100644 --- a/tests/script/general/parser/dbtbnameValidate.sim +++ b/tests/script/general/parser/dbtbnameValidate.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim index 89e35e1a3854bc897e5f8dfae5cb19b93876c808..33286ecfcb75db293895fca39f9e5ac66d41cbd4 100644 --- a/tests/script/general/parser/fill.sim +++ b/tests/script/general/parser/fill.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim index 0740ab64fab1bcf2c793fd9ccaf8107015e0a038..8fecaeb4c4c48374a388d47539c9d3022744975a 100644 --- a/tests/script/general/parser/fill_stb.sim +++ b/tests/script/general/parser/fill_stb.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim index dd125c60f98ed7fc1955170d51edab0a4a54207a..b5133ed9a1eb6aa05bc3961fe150b0c7f4fa47a9 100644 --- a/tests/script/general/parser/first_last.sim +++ b/tests/script/general/parser/first_last.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim index ca83fb19b296f4bb614ea647c5a3003d5fa480b0..4d367999b2b649a92a717d02d6c649784084356c 100644 --- a/tests/script/general/parser/groupby.sim +++ b/tests/script/general/parser/groupby.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim index d3b96cbf89ea4b43c8e71a3b31bcf8e9e0a3191c..465f077fecd90f68ccdf0a33edc13cadc714141b 100644 --- a/tests/script/general/parser/import.sim +++ b/tests/script/general/parser/import.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim index a9935aa54e5e8b0ea49e6f2e02e480e2e4b08c5f..a1bc057aef700e7ea4a8475896299b1165a62d4d 100644 --- a/tests/script/general/parser/import_commit1.sim +++ b/tests/script/general/parser/import_commit1.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim index d5edb89f8ecbc05048628bc270fde5e6c6c251b1..c02905a2d599770e6a60c20f6667de65ec634c9a 100644 --- a/tests/script/general/parser/import_commit2.sim +++ b/tests/script/general/parser/import_commit2.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim index be915b5406aaaf42d86b4218df984e3eb3efb621..c37ecd9a17f4d6cd7e7acb91dd5b677f7fa421b7 100644 --- a/tests/script/general/parser/import_commit3.sim +++ b/tests/script/general/parser/import_commit3.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim index 2566e956b3e7b7df294a2a1aaf5ad0dfa2762256..f0fef295c4a1366c673ad887dedbb2efd7ede562 100644 --- a/tests/script/general/parser/import_file.sim +++ b/tests/script/general/parser/import_file.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 2000 diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim index 4e4b8b3e1378d4b68dc60fb524739a25041646a5..503ab7e1da172aafe7421d98996d6ccafd992d47 100644 --- a/tests/script/general/parser/insert_multiTbl.sim +++ b/tests/script/general/parser/insert_multiTbl.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 2000 diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim index f7e2980707e279ed31778a8dbbaf78c6258b8fec..c69228d6625f6ad13b5c23cfd6be81778825166d 100644 --- a/tests/script/general/parser/insert_tb.sim +++ b/tests/script/general/parser/insert_tb.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim index 2d3bc2ac87579047a748b0a5afe52fc9bd303307..78369ec84c50648b995727bada101117db4bb97b 100644 --- a/tests/script/general/parser/interp.sim +++ b/tests/script/general/parser/interp.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim index b9b35e0cd3de09c770f0d3d5368f3797f7b0c498..b90579d8d83396437da451accdcaaa4931f280ee 100644 --- a/tests/script/general/parser/join.sim +++ b/tests/script/general/parser/join.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c debugFlag -v 135 system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135 diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim index 46f38f9ce065825e1b043fa899c322567fe80609..983b7fad45354e4ff505f0b48b8c8234d4497e87 100644 --- a/tests/script/general/parser/join_multivnode.sim +++ b/tests/script/general/parser/join_multivnode.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim index c76c71b62e8008fdfd6c777eecab607f5ff9abe9..50317c7abc84ce11a6eef4c04549e2606fd4d367 100644 --- a/tests/script/general/parser/lastrow.sim +++ b/tests/script/general/parser/lastrow.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim index 4ca348dbd6449dea47e84aec17cbf03c51d5819a..16b2a2878c624c7a56869e14eafbc87c0854fe8b 100644 --- a/tests/script/general/parser/limit.sim +++ b/tests/script/general/parser/limit.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim index bdb5b90983d7650039d4c655fcf67e1ee8233b3c..9856365f8e56e23285f2ee5ad2882f50195c791a 100644 --- a/tests/script/general/parser/limit1.sim +++ b/tests/script/general/parser/limit1.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim index 6e108226a5cc1d17fb456840750703f01283096b..b89b7892d442fd8c655c1478a869401fe9251c66 100644 --- a/tests/script/general/parser/limit1_tblocks100.sim +++ b/tests/script/general/parser/limit1_tblocks100.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim index 4374ac9be2a5f44f9845749decb9baa676ccd400..71f1c6f2e817d378ec7d29da405c9473eb9ea2ab 100644 --- a/tests/script/general/parser/limit2.sim +++ b/tests/script/general/parser/limit2.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim index 061d7225b1bf35eb27ae2831c653d59752ff87fc..a91103270dcd23eaef3a96906b7a294c0d1419d1 100644 --- a/tests/script/general/parser/limit2_tblocks100.sim +++ b/tests/script/general/parser/limit2_tblocks100.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim index 03c3a77a89d49963f819509acf84429f59144bf1..29f6d2a7425982739299944b978c35002819b519 100644 --- a/tests/script/general/parser/mixed_blocks.sim +++ b/tests/script/general/parser/mixed_blocks.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim index b6c3a3c9bb559dab150ac910ca149c08089b7b33..51853825c1d82aea4cece67b102d1af53312c2d1 100644 --- a/tests/script/general/parser/nchar.sim +++ b/tests/script/general/parser/nchar.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim index eeb94708d9558b2df5ea03e1620f5bfe1e746336..225c7b6cb7ee910173cf2cc313ec3fe716d3f3f7 100644 --- a/tests/script/general/parser/null_char.sim +++ b/tests/script/general/parser/null_char.sim @@ -1,7 +1,7 @@ #### TBASE-679 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim index 2f18e3cf347cae11ca43371d57170af18370b062..21c2151b7771c7edd3cf68a59b16f5a2aab936fe 100644 --- a/tests/script/general/parser/projection_limit_offset.sim +++ b/tests/script/general/parser/projection_limit_offset.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim index 3065c7eca02be1ae504d1b476f7eaee23db4e22f..dd06d2652126b4ac19d7cd311d4a159f0266ba7e 100644 --- a/tests/script/general/parser/selectResNum.sim +++ b/tests/script/general/parser/selectResNum.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim index 875036082d58c74fb47f51299c19fdf9e18543d6..67c727ef289746a107fee4315f57370eeeedeb68 100644 --- a/tests/script/general/parser/select_across_vnodes.sim +++ b/tests/script/general/parser/select_across_vnodes.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 5 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim index a60571b7d1b70ad5cdbc92c8bace08046ed0c706..9450d41720ceb8c83959b9f39f8e42dac3ba565f 100644 --- a/tests/script/general/parser/select_from_cache_disk.sim +++ b/tests/script/general/parser/select_from_cache_disk.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim index 8558323ebafbcd2d2f94512dc9e85a4809b80a73..92e30bc9149180996cb242745f885ca47669b89b 100644 --- a/tests/script/general/parser/select_with_tags.sim +++ b/tests/script/general/parser/select_with_tags.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim index 80766432476f655262f4bf9a854761276277f8a7..62fef458466370fc0d41ca4cc9ad534307e8a371 100644 --- a/tests/script/general/parser/set_tag_vals.sim +++ b/tests/script/general/parser/set_tag_vals.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim index bf94c713470378f62bc194d69f5204bf5d2f116b..1a159d97fdb639da51e57d439c83d1811e46358c 100644 --- a/tests/script/general/parser/single_row_in_tb.sim +++ b/tests/script/general/parser/single_row_in_tb.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim index ae83d92e2224508c56d8550ab57f2d9d0c2ad0c6..61abf1eb2a06325686270ecbee65601b6d4d1c29 100644 --- a/tests/script/general/parser/slimit.sim +++ b/tests/script/general/parser/slimit.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim index 40be5c1b91c9dfed1ed4c0ad273fea3dc4cd8db6..d034d5bf1719cb978e40f19ab45541583aeac7f4 100644 --- a/tests/script/general/parser/slimit1.sim +++ b/tests/script/general/parser/slimit1.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim index 6091fa89b423af9f97049ed332e3f50d78bad793..6579549287b2c01fc883e6ad7701a9bd9a81ed96 100644 --- a/tests/script/general/parser/slimit_alter_tags.sim +++ b/tests/script/general/parser/slimit_alter_tags.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/parser/stream.sim b/tests/script/general/parser/stream.sim index 33a7d2ac6e0f86d406939ec12e58c089e17a160b..b3334d970ecd46a881b9de21e10caca1ba1db2ba 100644 --- a/tests/script/general/parser/stream.sim +++ b/tests/script/general/parser/stream.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 5 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 5 diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim index d0f6cbace310d85ad09f2af10eb493417d4fccde..aa3595eaf64a28edbacbe9fe6025e1fd3aed1c4f 100644 --- a/tests/script/general/parser/stream_on_sys.sim +++ b/tests/script/general/parser/stream_on_sys.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c monitor -v 1 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1 diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim index b34ea90413a113daeb0aa1470a5c97a52badface..ca8d335742175478760cb94ea6abad65b0cc6a22 100644 --- a/tests/script/general/parser/tags_dynamically_specifiy.sim +++ b/tests/script/general/parser/tags_dynamically_specifiy.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim index 29b295b6cd53bf1eeb35e32606cb977e4bbb2207..bc6c6c52f073a5c7f0cd6648cf470704d1d9250d 100644 --- a/tests/script/general/parser/tags_filter.sim +++ b/tests/script/general/parser/tags_filter.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim index d3b16ea202d3e8b6152c5d0c55113d073ea21411..38551dd59e082c7cce5895b6954e5a407a93a902 100644 --- a/tests/script/general/parser/tbnameIn.sim +++ b/tests/script/general/parser/tbnameIn.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim index edc03fc4f03d0daf04d35aa2569b1d3cd1dd1f5e..8d407dd5cc6444ffc64f7675aef9826e34ed3ff4 100644 --- a/tests/script/general/parser/timestamp.sim +++ b/tests/script/general/parser/timestamp.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim index 397ce534770e4e41ad73866dca50dbc1f203cbe4..05237c392b9bb82d0946779f2a2cf9fdf7ea1e22 100644 --- a/tests/script/general/parser/where.sim +++ b/tests/script/general/parser/where.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/show/dnodes.sim b/tests/script/general/show/dnodes.sim index df78194365b091811c9472f5b31995a3c7e10194..0951c1a6c90b4d1e6379acb9d59b78a20dfd5fae 100644 --- a/tests/script/general/show/dnodes.sim +++ b/tests/script/general/show/dnodes.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/stream/metrics_1.sim b/tests/script/general/stream/metrics_1.sim index e61572d9f4e3dda61a6fb241aff4c1755b73d29f..2e8d02bf21413abd2a18dc23dc6ec76a54681dd4 100644 --- a/tests/script/general/stream/metrics_1.sim +++ b/tests/script/general/stream/metrics_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim index 9077d48f45a08d95f74cff38d641a92dba753491..7ca74dc102e01dfd7cf7f3589e693b99950fdef6 100644 --- a/tests/script/general/stream/metrics_del.sim +++ b/tests/script/general/stream/metrics_del.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/metrics_n.sim b/tests/script/general/stream/metrics_n.sim index c3b20f86165c2a63f1a663954dbfb4bb828031fa..31f9fc64ffe9c54489522a8fac7b8a2cf1beb05d 100644 --- a/tests/script/general/stream/metrics_n.sim +++ b/tests/script/general/stream/metrics_n.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim index 5129dc2f02ef3133a60519630a7f09abb60a2dd7..76ffd99d89ada975c068d08194c85342b1a9c25e 100644 --- a/tests/script/general/stream/metrics_replica1_vnoden.sim +++ b/tests/script/general/stream/metrics_replica1_vnoden.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/stream/stream_1.sim b/tests/script/general/stream/stream_1.sim index 0178ef2ac37c6272868937c192a9ebfb0185f216..bb2d4a05a5be8a67448dee358c8721ac733f3c75 100644 --- a/tests/script/general/stream/stream_1.sim +++ b/tests/script/general/stream/stream_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/stream_2.sim b/tests/script/general/stream/stream_2.sim index a2af8f8548df790f2e11647d836d1cdf43e7c5d3..d0fa60ff9096b724f2e97b7555a0f57a47cdad2b 100644 --- a/tests/script/general/stream/stream_2.sim +++ b/tests/script/general/stream/stream_2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim index 6758d74aba8cbac8c61d07496278d10b29f53a72..3e7d574cd4538b5a8fa77207f3693e67053fbc65 100644 --- a/tests/script/general/stream/stream_3.sim +++ b/tests/script/general/stream/stream_3.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start @@ -107,7 +107,7 @@ endi print =============== step7 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim index 6d9324b69c46d2660e902847f60c4cce0ad5fb7b..f37fbf471d95f63bf41498a5c8a25b82b51a7e43 100644 --- a/tests/script/general/stream/stream_restart.sim +++ b/tests/script/general/stream/stream_restart.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_1.sim b/tests/script/general/stream/table_1.sim index 08aa4912e34db45a4453ee7b06ec5bea8b51787d..be45a98f4904165fb3d7017fefd3a98b9c991cea 100644 --- a/tests/script/general/stream/table_1.sim +++ b/tests/script/general/stream/table_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim index 509c72e4c8e654f18d4a3f059ea7fdb389da2b45..a2db5b250dcea8c61b77e749c70bab30bfc038ce 100644 --- a/tests/script/general/stream/table_del.sim +++ b/tests/script/general/stream/table_del.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim index 3eeadd0aff29abb8404aad1c876ed3c7836a6c54..49e8e723da9548d53a97283653a20a99766c7797 100644 --- a/tests/script/general/stream/table_n.sim +++ b/tests/script/general/stream/table_n.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim index f9db9fd9f4b37fca30763813ac7f40af74bb7d9f..1ed649a3fb4290cf6964f89faae3d0332d160ac4 100644 --- a/tests/script/general/stream/table_replica1_vnoden.sim +++ b/tests/script/general/stream/table_replica1_vnoden.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/table/autocreate.sim b/tests/script/general/table/autocreate.sim new file mode 100644 index 0000000000000000000000000000000000000000..eac153e3c21581192eef02fb1c9e9822549b508f --- /dev/null +++ b/tests/script/general/table/autocreate.sim @@ -0,0 +1,102 @@ +system sh/stop_dnodes.sh +system sh/deploy.sh -n dnode1 -i 1 +system sh/exec.sh -n dnode1 -s start +sql connect + +print =============== create database +sql create database db +sql show databases +if $rows != 1 then + return -1 +endi + +print $data00 $data01 $data02 + +print =============== create super table +sql create table db.st1 (ts timestamp, i int) tags (j int) +sql create table db.st2 (ts timestamp, i int, j int) tags (t1 int, t2 int, t3 int) +sql show db.stables +if $rows != 2 then + return -1 +endi + +print $data00 $data01 $data02 + +print =============== create child table +sql insert into db.c1 using db.st1 tags(1) values(now, 1); +sql insert into db.c2 using db.st1 tags(2) values(now, 2); +sql insert into db.c3 using db.st1 tags(3) values(now, 3); +sql insert into db.c4 using db.st1 tags(4) values(now, 4); +sql insert into db.c1 using db.st1 tags(1) values(now, 1); +sql insert into db.c2 using db.st1 tags(2) values(now, 2); +sql insert into db.c3 using db.st1 tags(3) values(now, 3); +sql insert into db.c4 using db.st1 tags(4) values(now, 4); + +sql show db.tables +if $rows != 4 then + return -1 +endi + +sql select * from db.c1 +if $rows != 2 then + return -1 +endi + +sql select * from db.c2 +if $rows != 2 then + return -1 +endi + +sql select * from db.c3 +if $rows != 2 then + return -1 +endi + +sql select * from db.c4 +if $rows != 2 then + return -1 +endi + +sql select * from db.st1 +if $rows != 8 then + return -1 +endi + +print =============== insert data +sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2); +sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3); +sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4); +sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5); +sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2); +sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3); +sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4); +sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5); +sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2); +sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3); +sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4); +sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5); + +sql show db.tables +if $rows != 8 then + return -1 +endi + +sql select * from db.s1 +if $rows != 3 then + return -1 +endi + +sql select * from db.s2 +if $rows != 3 then + return -1 +endi + +sql select * from db.s3 +if $rows != 3 then + return -1 +endi + +sql select * from db.s4 +if $rows != 3 then + return -1 +endi diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim index a8dfb0f21a03067f3348810485e37e3c6552995d..0e425c95f9f7885ccd11af53d8def960f6f28ccf 100644 --- a/tests/script/general/table/basic1.sim +++ b/tests/script/general/table/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim index 1f6d889429de482c820b0297010326b4a03155ee..40688403a86b536130794b0d70cd109d2cc5f694 100644 --- a/tests/script/general/table/basic2.sim +++ b/tests/script/general/table/basic2.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic3.sim b/tests/script/general/table/basic3.sim index 6558617384f7ef68b99ec10b9cf0e7e241c302d1..18c3f9b6251324d19dd3f21edcd7b29707ab1fa2 100644 --- a/tests/script/general/table/basic3.sim +++ b/tests/script/general/table/basic3.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/bigint.sim b/tests/script/general/table/bigint.sim index 667ce523cb74a7ce3ab79b305012676fd5b4be91..4145968fbd767b5ef7e6be3254824d440e110bf0 100644 --- a/tests/script/general/table/bigint.sim +++ b/tests/script/general/table/bigint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/binary.sim b/tests/script/general/table/binary.sim index bc91c48c195ed295eacf7140880d76dee09dc732..b0c5166d2021089ac21bf4319087f54c9ba14b2a 100644 --- a/tests/script/general/table/binary.sim +++ b/tests/script/general/table/binary.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/bool.sim b/tests/script/general/table/bool.sim index 1393315b4f7e3b6df0079192d22a691d7109bb8a..b55147b67e70e3243b4dc362458fdd19606de428 100644 --- a/tests/script/general/table/bool.sim +++ b/tests/script/general/table/bool.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column2.sim b/tests/script/general/table/column2.sim index 3d32ae454eb21a57a74d27fba76736d57d1453d6..4c27ae68ade9b5d09b34ca33a6faceddf573152f 100644 --- a/tests/script/general/table/column2.sim +++ b/tests/script/general/table/column2.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_name.sim b/tests/script/general/table/column_name.sim index c49e58336d00805b3f78fc78ceada2273665b750..41a4179a41ea23f841e5baf8635adcd16ed75b96 100644 --- a/tests/script/general/table/column_name.sim +++ b/tests/script/general/table/column_name.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_num.sim b/tests/script/general/table/column_num.sim index 5e124a1943b70658d58d591e958d72b9d7d425df..bf82b9fc058e9b2d71cdc6818411edea67d895b0 100644 --- a/tests/script/general/table/column_num.sim +++ b/tests/script/general/table/column_num.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_value.sim b/tests/script/general/table/column_value.sim index bb811b7ab88e156970018a7388a90d8eee75da5c..2a1636e5ca4196f88dce9c9a72ff3ce92c0e0cf1 100644 --- a/tests/script/general/table/column_value.sim +++ b/tests/script/general/table/column_value.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/date.sim b/tests/script/general/table/date.sim index 52242b638880b45bc721ad4aa85f4bb99e5f4380..f702a557504384ed0525522a9b3b185f7100b0ea 100644 --- a/tests/script/general/table/date.sim +++ b/tests/script/general/table/date.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/db.table.sim b/tests/script/general/table/db.table.sim index 242f778a1564043326a89a1df269e60500c70e29..653a73310f4c9391ae3ff60403fb73bae445bbde 100644 --- a/tests/script/general/table/db.table.sim +++ b/tests/script/general/table/db.table.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/general/table/delete_reuse1.sim index 1f47088c6f3d48a4b7dc68f127c4f24acc89f67c..1f42637088dda7772e4dd18f7eb282046e5491a9 100644 --- a/tests/script/general/table/delete_reuse1.sim +++ b/tests/script/general/table/delete_reuse1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/general/table/delete_reuse2.sim index acd69bc488dbb3963d5403499b671f3d897a5aa2..238eac975dc14afb28cca72c33431a4138437bf0 100644 --- a/tests/script/general/table/delete_reuse2.sim +++ b/tests/script/general/table/delete_reuse2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim index 769207b83c32991aac61c9e5dd51744ec3b819fe..b697c7f8419b1a37d06e5abc20344c7e33ad758d 100644 --- a/tests/script/general/table/delete_writing.sim +++ b/tests/script/general/table/delete_writing.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/describe.sim b/tests/script/general/table/describe.sim index 1905a0b0329bb0835b7c2ae13c40814f5c6481b3..fd9a8eda18729e1f27e655d6d323680a7dbc41e3 100644 --- a/tests/script/general/table/describe.sim +++ b/tests/script/general/table/describe.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/double.sim b/tests/script/general/table/double.sim index 2b34f5a1913dcdb334021792f354addf244a1cf3..36013be51d137bf12dab189a15244048871be392 100644 --- a/tests/script/general/table/double.sim +++ b/tests/script/general/table/double.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/float.sim b/tests/script/general/table/float.sim index 95666f677b12d58f76db6cf4fade8db9cb2e9a4c..195a2268b74ac0fec529102dfd7f95244d955226 100644 --- a/tests/script/general/table/float.sim +++ b/tests/script/general/table/float.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim index 70a2ac767d4bad26f03b51174101397d5273a8db..0f8223896c1ae6699bcf139a7d9f482702caf7fe 100644 --- a/tests/script/general/table/int.sim +++ b/tests/script/general/table/int.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim index 904a49a2fdb6dceda810167e4404c947f37d2f97..e01a209b610db32ebaceca4dd03d1bed193a6908 100644 --- a/tests/script/general/table/limit.sim +++ b/tests/script/general/table/limit.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 129 diff --git a/tests/script/general/table/smallint.sim b/tests/script/general/table/smallint.sim index 0547fbb1b6df0dd305a0598443c9804d9b3f4fb8..6a0fbd7fb5bc0111eb58af1bb56a860069dfe16c 100644 --- a/tests/script/general/table/smallint.sim +++ b/tests/script/general/table/smallint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/table.sim b/tests/script/general/table/table.sim index 2c8467b9a339cf4b66c35d2d2a9812b2e3d27fbd..468e60f1baa74c7ff3923acfb4101d3813f51177 100644 --- a/tests/script/general/table/table.sim +++ b/tests/script/general/table/table.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/table_len.sim b/tests/script/general/table/table_len.sim index 37c06c515c33a67ba19372af17ceea1edab881c4..e1ed254fe118fec725e928a229376d731c018fad 100644 --- a/tests/script/general/table/table_len.sim +++ b/tests/script/general/table/table_len.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim index 8a8698a60dd386edf390960270457455ed40ee10..5e4388619b51bb436bfdc640d0111789ba05e526 100644 --- a/tests/script/general/table/testSuite.sim +++ b/tests/script/general/table/testSuite.sim @@ -1,25 +1,26 @@ +run general/table/autocreate.sim run general/table/basic1.sim run general/table/basic2.sim run general/table/basic3.sim -#run general/table/table.sim -#run general/table/vgroup.sim -#run general/table/limit.sim -#run general/table/table_len.sim -run general/table/column_num.sim -#run general/table/column2.sim -run general/table/column_name.sim -#run general/table/column_value.sim -#run general/table/describe.sim -#run general/table/date.sim run general/table/bigint.sim #run general/table/binary.sim run general/table/bool.sim +run general/table/column_name.sim +run general/table/column_num.sim +#run general/table/column_value.sim +#run general/table/column2.sim +#run general/table/date.sim +run general/table/db.table.sim +#run general/table/delete_reuse1.sim +#run general/table/delete_reuse2.sim +#run general/table/delete_writing.sim +#run general/table/describe.sim run general/table/double.sim run general/table/float.sim run general/table/int.sim +#run general/table/limit.sim run general/table/smallint.sim +#run general/table/table_len.sim +#run general/table/table.sim run general/table/tinyint.sim -run general/table/db.table.sim -#run general/table/delete_reuse1.sim -#run general/table/delete_reuse2.sim -#run general/table/delete_writing.sim +#run general/table/vgroup.sim diff --git a/tests/script/general/table/tinyint.sim b/tests/script/general/table/tinyint.sim index 4e50b6dba214a066aa3726d8246ead9e97bba4b1..d22331c2a38a45735486a79807aea009a3e4a2ad 100644 --- a/tests/script/general/table/tinyint.sim +++ b/tests/script/general/table/tinyint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim index d5198534bc3583f133b79bd5a6473f5d92a47ef8..cd5c44fb6062f3f93283816e22787caad748833b 100644 --- a/tests/script/general/table/vgroup.sim +++ b/tests/script/general/table/vgroup.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim index b972bdf975e9c5dabe369367d04c94a1518a2d7e..1cc2fa8cf78064032bd54de64f60e9d9e455c822 100644 --- a/tests/script/general/tag/3.sim +++ b/tests/script/general/tag/3.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/4.sim b/tests/script/general/tag/4.sim index d75f5478c1130d0e9cda86f3031a04422bdac102..02bb910888fdf62f55fd68d75b9f6ac9f7d9d0c7 100644 --- a/tests/script/general/tag/4.sim +++ b/tests/script/general/tag/4.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/5.sim b/tests/script/general/tag/5.sim index bf8cb9358a5374618d284e73f8be72525248b672..3231f738a746b9565ff15de3082bb866d4cf255a 100644 --- a/tests/script/general/tag/5.sim +++ b/tests/script/general/tag/5.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/6.sim b/tests/script/general/tag/6.sim index 3705ffc1109ce9c46a853c16b07c57580e745208..9c106a189c34b3dd71dc9a63eddf9e5de0f4c8f3 100644 --- a/tests/script/general/tag/6.sim +++ b/tests/script/general/tag/6.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim index b36bc0c6c3a1c5325a132980eaa60ba3bd0135cc..6c9456d57ac438467cb34d6164cec009288f3731 100644 --- a/tests/script/general/tag/add.sim +++ b/tests/script/general/tag/add.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim index 5519f6759e7e10f485a7e7ba12ec9f7cb88ff84f..3522d91b93ef9753d69d08f0046423a38e929436 100644 --- a/tests/script/general/tag/bigint.sim +++ b/tests/script/general/tag/bigint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim index f5e779bfeeeaf5e185e2d5e7cbe07e2dfa8b7701..45aedf6db83fb87060db1ca2014611ba7a7f8325 100644 --- a/tests/script/general/tag/binary.sim +++ b/tests/script/general/tag/binary.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim index f2622bd03476f80452cf5c47fbd086f8b8257da9..fdb10d5877cdd9aefd9fc3dc80e5c0c2f45c6086 100644 --- a/tests/script/general/tag/binary_binary.sim +++ b/tests/script/general/tag/binary_binary.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim index fb69a0ac6728a984ba432b7592755383a6e3bedf..da3da99b199e1902ca5b418bb4cb2ecb6461f234 100644 --- a/tests/script/general/tag/bool.sim +++ b/tests/script/general/tag/bool.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim index 55542d7de7de0dedb1ededdd90c9943f101d4649..ddd5b3df94ec6c884e58d2622ff535db89dd8b3f 100644 --- a/tests/script/general/tag/bool_binary.sim +++ b/tests/script/general/tag/bool_binary.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim index 261bbfb3d82ad2084e8f6f2f0ac5ebf017ff5823..6f1a637965b172067200d75b57b03b40a8061c9e 100644 --- a/tests/script/general/tag/bool_int.sim +++ b/tests/script/general/tag/bool_int.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim index b77e5765d2443445486d7a4afb1e0e6f204a60c1..f0f4efb9c648bc064c80a18f1813cdc16d54b3cc 100644 --- a/tests/script/general/tag/change.sim +++ b/tests/script/general/tag/change.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim index a7f1b1c8c28c198568acce7b2ad6440e9c341a1b..4313f48e5f9a14dfe09936ed3b873a770b7bea12 100644 --- a/tests/script/general/tag/column.sim +++ b/tests/script/general/tag/column.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim index 84bb72271b7b9105922f28499bb0e2516b5947a5..94ea85781a9a53724d1a8d14194a725565f8760c 100644 --- a/tests/script/general/tag/commit.sim +++ b/tests/script/general/tag/commit.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim index 9742b1c8da38b1f644eb863127deb30ac8e7f72e..852eadfbccbaee5916de92da76b2b5e0f8c497e3 100644 --- a/tests/script/general/tag/create.sim +++ b/tests/script/general/tag/create.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim index 2a0e3ea58c9f98a9b0225b7d8679095186393a25..ae424ef58ce04504f9c0c933f0eb679a19a997f6 100644 --- a/tests/script/general/tag/delete.sim +++ b/tests/script/general/tag/delete.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim index 8c5831b74c53a88c464baf68c54924c3f58def66..d811325b10744f3eda2dd93e203fc4dce43c0ef5 100644 --- a/tests/script/general/tag/double.sim +++ b/tests/script/general/tag/double.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim index 6d8f9ff89372b098bdfb0d25b632b5209c205c02..b10e8a03727a7740e407881e0e22650ef8587118 100644 --- a/tests/script/general/tag/filter.sim +++ b/tests/script/general/tag/filter.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/tag/float.sim b/tests/script/general/tag/float.sim index 49fcf8029b59c93156646b281a453822ab140f39..537211fe1b3dd9142d0ad5314474ee1a5de87ae8 100644 --- a/tests/script/general/tag/float.sim +++ b/tests/script/general/tag/float.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim index d663dd6eb03972a1cad42b5b68ae3d04fc8f0070..ea635d9db64776fdbffaefc30c6a75dcd497fa13 100644 --- a/tests/script/general/tag/int.sim +++ b/tests/script/general/tag/int.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim index 29220eb92f48923e67b077b1429e184098c6cd93..166285f799c8dc353160e6050f569d545857d910 100644 --- a/tests/script/general/tag/int_binary.sim +++ b/tests/script/general/tag/int_binary.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim index 4cb85b7e3d68acb8dc599ceb9ec8e8fd5bb6c3b0..4745ae704f87e885518bcaeeae812fa732a24535 100644 --- a/tests/script/general/tag/int_float.sim +++ b/tests/script/general/tag/int_float.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim index 0c6ddd17d03ae5ef0f7f7b9ddde9f51a8d400d9a..fd9fdd2807eae81ac959584e25e4e8a05dd35e84 100644 --- a/tests/script/general/tag/set.sim +++ b/tests/script/general/tag/set.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim index f38f6e2340cdd52979ab13cf452d91dfb990d52b..701e605e3823db519009aa39292c31103785d59c 100644 --- a/tests/script/general/tag/smallint.sim +++ b/tests/script/general/tag/smallint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim index f88cf0f61d147c2b30399127186ee5b2a8e745ad..b65be720362993dabea8b7fd81631210b3fe1ade 100644 --- a/tests/script/general/tag/tinyint.sim +++ b/tests/script/general/tag/tinyint.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/user/basic1.sim b/tests/script/general/user/basic1.sim index 4bc7deae839f154181fd26b46f649dfa75e1738f..1cff77d3170794a972d3f4ecf77b4db23029331d 100644 --- a/tests/script/general/user/basic1.sim +++ b/tests/script/general/user/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim index d53ade2e4b6c359acda498edd4f7a65b4cd5f9cf..987cb84357ec09314d50f1964a1cf496b4b6a447 100644 --- a/tests/script/general/user/monitor.sim +++ b/tests/script/general/user/monitor.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 print ========== step1 system sh/cfg.sh -n dnode1 -c clog -v 0 diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim index d815ca824f211eee1dca21cd0576c7ef2130b52e..f7eee1359b8b676134c521abc8d5276c3fbe7635 100644 --- a/tests/script/general/user/pass_alter.sim +++ b/tests/script/general/user/pass_alter.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim index 5520ce6f1744d33de8829b5fbaab379d0196ce47..583c2e73d37cad7808c0eb980ba99bdc59437eed 100644 --- a/tests/script/general/user/pass_len.sim +++ b/tests/script/general/user/pass_len.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim index e63246cbd649000c1924056eed30de4b7b8fbef2..8f0d32e7ccf429a4db7a8a937142895fbf7d28ff 100644 --- a/tests/script/general/user/user_create.sim +++ b/tests/script/general/user/user_create.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim index 71198c61cb5e2d5f23c924531ff83f1435d9ccf2..4d2658cec955f58319ac9da9325d320bacbd7a4a 100644 --- a/tests/script/general/user/user_len.sim +++ b/tests/script/general/user/user_len.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim index 187ad51ca2e1142cef2e6eecb80e8a09b4ad6ad8..a883c81e183ef58bb1bb096ddd8c51dba445c1cc 100644 --- a/tests/script/general/vector/metrics_field.sim +++ b/tests/script/general/vector/metrics_field.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim index 3baf3732f1920ca15fe02812035b0e670ca5e1b8..26ff0af0631687b0350a0868ea5e60770aac5d3e 100644 --- a/tests/script/general/vector/metrics_mix.sim +++ b/tests/script/general/vector/metrics_mix.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim index 3690c9f29cbfcdf8a90f26e97e53cabd80b6a0bf..d797fa64673f738ba8762c5ab534b101df518e8b 100644 --- a/tests/script/general/vector/metrics_query.sim +++ b/tests/script/general/vector/metrics_query.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim index f4a4eea53f72e1f7845ab87dac607f1f2fbc6902..29923d3d42f12126396d3964d8184ab563f0d553 100644 --- a/tests/script/general/vector/metrics_tag.sim +++ b/tests/script/general/vector/metrics_tag.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim index b2fa6e98b0290bbb68079e7eb62bc5db235efbfb..9400b2a76ae9762e1d640026893ed12ceb02804d 100644 --- a/tests/script/general/vector/metrics_time.sim +++ b/tests/script/general/vector/metrics_time.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim index c9c7a95c7193ad4c14a0be3023bed200a7ca670b..dfdc015edf42a60f113c7aa79c4835a23e973fe4 100644 --- a/tests/script/general/vector/multi.sim +++ b/tests/script/general/vector/multi.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim index e87de13745e84767418cb356dfc39a60b3b4bba2..cd892bfd87c3843642d3dbcc1d1a32aa6021a8ec 100644 --- a/tests/script/general/vector/single.sim +++ b/tests/script/general/vector/single.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim index 0308ff78c350b499af8e8432c06b6ac95609ea8d..2894b04c6de14d925d914cc736363e3381945582 100644 --- a/tests/script/general/vector/table_field.sim +++ b/tests/script/general/vector/table_field.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim index 0c88406022b3b185eb76041536c4366a12ab9645..9cd40859126b61de33fdc942bdc3cb91f6c68bdc 100644 --- a/tests/script/general/vector/table_mix.sim +++ b/tests/script/general/vector/table_mix.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim index 5a94f3058542702ff959d2ee13d3901f9003943f..1e1784e7266a2cd879974e4be18f03190c627ae6 100644 --- a/tests/script/general/vector/table_query.sim +++ b/tests/script/general/vector/table_query.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim index 6a661ba9699b052c230f8e23bef5744690a7435b..f0b0d525e6e39fa1887d8a7622e0eadd89758faf 100644 --- a/tests/script/general/vector/table_time.sim +++ b/tests/script/general/vector/table_time.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 63c65d0345a9ddaec955777140ae92367b98cb7d..81e955ccfba54c4d671ae1f2ec333c15dc732fe7 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -2,28 +2,23 @@ echo "Executing deploy.sh" -if [ $# != 6 ]; then +if [ $# != 4 ]; then echo "argument list need input : " echo " -n nodeName" - echo " -i nodeIp" - echo " -m masterIp" + echo " -i nodePort" exit 1 fi NODE_NAME= -NODE_IP= -MSATER_IP= -while getopts "n:i:m:" arg +NODE= +while getopts "n:i:" arg do case $arg in n) NODE_NAME=$OPTARG ;; i) - NODE_IP=$OPTARG - ;; - m) - MASTER_IP=$OPTARG + NODE=$OPTARG ;; ?) echo "unkonw argument" @@ -48,14 +43,6 @@ CFG_DIR=$NODE_DIR/cfg LOG_DIR=$NODE_DIR/log DATA_DIR=$NODE_DIR/data -#echo ============ deploy $NODE_NAME -#echo === masterIp : $MASTER_IP -#echo === nodeIp : $NODE_IP -#echo === nodePath : $EXE_DIR -#echo === cfgPath : $CFG_DIR -#echo === logPath : $LOG_DIR -#echo === dataPath : $DATA_DIR - rm -rf $NODE_DIR mkdir -p $SIM_DIR @@ -83,13 +70,32 @@ if [ -f "$TAOS_FLAG" ] ; then sudo rm -rf $LOG_DIR fi -echo " " >> $TAOS_CFG -echo "masterIp $MASTER_IP" >> $TAOS_CFG +HOSTNAME=`hostname -f` + +if [ $NODE -eq 1 ]; then + NODE=7100 +elif [ $NODE -eq 2 ]; then + NODE=7200 +elif [ $NODE -eq 3 ]; then + NODE=7300 +elif [ $NODE -eq 4 ]; then + NODE=7400 +elif [ $NODE -eq 5 ]; then + NODE=7500 +elif [ $NODE -eq 6 ]; then + NODE=7600 +elif [ $NODE -eq 7 ]; then + NODE=7700 +elif [ $NODE -eq 8 ]; then + NODE=7800 +fi + +echo " " >> $TAOS_CFG +echo "first ${HOSTNAME}:7100" >> $TAOS_CFG +echo "second ${HOSTNAME}:7200" >> $TAOS_CFG +echo "serverPort ${NODE}" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG -echo "publicIp $NODE_IP" >> $TAOS_CFG -echo "internalIp $NODE_IP" >> $TAOS_CFG -echo "privateIp $NODE_IP" >> $TAOS_CFG echo "dDebugFlag 199" >> $TAOS_CFG echo "mDebugFlag 199" >> $TAOS_CFG echo "sdbDebugFlag 199" >> $TAOS_CFG diff --git a/tests/script/test.sh b/tests/script/test.sh index b9660458b02ead666afd94ef82ed452a90eb021f..743597eabd1a301cc45990bce12f5727f18042e0 100755 --- a/tests/script/test.sh +++ b/tests/script/test.sh @@ -7,12 +7,14 @@ ################################################## set +e +#set -x FILE_NAME= RELEASE=0 ASYNC=0 VALGRIND=0 -while getopts "f:av" arg +UNIQUE=0 +while getopts "f:avu" arg do case $arg in f) @@ -24,6 +26,9 @@ do v) VALGRIND=1 ;; + u) + UNIQUE=1 + ;; ?) echo "unknow argument" ;; @@ -31,11 +36,6 @@ do done cd . -sh/ip.sh -i 1 -s up > /dev/null 2>&1 & -sh/ip.sh -i 2 -s up > /dev/null 2>&1 & -sh/ip.sh -i 3 -s up > /dev/null 2>&1 & -sh/ip.sh -i 4 -s up > /dev/null 2>&1 & -sh/ip.sh -i 5 -s up > /dev/null 2>&1 & # Get responsible directories CODE_DIR=`dirname $0` @@ -51,6 +51,12 @@ else PROGRAM="$BUILD_DIR/bin/tsim -a" fi +if [ $UNIQUE -eq 0 ]; then + PROGRAM=$BUILD_DIR/bin/tsim +else + PROGRAM="$TOP_DIR/../debug/build/bin/tsim" +fi + PRG_DIR=$SIM_DIR/tsim CFG_DIR=$PRG_DIR/cfg LOG_DIR=$PRG_DIR/log @@ -74,13 +80,15 @@ TAOS_CFG=$PRG_DIR/cfg/taos.cfg touch -f $TAOS_CFG TAOS_FLAG=$PRG_DIR/flag -echo " " >> $TAOS_CFG -echo "scriptDir ${CODE_DIR}/../script">> $TAOS_CFG -echo "masterIp 192.168.0.1" >> $TAOS_CFG -echo "secondIp 192.168.0.2" >> $TAOS_CFG -echo "localIp 127.0.0.1" >> $TAOS_CFG +HOSTNAME=`hostname -f` + +echo " " >> $TAOS_CFG +echo "first ${HOSTNAME}:7100" >> $TAOS_CFG +echo "second ${HOSTNAME}:7200" >> $TAOS_CFG +echo "serverPort 7100" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG +echo "scriptDir ${CODE_DIR}/../script">> $TAOS_CFG echo "numOfLogLines 100000000" >> $TAOS_CFG echo "dDebugFlag 135" >> $TAOS_CFG echo "mDebugFlag 135" >> $TAOS_CFG @@ -89,12 +97,12 @@ echo "rpcDebugFlag 135" >> $TAOS_CFG echo "tmrDebugFlag 131" >> $TAOS_CFG echo "cDebugFlag 135" >> $TAOS_CFG echo "httpDebugFlag 135" >> $TAOS_CFG -echo "monitorDebugFlag 135" >> $TAOS_CFG +echo "monitorDebugFlag 135" >> $TAOS_CFG echo "udebugFlag 135" >> $TAOS_CFG echo "clog 0" >> $TAOS_CFG echo "asyncLog 0" >> $TAOS_CFG echo "locale en_US.UTF-8" >> $TAOS_CFG -echo " " >> $TAOS_CFG +echo " " >> $TAOS_CFG ulimit -n 600000 ulimit -c unlimited diff --git a/tests/script/tmp/dnode1.sim b/tests/script/tmp/dnode1.sim index 7b6e3723cb8d27378150774f29ed46ac65968a94..67d0dd4c120b1cc13f0a81a5c4416dcd250c3571 100644 --- a/tests/script/tmp/dnode1.sim +++ b/tests/script/tmp/dnode1.sim @@ -1,4 +1,4 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect \ No newline at end of file diff --git a/tests/script/tmp/mnodes.sim b/tests/script/tmp/mnodes.sim index 32e72f16ffdf5b11a9a7c57e145aa09c6e348756..38d99bd214c1bc39e66f70f2b0f3926c100f702d 100644 --- a/tests/script/tmp/mnodes.sim +++ b/tests/script/tmp/mnodes.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim index 7890864360713e54bacc943f931e6f1df16d8666..eda045245965fc0755a255ab459b0cfa95af43f5 100644 --- a/tests/script/tmp/prepare.sim +++ b/tests/script/tmp/prepare.sim @@ -1,13 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +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/cfg.sh -n dnode1 -c commitLog -v 2 system sh/cfg.sh -n dnode2 -c commitLog -v 2 diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim index ca7e91e8921868799b52ac093801fe1cd8614fa4..b6eb239052b20f0751caa65eb65b2a5a13650636 100644 --- a/tests/script/unique/account/account_create.sim +++ b/tests/script/unique/account/account_create.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim index f4bc8d0a2fc4b34cf95117b413b0a9754c1e14d6..6d1c148698f5ebd848f88855197775ffec47f333 100644 --- a/tests/script/unique/account/account_delete.sim +++ b/tests/script/unique/account/account_delete.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start @@ -53,7 +51,8 @@ if $rows != 0 then return -1 endi sql show dnodes -if $data03 != 2 then +print $data00 $data01 $data02 $data03 +if $data02 != 2 then return -1 endi sql drop account oroot @@ -68,7 +67,7 @@ show4: endi sql show dnodes -if $data03 != 0 then +if $data02 != 0 then goto show4 endi diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim index 80d1a56a096b16a58adfd38e1088cb0b4dc34845..06fb37bb5af2d09811dad90a6525ff9731b8d6e7 100644 --- a/tests/script/unique/account/account_len.sim +++ b/tests/script/unique/account/account_len.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim index 352e9797e3057b8a88fddbf22613315cd0fa7b6f..e1966e378c6273768c16360afdd0deff5fe754e6 100644 --- a/tests/script/unique/account/authority.sim +++ b/tests/script/unique/account/authority.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim index 6f64975ac284d6e420a76a7fd4e356d1beee023f..b2d8904cc61829ab2c486da170e8496c0b80971d 100644 --- a/tests/script/unique/account/basic.sim +++ b/tests/script/unique/account/basic.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim index 14ee2f6c852a4be1dba8632ed0268da494287d8d..d1d573d3341d0debf2476bbbeec003aee0a46755 100644 --- a/tests/script/unique/account/paras.sim +++ b/tests/script/unique/account/paras.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim index d327d3d4e295dd436c0944199ecce426459c01f2..2c15d5554494a2c4c5bd4562744be28f3d88a6cd 100644 --- a/tests/script/unique/account/pass_alter.sim +++ b/tests/script/unique/account/pass_alter.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim index 426c18adf71fd0d1b1244335365bfb103ceb42a6..acf4f50c6923c47f193cd12145c1ae854a6a8e5d 100644 --- a/tests/script/unique/account/pass_len.sim +++ b/tests/script/unique/account/pass_len.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim index dedaf029f74abc0def0ad120f5644d7967e27fe4..9d4141cfe0c086f9a8863fffb00a9cb0f410e265 100644 --- a/tests/script/unique/account/testSuite.sim +++ b/tests/script/unique/account/testSuite.sim @@ -1,12 +1,11 @@ run unique/account/account_create.sim -run unique/account/account_len.sim run unique/account/account_delete.sim -run unique/account/pass_alter.sim -run unique/account/pass_len.sim -run unique/account/user_create.sim -run unique/account/user_len.sim +run unique/account/account_len.sim run unique/account/authority.sim run unique/account/basic.sim run unique/account/paras.sim +run unique/account/pass_alter.sim +run unique/account/pass_len.sim run unique/account/usage.sim -run unique/account/monitor.sim +run unique/account/user_create.sim +run unique/account/user_len.sim diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim index 5b334374c9a270422c0f84a5f7fcc88546bbd7c1..af904815a0b7a3acf9b20760dd33e3d6d07ab082 100644 --- a/tests/script/unique/account/usage.sim +++ b/tests/script/unique/account/usage.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim index 97a48cf8f6b1a69f055d7ec76e4c7fcd8ad3407a..b22cefcf21a1a1f8048b4a038d1c51771307ee03 100644 --- a/tests/script/unique/account/user_create.sim +++ b/tests/script/unique/account/user_create.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim index 260a0c78b5ba7c3941b59594907de5ec6629884d..0e25f554e08390438ac4ab65be67b4dc08ab4f78 100644 --- a/tests/script/unique/account/user_len.sim +++ b/tests/script/unique/account/user_len.sim @@ -1,7 +1,5 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim index 10d13b44602461e770c41e98aca99ee2febb7940..32a1396f90b9b2e822f78d9f305afadba624479f 100644 --- a/tests/script/unique/big/balance.sim +++ b/tests/script/unique/big/balance.sim @@ -1,27 +1,27 @@ -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up + + + + + system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 1000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c tables -v 1000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c tables -v 1000 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c tables -v 1000 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 +system sh/deploy.sh -n dnode5 -i 5 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode5 -c tables -v 1000 @@ -104,8 +104,8 @@ show1: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 if $data3_192.168.0.1 != 2 then goto show1 endi @@ -160,9 +160,9 @@ show3: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 +print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 2 then goto show3 endi @@ -217,8 +217,8 @@ show4: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 0 then goto show4 endi @@ -272,8 +272,8 @@ show5: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.4 freeVnodes $data3_192.168.0.4 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode4 freeVnodes $data3_192.168.0.4 if $data3_192.168.0.1 != 0 then goto show5 endi diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index c3802da1f87b1edafe4e90ac68a51ab8cfaecf56..7d87dc47449b763d58a304f6640592ff74b68eb0 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -1,6 +1,6 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c tables -v 100 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256 @@ -37,8 +37,8 @@ if $data00 != 25600 then return -1 endi -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c clog -v 0 system sh/cfg.sh -n dnode2 -c tables -v 100 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256 @@ -60,8 +60,8 @@ show3: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 if $data3_192.168.0.1 != 126 then goto show3 endi diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim index 5e1b26aadeed7ae7a0f2c9dd48f2e7eaaa8fd3fe..9e98ddd3490646c82edacbdb4028520b294df226 100644 --- a/tests/script/unique/big/tcp.sim +++ b/tests/script/unique/big/tcp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c tables -v 30000 diff --git a/tests/script/unique/cluster/backup/balance4.sim b/tests/script/unique/cluster/backup/balance4.sim index fbfd6eb36ca83949e5822a07d27d3f60810e2736..a1fe5713f37ee93efe1586c9a8714a63ba72e546 100644 --- a/tests/script/unique/cluster/backup/balance4.sim +++ b/tests/script/unique/cluster/backup/balance4.sim @@ -1,24 +1,24 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -161,15 +161,15 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show1 @@ -202,15 +202,15 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode5Vnodes != 2 then @@ -231,15 +231,15 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show3 @@ -274,15 +274,15 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then goto show4 @@ -302,15 +302,15 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show5 @@ -345,15 +345,15 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode3Vnodes != 2 then goto show6 @@ -373,15 +373,15 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show7 @@ -416,15 +416,15 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode4Vnodes != 2 then goto show8 @@ -444,15 +444,15 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show9 @@ -487,15 +487,15 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode5Vnodes != 2 then goto show10 @@ -520,15 +520,15 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != null then goto show11 @@ -561,15 +561,15 @@ show12: endi sql show dnodes -x show12 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 2 then goto show12 @@ -621,15 +621,15 @@ show13: endi sql show dnodes -x show13 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 0 then goto show13 diff --git a/tests/script/unique/cluster/backup/balance5.sim b/tests/script/unique/cluster/backup/balance5.sim index 15bc83ab5dc7636f285451e7331725cf592ee75b..83486bb813b2b2a3552f2012e549450eb1bd4e1c 100644 --- a/tests/script/unique/cluster/backup/balance5.sim +++ b/tests/script/unique/cluster/backup/balance5.sim @@ -1,24 +1,24 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -144,15 +144,15 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -202,17 +202,17 @@ show2: endi sql show dnodes -x show2 $dnode1Status = $data4_192.168.0.1 -print 192.168.0.1 $dnode1Status +print dnode1 $dnode1Status $dnode2Status = $data4_192.168.0.2 -print 192.168.0.2 $dnode2Status +print dnode2 $dnode2Status $dnode3Status = $data4_192.168.0.3 -print 192.168.0.3 $dnode3Status +print dnode3 $dnode3Status $dnode4Status = $data4_192.168.0.4 -print 192.168.0.4 $dnode4Status +print dnode4 $dnode4Status $dnode5Status = $data4_192.168.0.5 -print 192.168.0.5 $dnode5Status +print dnode5 $dnode5Status $dnode6Status = $data4_192.168.0.6 -print 192.168.0.6 $dnode6Status +print dnode6 $dnode6Status if $dnode1Status != online then goto show2 @@ -251,17 +251,17 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode1Vnodes != null then goto show3 diff --git a/tests/script/unique/cluster/backup/balancex.sim b/tests/script/unique/cluster/backup/balancex.sim index 8f1cd191d6f176b558f065dbb6dbcd5674020d5a..7d4f5f7660763d85075601a495beae0dbcaf19a9 100644 --- a/tests/script/unique/cluster/backup/balancex.sim +++ b/tests/script/unique/cluster/backup/balancex.sim @@ -1,22 +1,22 @@ -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -143,13 +143,13 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -196,17 +196,17 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode5Vnodes != 2 then goto show2 @@ -230,17 +230,17 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode1Vnodes != null then goto show3 diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim index 95cfcbd979addcf0de98ceddddf5479dbcd523e3..6d4e67de0e133a58a6025d09e6898a9923d94bcf 100644 --- a/tests/script/unique/cluster/balance1.sim +++ b/tests/script/unique/cluster/balance1.sim @@ -1,19 +1,8 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +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/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(1520000024021, 21) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 @@ -88,9 +77,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show2 @@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -134,9 +123,9 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -150,17 +139,16 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -179,9 +167,9 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -195,10 +183,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -219,9 +207,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 @@ -235,16 +223,16 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= add dnode1 sql create dnode 192.168.0.1 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -262,9 +250,9 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show7 @@ -278,10 +266,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 @@ -301,9 +289,9 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show8 @@ -317,10 +305,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -329,8 +317,7 @@ endi print ============================== step9 print ========= add dnode2 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -348,9 +335,9 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show9 @@ -364,10 +351,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step10 print ========= add db4 @@ -389,9 +376,9 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -409,8 +396,8 @@ sql insert into c_b1_t2 values(1520000025026, 26) sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role if $dnode1Role != master then return -1 @@ -431,9 +418,9 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show11 @@ -447,10 +434,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -466,8 +453,7 @@ error3: print ============================== step13 print ========= add dnode2 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -481,10 +467,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql use c_b1_d5; sql create table c_b1_t5 (t timestamp, i int) @@ -505,9 +491,9 @@ sql insert into c_b1_t6 values(1520000024061, 61) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then # return -1 @@ -524,10 +510,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 2000 sql create dnode 192.168.0.3 @@ -543,11 +529,11 @@ show14: endi sql show dnodes -x show14 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show14 @@ -563,9 +549,9 @@ sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role print ============================== step15 print ========= create db7 db8 @@ -593,10 +579,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ========== add dnode4 sleep 2000 @@ -616,13 +602,13 @@ show15: endi sql show dnodes -x show15 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show15 @@ -662,11 +648,11 @@ show16: endi sql show dnodes -x show16 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance1_bug.sim b/tests/script/unique/cluster/balance1_bug.sim index 85b38d6c7ea93cee6a9cb78cd84dfd4beb794f00..1796d8d2f2454518259a889fbfdbb1b8965512c5 100644 --- a/tests/script/unique/cluster/balance1_bug.sim +++ b/tests/script/unique/cluster/balance1_bug.sim @@ -1,19 +1,8 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +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/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 @@ -88,9 +77,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show2 @@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -134,9 +123,9 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -150,10 +139,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 @@ -172,9 +161,9 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -188,10 +177,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -212,9 +201,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 @@ -228,10 +217,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= add dnode1 @@ -249,9 +238,9 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show7 @@ -265,10 +254,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 @@ -288,9 +277,9 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show8 @@ -304,10 +293,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -328,9 +317,9 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show9 @@ -344,10 +333,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step10 print ========= add db4 @@ -369,9 +358,9 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -389,8 +378,8 @@ sql insert into c_b1_t2 values(now+1s, 25) sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role if $dnode1Role != master then return -1 @@ -411,9 +400,9 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show11 @@ -427,10 +416,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -454,10 +443,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql use c_b1_d5; $x = 0 @@ -492,9 +481,9 @@ sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then # return -1 @@ -511,10 +500,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 2000 sql create dnode 192.168.0.3 @@ -530,11 +519,11 @@ show14: endi sql show dnodes -x show14 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show14 @@ -550,9 +539,9 @@ sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role print ============================== step15 print ========= create db7 db8 @@ -580,10 +569,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ========== add dnode4 sleep 2000 @@ -603,13 +592,13 @@ show15: endi sql show dnodes -x show15 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show15 @@ -649,11 +638,11 @@ show16: endi sql show dnodes -x show16 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance1_single.sim b/tests/script/unique/cluster/balance1_single.sim index 497352544db019e88a4bba6193cda3e96e1e9336..030d6551e091c309c7a97cd658195f2d431b801c 100644 --- a/tests/script/unique/cluster/balance1_single.sim +++ b/tests/script/unique/cluster/balance1_single.sim @@ -1,22 +1,9 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode5 -c secondIp -v 192.168.0.2 +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 numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -59,9 +46,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode2Vnodes +print dnode1 $dnode2Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode3Vnodes +print dnode2 $dnode3Vnodes if $dnode1Vnodes != 4 then goto show1 @@ -92,9 +79,9 @@ sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then return -1 @@ -119,9 +106,9 @@ show2: endi sql show dnodes -x show2 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then goto show2 @@ -135,10 +122,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -166,9 +153,9 @@ show4: endi sql show dnodes -x show4 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then goto show4 @@ -182,10 +169,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode3 @@ -204,9 +191,9 @@ show5: endi sql show dnodes -x show5 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show5 @@ -234,9 +221,9 @@ show6: endi sql show dnodes -x show6 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != null then goto show6 @@ -262,9 +249,9 @@ show7: endi sql show dnodes -x show7 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then goto show7 @@ -291,9 +278,9 @@ show8: endi sql show dnodes -x show8 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then goto show8 @@ -317,9 +304,9 @@ show9: endi sql show dnodes -x show9 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show9 @@ -348,9 +335,9 @@ show10: endi sql show dnodes -x show10 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show10 @@ -379,9 +366,9 @@ show11: endi sql show dnodes -x show11 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 0 then goto show11 @@ -436,9 +423,9 @@ sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes #if $dnode2Vnodes != 1 then # return -1 @@ -462,11 +449,11 @@ show14: endi sql show dnodes -x show14 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then goto show14 @@ -517,13 +504,13 @@ show15: endi sql show dnodes -x show15 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then goto show15 @@ -563,11 +550,11 @@ show16: endi sql show dnodes -x show16 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim index 65dbfba3618219e03a2d657116d87e9c1f4ecf10..9a0a88b609aa6925bc61cd92512e78654e853e42 100644 --- a/tests/script/unique/cluster/balance2.sim +++ b/tests/script/unique/cluster/balance2.sim @@ -1,27 +1,12 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -107,11 +92,11 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -137,11 +122,11 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show2 @@ -158,10 +143,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -170,7 +155,7 @@ print ========= start dnode2 sql create dnode 192.168.0.2 sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -189,11 +174,11 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show3 @@ -210,10 +195,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step4 print ========= drop dnode3 @@ -229,11 +214,11 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -250,10 +235,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode3 -s stop -x SIGINT @@ -262,7 +247,7 @@ print ========= start dnode3 sql create dnode 192.168.0.3 sleep 3000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c clog -v 1 @@ -281,11 +266,11 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -302,10 +287,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -326,11 +311,11 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != null then goto show6 @@ -347,10 +332,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= start dnode1 @@ -361,13 +346,13 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -385,10 +370,10 @@ show7: $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 - print 192.168.0.1 ==> $dnode1Role - print 192.168.0.2 ==> $dnode2Role - print 192.168.0.3 ==> $dnode3Role - print 192.168.0.4 ==> $dnode4Role + print dnode1 ==> $dnode1Role + print dnode2 ==> $dnode2Role + print dnode3 ==> $dnode3Role + print dnode4 ==> $dnode4Role $x = $x + 1 sleep 2000 @@ -397,11 +382,11 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show7 @@ -434,10 +419,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role $x = 0 show8: @@ -448,13 +433,13 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show8 @@ -480,10 +465,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role $x = 0 show9: @@ -494,13 +479,13 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show9 @@ -524,17 +509,15 @@ sql create dnode 192.168.0.1 sql create dnode 192.168.0.4 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 +system sh/deploy.sh -n dnode1 -i 1 +ssystem sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 sleep 3000 sleep 3000 -system sh/deploy.sh -n dnode4 -m 192.168.0.2 -i 192.168.0.4 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c clog -v 1 @@ -552,10 +535,10 @@ show10: $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 - print 192.168.0.1 ==> $dnode1Role - print 192.168.0.2 ==> $dnode2Role - print 192.168.0.3 ==> $dnode3Role - print 192.168.0.4 ==> $dnode4Role + print dnode1 ==> $dnode1Role + print dnode2 ==> $dnode2Role + print dnode3 ==> $dnode3Role + print dnode4 ==> $dnode4Role $x = $x + 1 sleep 2000 @@ -564,13 +547,13 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -592,10 +575,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql create database c_b2_d5 replica 2 tables 4 sql use c_b2_d5; @@ -624,13 +607,13 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show11 @@ -650,10 +633,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step12 print ========= check data diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim index 83499a4d664a68e26d510f547259b03db7f05e9e..6e5d910a117970ab77eedc2d236bd5f085251cc7 100644 --- a/tests/script/unique/cluster/balance3.sim +++ b/tests/script/unique/cluster/balance3.sim @@ -1,22 +1,22 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 + + + + + + + + + +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -102,13 +102,13 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show1 @@ -138,13 +138,13 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then goto show2 @@ -164,13 +164,13 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show3 @@ -190,7 +190,7 @@ system sh/exec.sh -n dnode2 -s stop -x SIGINT print ============================== step4 print ========= start dnode2 sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -209,13 +209,13 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then goto show4 @@ -235,13 +235,13 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show5 @@ -262,7 +262,7 @@ system sh/exec.sh -n dnode3 -s stop -x SIGINT print ============================== step6 print ========= start dnode3 sleep 3000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c clog -v 1 @@ -281,13 +281,13 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode3Vnodes != 2 then goto show6 @@ -307,13 +307,13 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show7 @@ -333,7 +333,7 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT print ============================== step8 print ========= start dnode4 sleep 3000 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c clog -v 1 @@ -352,13 +352,13 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then goto show8 @@ -383,13 +383,13 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show9 @@ -407,7 +407,7 @@ endi print ============================== step10 print ========= start dnode1 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -426,13 +426,13 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -467,13 +467,13 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show11 @@ -502,13 +502,13 @@ show12: endi sql show dnodes -x show12 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show12 diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim index 2ec78796151c3dd806716364f14c52f39afa3ebe..97c89f89f36bf752120349e817d6f487e34744b8 100644 --- a/tests/script/unique/column/replica3.sim +++ b/tests/script/unique/column/replica3.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim index a9aa674a27d488e00bf7f5d3654c366f077dd112..ec84122b47f085caf9786250a4fc36f0b3f6abd6 100644 --- a/tests/script/unique/db/commit.sim +++ b/tests/script/unique/db/commit.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 2 system sh/cfg.sh -n dnode2 -c commitLog -v 2 diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim index ce1c3fef127aea80384eec8f8ff910030ab82f4b..d22ca2623de9a654913a95eda9611eb63d4a0fda 100644 --- a/tests/script/unique/db/delete.sim +++ b/tests/script/unique/db/delete.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim index 4e2808dbaa6cdaaba1b011098a44a38b37ccacdf..e599cc6c4afd342b80b854c7e82949f1becdaa63 100644 --- a/tests/script/unique/db/delete_part.sim +++ b/tests/script/unique/db/delete_part.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim index 29f9fdbea8d9135604e43c2a2cb3f90d7e010472..b9ce0595c78f54d664db1bd950a66105414d49cb 100644 --- a/tests/script/unique/db/replica_add12.sim +++ b/tests/script/unique/db/replica_add12.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim index a4854adc53ca94c8c0471f3601297e8f2ff5cfff..0c44d9d8392e7e752345ffd8f45b10f728eb7a74 100644 --- a/tests/script/unique/db/replica_add13.sim +++ b/tests/script/unique/db/replica_add13.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim index 0aebcce988c3ff97faca835ca6c84db0bdb12535..e1cc5767c5195cc9991409644176e983c23d01d1 100644 --- a/tests/script/unique/db/replica_add23.sim +++ b/tests/script/unique/db/replica_add23.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim index 144c3f674fa43125cff0bc6104d186d55b80236c..d8075434dc2227fdc95108d25797cff848a4ba86 100644 --- a/tests/script/unique/db/replica_part.sim +++ b/tests/script/unique/db/replica_part.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim index 9f15cf3453d4a2dadbea6587646415b1ba67c44b..09d295125a21397f6543cdeb677e0699e439f3c4 100644 --- a/tests/script/unique/db/replica_reduce21.sim +++ b/tests/script/unique/db/replica_reduce21.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim index c34dccbd621e70ebf4b8ff987573d3593babfc30..214b064afb05147f6d561e7f052257bcc5ee7c0a 100644 --- a/tests/script/unique/db/replica_reduce31.sim +++ b/tests/script/unique/db/replica_reduce31.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim index a9cda824b83c4faf90b35c6da00e6454b98a5a70..c1d4893a3eda831c632e0f5416ea0b8ac55bde40 100644 --- a/tests/script/unique/db/replica_reduce32.sim +++ b/tests/script/unique/db/replica_reduce32.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/dnode/backup/balance4.sim b/tests/script/unique/dnode/backup/balance4.sim deleted file mode 100644 index 914f254ef208d6b7c1242cccb89a443acc67f7a4..0000000000000000000000000000000000000000 --- a/tests/script/unique/dnode/backup/balance4.sim +++ /dev/null @@ -1,435 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1 - -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 dnode5 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 - -system sh/cfg.sh -n dnode1 -c statusInterval -v 1 -system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -system sh/cfg.sh -n dnode3 -c statusInterval -v 1 -system sh/cfg.sh -n dnode4 -c statusInterval -v 1 -system sh/cfg.sh -n dnode5 -c statusInterval -v 1 -system sh/cfg.sh -n dnode6 -c statusInterval -v 1 -system sh/cfg.sh -n dnode7 -c statusInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode7 -c balanceStartInterval -v 10 - -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 -system sh/cfg.sh -n dnode5 -c commitLog -v 0 -system sh/cfg.sh -n dnode6 -c commitLog -v 0 -system sh/cfg.sh -n dnode7 -c commitLog -v 0 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4 - -print ============================ step1 -print ========= start dnode1-5 -system sh/exec.sh -n dnode1 -s start -sleep 4001 -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql connect -x connectTbase - -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -sql create dnode 192.168.0.4 -sql create dnode 192.168.0.5 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -system sh/exec.sh -n dnode4 -s start -system sh/exec.sh -n dnode5 -s start -sleep 4001 -$x = 0 -created1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create database d_b4_d1 replica 4 -x created1 -sql use d_b4_d1 - -create1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b4_d1 (t timestamp, i int) -x create1 -sql insert into d_b4_d1 values(now+1s, 15) -sql insert into d_b4_d1 values(now+2s, 14) -sql insert into d_b4_d1 values(now+2s, 13) -sql insert into d_b4_d1 values(now+3s, 12) -sql insert into d_b4_d1 values(now+4s, 11) - -sql create database d_b4_d2 replica 4 -sql use d_b4_d2 - -create2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b4_d2 (t timestamp, i int) -x create2 -sql insert into d_b4_d2 values(now+1s, 25) -sql insert into d_b4_d2 values(now+2s, 24) -sql insert into d_b4_d2 values(now+3s, 23) -sql insert into d_b4_d2 values(now+4s, 22) -sql insert into d_b4_d2 values(now+5s, 21) - -$x = 0 -show1: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes - -if $dnode1Vnodes != 4 then - goto show1 -endi -if $dnode2Vnodes != 2 then - goto show1 -endi -if $dnode3Vnodes != 2 then - goto show1 -endi -if $dnode4Vnodes != 2 then - goto show1 -endi -if $dnode5Vnodes != 2 then - goto show1 -endi - -print ============================ step2 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 7000 -$x = 0 -show2: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes - -if $dnode1Vnodes != 2 then - goto show2 -endi -if $dnode3Vnodes != 2 then - goto show2 -endi -if $dnode4Vnodes != 2 then - goto show2 -endi -if $dnode5Vnodes != 2 then - goto show2 -endi - -system sh/exec.sh -n dnode2 -s stop - -print ============================ step3 -print ========= start dnode6 -sql create dnode 192.168.0.6 -system sh/exec.sh -n dnode6 -s start -sleep 4000 -$x = 0 -show3: - $x = $x + 1 - sleep 6000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show3 -endi -if $dnode3Vnodes != 2 then - goto show3 -endi -if $dnode4Vnodes != 2 then - goto show3 -endi -if $dnode5Vnodes != 2 then - goto show3 -endi -if $dnode6Vnodes != 2 then - goto show3 -endi - -print ============================ step4 -print ========= add db3 -sql create database d_b4_d3 replica 4 -sql use d_b4_d3 - -create3: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql create table d_b4_d3 (t timestamp, i int) -x create3 -sql insert into d_b4_d3 values(now+1s, 35) -sql insert into d_b4_d3 values(now+2s, 34) -sql insert into d_b4_d3 values(now+3s, 33) -sql insert into d_b4_d3 values(now+4s, 32) -sql insert into d_b4_d3 values(now+5s, 31) - -$x = 0 -show4: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show4 -endi -if $dnode3Vnodes != 1 then - goto show4 -endi -if $dnode4Vnodes != 1 then - goto show4 -endi -if $dnode5Vnodes != 1 then - goto show4 -endi -if $dnode6Vnodes != 1 then - goto show4 -endi - -print ============================ step5 -print ========= start dnode7 -sql create dnode 192.168.0.7 -system sh/exec.sh -n dnode7 -s start -sleep 7000 -$x = 0 -show5: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show5 -endi -if $dnode7Vnodes != 2 then - goto show5 -endi - -print ============================ step6 -print ========= drop dnode3 -sql drop dnode 192.168.0.3 -sleep 7000 -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show6 -endi -if $dnode4Vnodes != 1 then - goto show6 -endi -if $dnode5Vnodes != 1 then - goto show6 -endi -if $dnode6Vnodes != 1 then - goto show6 -endi -if $dnode7Vnodes != 1 then - goto show6 -endi - -system sh/exec.sh -n dnode3 -s stop - -return -print ============================ step7 -print ========= check data - -sql use d_b4_d1 -sql select * from d_b4_d1 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 11 then - return -1 -endi -if $data11 != 12 then - return -1 -endi -if $data21 != 13 then - return -1 -endi -if $data31 != 14 then - return -1 -endi -if $data41 != 15 then - return -1 -endi - -sql use d_b4_d2 -sql select * from d_b4_d2 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 21 then - return -1 -endi -if $data11 != 22 then - return -1 -endi -if $data21 != 23 then - return -1 -endi -if $data31 != 24 then - return -1 -endi -if $data41 != 25 then - return -1 -endi - -sql use d_b4_d3 -sql select * from d_b4_d3 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - - -print ============================================ over -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop diff --git a/tests/script/unique/dnode/backup/balance5.sim b/tests/script/unique/dnode/backup/balance5.sim deleted file mode 100644 index ac6157ca93dbe4eb75f2c677f24d6a103825e18e..0000000000000000000000000000000000000000 --- a/tests/script/unique/dnode/backup/balance5.sim +++ /dev/null @@ -1,469 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode8 -c numOfMPeers -v 1 - -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 dnode5 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4 - -system sh/cfg.sh -n dnode1 -c statusInterval -v 1 -system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -system sh/cfg.sh -n dnode3 -c statusInterval -v 1 -system sh/cfg.sh -n dnode4 -c statusInterval -v 1 -system sh/cfg.sh -n dnode5 -c statusInterval -v 1 -system sh/cfg.sh -n dnode6 -c statusInterval -v 1 -system sh/cfg.sh -n dnode7 -c statusInterval -v 1 -system sh/cfg.sh -n dnode8 -c statusInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode8 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode7 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode8 -c balanceStartInterval -v 10 - -system sh/cfg.sh -n dnode1 -c commitLog -v 0 -system sh/cfg.sh -n dnode2 -c commitLog -v 0 -system sh/cfg.sh -n dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 -system sh/cfg.sh -n dnode5 -c commitLog -v 0 -system sh/cfg.sh -n dnode6 -c commitLog -v 0 -system sh/cfg.sh -n dnode7 -c commitLog -v 0 -system sh/cfg.sh -n dnode8 -c commitLog -v 0 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 4 - -print ============================ step1 -print ========= start dnode1-5 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql connect -x connectTbase -sleep 4001 -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -sql create dnode 192.168.0.4 -sql create dnode 192.168.0.5 -sql create dnode 192.168.0.6 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -system sh/exec.sh -n dnode4 -s start -system sh/exec.sh -n dnode5 -s start -system sh/exec.sh -n dnode6 -s start -sleep 4001 -$x = 0 -created1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create database d_b5_d1 replica 5 -x created1 -sql use d_b5_d1 - -create1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t1 (t timestamp, i int) -x create1 -sql insert into d_b5_t1 values(now+1s, 15) -sql insert into d_b5_t1 values(now+2s, 14) -sql insert into d_b5_t1 values(now+2s, 13) -sql insert into d_b5_t1 values(now+3s, 12) -sql insert into d_b5_t1 values(now+4s, 11) - -sql create database d_b5_d2 replica 5 -sql use d_b5_d2 -create2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t2 (t timestamp, i int) -x create2 -sql insert into d_b5_t2 values(now+1s, 25) -sql insert into d_b5_t2 values(now+2s, 24) -sql insert into d_b5_t2 values(now+3s, 23) -sql insert into d_b5_t2 values(now+4s, 22) -sql insert into d_b5_t2 values(now+5s, 21) - -$x = 0 -show1: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show1 -endi -if $dnode2Vnodes != 2 then - goto show1 -endi -if $dnode3Vnodes != 2 then - goto show1 -endi -if $dnode4Vnodes != 2 then - goto show1 -endi -if $dnode5Vnodes != 2 then - goto show1 -endi -if $dnode6Vnodes != 2 then - goto show1 -endi - -print ============================ step2 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 7000 -$x = 0 -show2: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 2 then - goto show2 -endi -if $dnode3Vnodes != 2 then - goto show2 -endi -if $dnode4Vnodes != 2 then - goto show2 -endi -if $dnode5Vnodes != 2 then - goto show2 -endi -if $dnode6Vnodes != 2 then - goto show2 -endi - -system sh/exec.sh -n dnode2 -s stop - -print ============================ step3 -print ========= start dnode7 -sql create dnode 192.168.0.7 -system sh/exec.sh -n dnode7 -s start -sleep 5000 -$x = 0 -show3: - $x = $x + 1 - sleep 5000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show3 -endi -if $dnode3Vnodes != 2 then - goto show3 -endi -if $dnode4Vnodes != 2 then - goto show3 -endi -if $dnode5Vnodes != 2 then - goto show3 -endi -if $dnode6Vnodes != 2 then - goto show3 -endi -if $dnode7Vnodes != 2 then - goto show3 -endi - -print ============================ step4 -print ========= add db3 -sql create database d_b5_d3 replica 5 -sql use d_b5_d3 -create3: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t3 (t timestamp, i int) -x create3 -sql insert into d_b5_t3 values(now+1s, 35) -sql insert into d_b5_t3 values(now+2s, 34) -sql insert into d_b5_t3 values(now+3s, 33) -sql insert into d_b5_t3 values(now+4s, 32) -sql insert into d_b5_t3 values(now+5s, 31) - -$x = 0 -show4: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show4 -endi -if $dnode3Vnodes != 1 then - goto show4 -endi -if $dnode4Vnodes != 1 then - goto show4 -endi -if $dnode5Vnodes != 1 then - goto show4 -endi -if $dnode6Vnodes != 1 then - goto show4 -endi -if $dnode7Vnodes != 1 then - goto show4 -endi - -print ============================ step5 -print ========= start dnode8 -sql create dnode 192.168.0.8 -system sh/exec.sh -n dnode8 -s start -sleep 7000 -$x = 0 -show5: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode8Vnodes = $data3_192.168.0.8 -print 192.168.0.8 $dnode8Vnodes - -if $dnode1Vnodes != 4 then - goto show5 -endi -if $dnode8Vnodes != 2 then - goto show5 -endi - -print ============================ step6 -print ========= drop dnode3 -sql drop dnode 192.168.0.3 -sleep 7000 -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes -$dnode8Vnodes = $data3_192.168.0.8 -print 192.168.0.8 $dnode8Vnodes - -if $dnode1Vnodes != 4 then - goto show6 -endi -if $dnode4Vnodes != 1 then - goto show6 -endi -if $dnode5Vnodes != 1 then - goto show6 -endi -if $dnode6Vnodes != 1 then - goto show6 -endi -if $dnode7Vnodes != 1 then - goto show6 -endi -if $dnode8Vnodes != 1 then - goto show6 -endi - -system sh/exec.sh -n dnode3 -s stop - -return -print ============================ step7 -print ========= check data - -sql use d_b5_d1 -sql select * from d_b5_t1 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 11 then - return -1 -endi -if $data11 != 12 then - return -1 -endi -if $data21 != 13 then - return -1 -endi -if $data31 != 14 then - return -1 -endi -if $data41 != 15 then - return -1 -endi - -sql use d_b5_d2 -sql select * from d_b5_t2 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 21 then - return -1 -endi -if $data11 != 22 then - return -1 -endi -if $data21 != 23 then - return -1 -endi -if $data31 != 24 then - return -1 -endi -if $data41 != 25 then - return -1 -endi - -sql use d_b5_d3 -sql select * from d_b5_t3 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - - -print ============================================ over -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop -system sh/exec.sh -n dnode8 -s stop diff --git a/tests/script/unique/dnode/backup/unremove.sim b/tests/script/unique/dnode/backup/unremove.sim deleted file mode 100644 index 75aaeb949bd1758cc9bafefddf08da8d15916a5e..0000000000000000000000000000000000000000 --- a/tests/script/unique/dnode/backup/unremove.sim +++ /dev/null @@ -1,149 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 - -system sh/cfg.sh -n dnode1 -c commitLog -v 1 -system sh/cfg.sh -n dnode2 -c commitLog -v 1 -system sh/cfg.sh -n dnode3 -c commitLog -v 1 -system sh/cfg.sh -n dnode4 -c commitLog -v 1 - -print ========== step1 -system sh/exec.sh -n dnode1 -s start -sql connect -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -sleep 3000 - -sql create database d1 replica 3 -sql create table d1.t1 (t timestamp, i int) -sql insert into d1.t1 values(now+1s, 15) -sql insert into d1.t1 values(now+2s, 14) -sql insert into d1.t1 values(now+2s, 13) -sql insert into d1.t1 values(now+3s, 12) -sql insert into d1.t1 values(now+4s, 11) - -print ========== step2 -sql drop dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 - -sql alter dnode 192.168.0.2 unremove -system sh/exec.sh -n dnode2 -s start - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step3 -sql drop dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 - -sql alter dnode 192.168.0.2 unremove -system sh/exec.sh -n dnode2 -s start - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -1 -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step4 -sql create dnode 192.168.0.4 -sql drop dnode 192.168.0.2 - -sleep 5000 -sql show dnodes -$dnode1Vnodes = $data2_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data2_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data2_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -1 -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step5 -system sh/exec.sh -n dnode4 -s start -sleep 3000 - -$x = 0 -show5: - $x = $x + 1 - sleep 5000 - if $x == 20 then - return -1 - endi - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -print 192.168.0.4 freeVnodes $data3_192.168.0.4 -if $data3_192.168.0.1 != 3 then - goto show5 -endi -if $data3_192.168.0.2 != null then - goto show5 -endi -if $data3_192.168.0.3 != 3 then - goto show5 -endi -if $data3_192.168.0.4 != 3 then - goto show5 -endi diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index 493f712c57c37679a20656dcd1ab38e4c8221c69..eff6b1e51d8c0e4ba14d2619390cb77fc074a6ee 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -49,7 +49,7 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 1 then return -1 endi @@ -68,8 +68,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 0 then goto show2 endi @@ -87,8 +87,8 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 0 then return -1 endi @@ -108,8 +108,8 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 2 then goto show4 endi @@ -135,9 +135,9 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 0 then goto show5 endi @@ -158,9 +158,9 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 0 then return -1 @@ -185,10 +185,10 @@ show7: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 0 then goto show7 endi @@ -212,10 +212,10 @@ sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 0 then return -1 @@ -242,10 +242,10 @@ show9: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 0 then goto show9 diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim index 5e887d54f5411cf3a8f3cfd42b62d9bebcd190f5..d38952ea4f730aa86a45362549f7ad3cb4794be9 100644 --- a/tests/script/unique/dnode/balance2.sim +++ b/tests/script/unique/dnode/balance2.sim @@ -1,16 +1,16 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 + + + + + + +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 balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -63,9 +63,9 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then return -1 endi @@ -88,9 +88,9 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 2 then goto show2 endi @@ -116,10 +116,10 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then goto show3 endi @@ -143,10 +143,10 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then return -1 endi @@ -173,11 +173,11 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show5 endi @@ -206,11 +206,11 @@ show6: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show6 endi diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index 7baa6444eed59d34fd65d5bc159827864e6fddbd..b379b50119b2a05f6556113f7f3721b39f53155c 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -1,18 +1,18 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 + + + + + + + +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/deploy.sh -n dnode6 -i 6 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -71,10 +71,10 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then return -1 @@ -101,10 +101,10 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 2 then goto show2 @@ -134,11 +134,11 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show3 @@ -174,11 +174,11 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show4 @@ -209,11 +209,11 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show5 @@ -236,11 +236,11 @@ show6: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 +print dnode5 openVnodes $data3_5 if $data3_1 != 4 then goto show6 diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim index 9153224a227f8b5294d595f5c6abeff6270c3a1e..78046d36388d3453673c13bac4fe0da61beab31b 100644 --- a/tests/script/unique/dnode/balancex.sim +++ b/tests/script/unique/dnode/balancex.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -70,8 +70,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi @@ -96,8 +96,8 @@ show3: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show3 endi @@ -117,9 +117,9 @@ show4: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show4 endi @@ -141,9 +141,9 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 3 then goto show5 endi diff --git a/tests/script/unique/dnode/basic1.sim b/tests/script/unique/dnode/basic1.sim index cfd84bbc164fdfb1fad9fcbbac2be069d1d10cc9..1d1f16c7603c09d90672df1a64129787bdd69ce5 100644 --- a/tests/script/unique/dnode/basic1.sim +++ b/tests/script/unique/dnode/basic1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/exec_up.sh -n dnode1 -s start system sh/exec_up.sh -n dnode2 -s start sql connect diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim index c95ddac43c1b081de18671a7bfe659b2c2acc8fb..a2e650ed717b5bce554b2b4aa7f9feba450204eb 100644 --- a/tests/script/unique/dnode/monitor_bug.sim +++ b/tests/script/unique/dnode/monitor_bug.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -27,7 +27,7 @@ sql connect sleep 5000 sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 3 then return -1 endi @@ -45,8 +45,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim index d61971a43927518a51a0f71bafed6eaea6177022..71053f378aedf03db778082e3f2eb305cf4bbdf9 100644 --- a/tests/script/unique/dnode/offline1.sim +++ b/tests/script/unique/dnode/offline1.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index 9a0bfd18b7f297d0247913218f7a1cd784237737..9f265d398acf25ac4f140a26de2dbb82a0c15131 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim index 76429cdd2254027cb2228a75eb13688801d0f746..5b18c981b4f4c1d366ef89cc1a7697fe7e4cc3c8 100644 --- a/tests/script/unique/dnode/remove1.sim +++ b/tests/script/unique/dnode/remove1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -79,8 +79,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show2 endi @@ -101,8 +101,8 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 $data5_192.168.0.2 print ========== step4 sql create dnode 192.168.0.3 @@ -117,9 +117,9 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_2 != null then goto show4 endi @@ -138,10 +138,10 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 +print dnode4 openVnodes $data3_4 if $data3_1 != 4 then goto show5 endi diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index 9b808920a659bceb0cd455ecce088be55ba2735c..338322fb6e6678a4a44eaf4e4b863e1bfdff633f 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -79,8 +79,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show2 endi @@ -102,8 +102,8 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 $data5_192.168.0.2 print ========== step4 sql create dnode 192.168.0.3 @@ -118,9 +118,9 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_2 != null then goto show4 endi diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim index 2ce9645108a2f40b28eeb9e3cc3093416fb92536..d670a6b3b7d2069e1dd8dbe9cbe08c5a7e7f34b7 100644 --- a/tests/script/unique/dnode/vnode_clean.sim +++ b/tests/script/unique/dnode/vnode_clean.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 @@ -43,7 +43,7 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 3 then return -1 endi @@ -60,8 +60,8 @@ show2: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi @@ -81,8 +81,8 @@ sql insert into d2.t2 values(now+5s, 21) $x = 0 sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then return -1 endi @@ -101,8 +101,8 @@ show4: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 2 then goto show4 endi @@ -118,9 +118,8 @@ system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print ========== step5 sleep 2000 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 @@ -135,8 +134,8 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show5 endi @@ -154,8 +153,8 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then return -1 endi @@ -176,9 +175,9 @@ show7: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show7 endi @@ -206,9 +205,9 @@ show8: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show8 endi @@ -231,9 +230,9 @@ show9: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show9 endi diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim index b09acd614d4b562d559378e82f19741768b5ef0a..e1237617a8e63e30946b31ed6196ac11d8aaa602 100644 --- a/tests/script/unique/http/admin.sim +++ b/tests/script/unique/http/admin.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim index 985f1827db6f25a44f926b710707ce77081b3daf..36fba4c24e6aa91f69ec19a26a3496fd53d8dc6d 100644 --- a/tests/script/unique/http/opentsdb.sim +++ b/tests/script/unique/http/opentsdb.sim @@ -1,7 +1,7 @@ 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/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim index ec806d71a0071a74376bad014c730ccf189d5dd4..ec9bf8d3f5dc925d4142860f10251d120db50d0d 100644 --- a/tests/script/unique/import/replica2.sim +++ b/tests/script/unique/import/replica2.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim index 4dfa26a6b29e778a74adacb27bf42bf3a402ce3a..99e46a8506501fd1b95050267eca482392e01ea5 100644 --- a/tests/script/unique/import/replica3.sim +++ b/tests/script/unique/import/replica3.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 5000 diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim index 35c20986cb6f8a1d257011eed956b39c412ab312..eaa6a14e412eea6b7ddbc47d31ea5e1ca4e5a0e4 100644 --- a/tests/script/unique/metrics/balance_replica1.sim +++ b/tests/script/unique/metrics/balance_replica1.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 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 dnode1 -c statusInterval -v 1 @@ -71,9 +71,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -95,9 +95,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim index 68000fb0468836dd60a09554a1340a8ea4e01e07..449f49b7d7e44b4170238e6fc04b1af1d94669da 100644 --- a/tests/script/unique/metrics/dnode2.sim +++ b/tests/script/unique/metrics/dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim index 2570e0789f65d9874c7f536e1cfc8dea363ca218..90af978e6d9cc8f21ee8f356d1b1303ead4937da 100644 --- a/tests/script/unique/metrics/dnode2_stop.sim +++ b/tests/script/unique/metrics/dnode2_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim index 1e7dcffc24e8c04fb6672883ca16dfea491aaed6..44f6687d42b5255bff4e1cca61f6fb91285676d5 100644 --- a/tests/script/unique/metrics/dnode3.sim +++ b/tests/script/unique/metrics/dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 @@ -82,11 +82,11 @@ endi sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 3 then return -1 diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim index 8f2f4a9c0caa4da9b887821f2109e05667d6ea0e..a1ffb65b0f348e2cab5085fa4cbc962af58eb113 100644 --- a/tests/script/unique/metrics/replica2_dnode4.sim +++ b/tests/script/unique/metrics/replica2_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim index ab808b86034331f873a0edfe341a373b1881295f..aed98aceff1a27e22673d03cd26e9af51d47939d 100644 --- a/tests/script/unique/metrics/replica2_vnode3.sim +++ b/tests/script/unique/metrics/replica2_vnode3.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim index 799633b8f0248e6b7a508bfaf3031b143231a853..974bc793adf1d787347b06aeb7f490eac9218c95 100644 --- a/tests/script/unique/metrics/replica3_dnode6.sim +++ b/tests/script/unique/metrics/replica3_dnode6.sim @@ -1,18 +1,18 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 + + + + + + + +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/deploy.sh -n dnode6 -i 6 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim index aee839e80f38b678429d2a095a582332eded8444..379b7357c772b77551626df79548e2a3e961b9ca 100644 --- a/tests/script/unique/metrics/replica3_vnode3.sim +++ b/tests/script/unique/metrics/replica3_vnode3.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/mnode/backup/mgmt44.sim b/tests/script/unique/mnode/backup/mgmt44.sim deleted file mode 100644 index 6eb70c7fb20264967dc2b203f1db8e8235e235e8..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt44.sim +++ /dev/null @@ -1,240 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql connect -x connectTbase - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi - -print ============================ step5 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step6 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi - -print ============================ step7 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 10000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != undecided then - return -1 -endi - -print ============================ step8 -print ========= drop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != null then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt45.sim b/tests/script/unique/mnode/backup/mgmt45.sim deleted file mode 100644 index 53b02847e6d7b6c9bc350c13a23e58d4aa18c3a0..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt45.sim +++ /dev/null @@ -1,336 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 4 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql connect -x connectTbase - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step6 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step7 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step8 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 14000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt55.sim b/tests/script/unique/mnode/backup/mgmt55.sim deleted file mode 100644 index 0e2b9fa2ef572c64e1af11bb5d67c5ada8c17708..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt55.sim +++ /dev/null @@ -1,328 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step6 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step7 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step8 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt56.sim b/tests/script/unique/mnode/backup/mgmt56.sim deleted file mode 100644 index 3171ed855d97c6c172902cb6f6f770e4613f5115..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt56.sim +++ /dev/null @@ -1,394 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - - -print ============================ step6 -print ========= start dnode6 -system sh/exec.sh -n dnode6 -s start -sql create dnode 192.168.0.6 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - -print ============================ step7 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step8 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -print ============================ step10 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt57.sim b/tests/script/unique/mnode/backup/mgmt57.sim deleted file mode 100644 index 8c6950a8dfbdfe3f2231d61bb0f4df83714bd684..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt57.sim +++ /dev/null @@ -1,408 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode7 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - - -print ============================ step6 -print ========= start dnode6 -system sh/exec.sh -n dnode6 -s start -sql create dnode 192.168.0.6 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - - -print ============================ step7 -print ========= start dnode7 -system sh/exec.sh -n dnode7 -s start -sql create dnode 192.168.0.7 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - -print ============================ step8 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step9 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step10 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode3Role != master then - return -1 -endi - -print ============================ step11 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index 9081e50ef574bd0a427f2db9c9ca8cf9d5bc2b16..9fda0f108967eaeda99e96b7739c7f1201f354cb 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/tests/script/unique/mnode/mgmt22.sim @@ -1,35 +1,26 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi print ============== step2 system sh/exec_up.sh -n dnode2 -s start -sql create dnode 192.168.0.2 +sql create dnode $hostname2 $x = 0 show2: @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -64,6 +55,7 @@ print error of no master print ============== step6 system sh/exec_up.sh -n dnode1 -s start +sleep 2000 sql close sql connect @@ -75,13 +67,13 @@ show6: return -1 endi -sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +sql show mnodes -x show6 +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show6 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show6 endi @@ -99,13 +91,13 @@ show7: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then goto show7 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show7 endi if $data3_3 != null then diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim index c5ab9e27eae538b2211a1d7ad11f900d9116a628..6e2f0c8f56d914002b1e8d5f50334effe2ef249a 100644 --- a/tests/script/unique/mnode/mgmt23.sim +++ b/tests/script/unique/mnode/mgmt23.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -80,9 +71,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -99,9 +90,8 @@ system sh/exec_up.sh -n dnode2 -s stop print ============== step5 sleep 2000 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start sleep 8000 @@ -109,9 +99,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim index dac3ca4cc0a29909a2c8734f702e0fd1f984a38a..22454c8b5f093419364853e165639523b6926070 100644 --- a/tests/script/unique/mnode/mgmt24.sim +++ b/tests/script/unique/mnode/mgmt24.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -73,12 +64,12 @@ step5: sql show mnodes -x step5 -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto step5 endi -if $data3_2 != slave then +if $data2_2 != slave then goto step5 endi diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim index 4f5e2bf3c8ad38b22545280a0ea62db8c77bd699..652492db45cfe1060e43c5d7c560f6522d7324b8 100644 --- a/tests/script/unique/mnode/mgmt25.sim +++ b/tests/script/unique/mnode/mgmt25.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -80,9 +71,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim index 57c600343133980ff95e6558391d2cb2e0b297b7..5ad095db0b61a33190be515f8fd5f8f4b59bd972 100644 --- a/tests/script/unique/mnode/mgmt26.sim +++ b/tests/script/unique/mnode/mgmt26.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -81,9 +72,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -97,9 +88,8 @@ endi print ============== step5 system sh/exec_up.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 sleep 5000 system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.2 @@ -109,9 +99,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim index b2235ca6dc93250700b32e2cbf8c7f146827199b..de28dc41a2ad5e38fcc092e73e09ca5aa3c53e35 100644 --- a/tests/script/unique/mnode/mgmt33.sim +++ b/tests/script/unique/mnode/mgmt33.sim @@ -1,30 +1,21 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then return -1 endi if $data3_2 != null then @@ -43,9 +34,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -66,9 +57,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -88,9 +79,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -105,9 +96,8 @@ endi system sh/exec_up.sh -n dnode2 -s stop sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start print ============== step5 @@ -118,9 +108,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_4 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -140,9 +130,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_4 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != offline then return -1 @@ -162,9 +152,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != null then return -1 diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim index 1c12b2ee392b6c02e520c06a71e355e7bc311025..2ba090fe9e86392370369abb8d854b34d6ee3dc8 100644 --- a/tests/script/unique/mnode/mgmt34.sim +++ b/tests/script/unique/mnode/mgmt34.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -21,10 +21,10 @@ sleep 3000 sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then return -1 endi if $data3_2 != null then @@ -44,10 +44,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -72,10 +72,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -101,10 +101,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -128,10 +128,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -149,9 +149,8 @@ endi system sh/exec_up.sh -n dnode2 -s stop sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start print ============== step6 @@ -163,10 +162,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -190,10 +189,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != offline then return -1 @@ -208,10 +207,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_5 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != null then return -1 diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim index 666b8a7b3343453fede4623538f405ad5e264a55..60907c90baf1d7d1abc04d1b82967564ba49839e 100644 --- a/tests/script/unique/mnode/mgmtr2.sim +++ b/tests/script/unique/mnode/mgmtr2.sim @@ -1,21 +1,12 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.3 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect @@ -25,9 +16,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -70,9 +61,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/secondIp.sim b/tests/script/unique/mnode/secondIp.sim index 6902c7d49843079a63018c918f7e76aeff1ecb4f..ae339c3d21de803b8e6ba3c8a78608a9c91a9aee 100644 --- a/tests/script/unique/mnode/secondIp.sim +++ b/tests/script/unique/mnode/secondIp.sim @@ -1,10 +1,6 @@ system sh/stop_dnodes.sh - -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.1 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 print ========== step1 dnode2 start system sh/exec_up.sh -n dnode2 -s start @@ -17,10 +13,10 @@ sleep 3000 print ========== step3 sql show dnodes -print 192.168.0.1 openvnodes $data3_1 -print 192.168.0.2 openvnodes $data3_2 -print 192.168.0.1 totalvnodes $data4_1 -print 192.168.0.2 totalvnodes $data4_2 +print dnode1 openvnodes $data3_1 +print dnode2 openvnodes $data3_2 +print dnode1 totalvnodes $data4_1 +print dnode2 totalvnodes $data4_2 if $rows != 2 then return -1 diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim index 9efb32060c563000354acacee56df49d86fe793e..86137f8d1351f5edbd8fd9206ac91594df808e47 100644 --- a/tests/script/unique/stream/metrics_balance.sim +++ b/tests/script/unique/stream/metrics_balance.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 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 dnode1 -c statusInterval -v 1 @@ -189,9 +189,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -214,9 +214,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim index e55ffbefd76f047906cb3d1d529064244bd28741..c2a3c813c322d556cd83090f2ea8b224a5a93c53 100644 --- a/tests/script/unique/stream/metrics_replica1_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/metrics_replica2_dnode2.sim b/tests/script/unique/stream/metrics_replica2_dnode2.sim index a3bcd45048e3018392dc07bc312eca006beaceb5..d5631be8d46620872a2fa25fb13820119dc46845 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim index 3731df7f27559bfd28fdd919d91ad58322bb6220..6e3baf424c6835abad13cbc7679a8727601270c7 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim index 092232b0611a8fa594f05c3f6a7e178a41c01eb5..a5756e711c4c7c494c1463181587b1213a5dd906 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode3.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim index 900e26f8daa725157cd035385107cb59a99c4e7b..7451347186178a2a076f11fddf0f4974246c59f0 100644 --- a/tests/script/unique/stream/metrics_replica3_dnode4.sim +++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim index 47eff851d769faec9ab48928f582768f5082754f..20236276ea7aece0887a46cf82bf297f1c5a7e7e 100644 --- a/tests/script/unique/stream/metrics_vnode_stop.sim +++ b/tests/script/unique/stream/metrics_vnode_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 @@ -97,8 +97,8 @@ print ============= step6 sql close system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode2 -s start diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim index 4b77f2518963a7abbf5bc82aa313989771c47d4b..9bf9b9ed47036232952436093d1745ecbb85920d 100644 --- a/tests/script/unique/stream/table_balance.sim +++ b/tests/script/unique/stream/table_balance.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 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 dnode1 -c statusInterval -v 1 @@ -124,9 +124,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -149,9 +149,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim index 3a4c1c976f5d2a696419c1aab6a8b6f8a78b4036..fd03426dd55e5458404fc0ad513d7d2ffad61f91 100644 --- a/tests/script/unique/stream/table_move.sim +++ b/tests/script/unique/stream/table_move.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 @@ -161,9 +161,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 6 then goto show1 @@ -186,9 +186,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 7 then goto show2 @@ -215,9 +215,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim index 516573253577006407daa2154eddb970d6dc8484..f087b815feaf614da4c55f79eeba504aaff36f7d 100644 --- a/tests/script/unique/stream/table_replica1_dnode2.sim +++ b/tests/script/unique/stream/table_replica1_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/table_replica2_dnode2.sim b/tests/script/unique/stream/table_replica2_dnode2.sim index 177d2ec3445850e09703683234404b04b52a4511..d35039f61754370ad0647ee20e427f272d4f2c3a 100644 --- a/tests/script/unique/stream/table_replica2_dnode2.sim +++ b/tests/script/unique/stream/table_replica2_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim index ace39d0604a98dcd9d2cb4fdf089522aaa6c00fa..581a4ab06b3472fe925e5b04e33dba9883e2528c 100644 --- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim index 658a3dd00c0b0b9400ce094a4f0a9cc13199a393..302b006b21af115e16dae317d702b029ebbc28d2 100644 --- a/tests/script/unique/stream/table_replica2_dnode3.sim +++ b/tests/script/unique/stream/table_replica2_dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim index 60cab2574e9955133a05680dc6722bd9a07db92b..5fbd27ad42f5398b7450c51cead9377b5c2a3aec 100644 --- a/tests/script/unique/stream/table_replica3_dnode4.sim +++ b/tests/script/unique/stream/table_replica3_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim index c4548dda5903587393e6298fe0860703048e8901..05ad2d6a5ff5292e507e5b19068298345390cd8c 100644 --- a/tests/script/unique/stream/table_vnode_stop.sim +++ b/tests/script/unique/stream/table_vnode_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 @@ -98,8 +98,8 @@ print ============= step6 sql close system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 sleep 2000 diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim index dae57366d0cf3d3943a219add89b6a1ee7ab2f5c..189bd6c43182b747093e41fd83b4105c56789ba3 100644 --- a/tests/script/unique/table/delete_part.sim +++ b/tests/script/unique/table/delete_part.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/backup/replica4.sim b/tests/script/unique/vnode/backup/replica4.sim index c6eeeca58fd31ac27eeeab01030dd05cd92d053d..5334b21d53c3a5658db5deb50e145dac2948189f 100644 --- a/tests/script/unique/vnode/backup/replica4.sim +++ b/tests/script/unique/vnode/backup/replica4.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/backup/replica5.sim b/tests/script/unique/vnode/backup/replica5.sim index 3a4f28bdc234c9c1b1ea9321074cdb77705c7d11..e2e45c0e259bafefe530788623d419bf21ffb00b 100644 --- a/tests/script/unique/vnode/backup/replica5.sim +++ b/tests/script/unique/vnode/backup/replica5.sim @@ -1,16 +1,16 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 + + + + + + +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 commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim index 572f4e08ece5dec8e3a1c3936cbaaeba401d29e8..67f6f027b8033fd790e121b98fa648c8c34dd416 100644 --- a/tests/script/unique/vnode/commit.sim +++ b/tests/script/unique/vnode/commit.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim index b5b87fc10854f7a331203654da6aaf79632109d4..ca1475190c14c9c8a746910f09d950726c7723de 100644 --- a/tests/script/unique/vnode/many.sim +++ b/tests/script/unique/vnode/many.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim index 647d692e8e04cd9b503a90dcd30569aeec036640..29268737500a815783f38ab2c720beb3acfb71b8 100644 --- a/tests/script/unique/vnode/replica2_basic.sim +++ b/tests/script/unique/vnode/replica2_basic.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 @@ -120,7 +120,7 @@ endi print =================== step 8 system sh/ip.sh -i 1 -s down -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 6 @@ -137,7 +137,7 @@ if $rows != $expect then endi print =================== step 9 -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 7 @@ -155,7 +155,7 @@ endi print =================== step 10 system sh/ip.sh -i 2 -s down -system sh/ip.sh -i 1 -s up + sleep 2000 $y = $x + $N $expect = $N * 8 @@ -172,7 +172,7 @@ if $rows != $expect then endi print =================== step 11 -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 9 diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim index 9eb6b4a6ac185b4f618009c60a8fbf39580fe50a..0380dfa58870285fc7fc426fd5a8a88527e91307 100644 --- a/tests/script/unique/vnode/replica2_basic2.sim +++ b/tests/script/unique/vnode/replica2_basic2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim index 9d7caacb5967868da25a3b4beb2493926a3fb175..d8d5c4089eeaece651eb14dae672284f107003ce 100644 --- a/tests/script/unique/vnode/replica2_repeat.sim +++ b/tests/script/unique/vnode/replica2_repeat.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim index b401e5fc4bc0a7b5277d71aba838a84976b0b749..858c570fc43d21fadf6047a63fb9d33ebd6028f2 100644 --- a/tests/script/unique/vnode/replica3_basic.sim +++ b/tests/script/unique/vnode/replica3_basic.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim index 299036dace495475580c4c10777aaa4f9509d911..afdcda0dcffc8eddcaaeae59e5da97383d089037 100644 --- a/tests/script/unique/vnode/replica3_repeat.sim +++ b/tests/script/unique/vnode/replica3_repeat.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim index a88c6854be94cc5b41a67f824d2b12e736f5cf41..50fa40629dd0cc5e808c22b80d751162cf8609fe 100644 --- a/tests/script/unique/vnode/replica3_vgroup.sim +++ b/tests/script/unique/vnode/replica3_vgroup.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/test-all.sh b/tests/test-all.sh index 907ef4bedd2617d8a61d661d41019cc10a290f8a..ee1904ba7cc9cb16e4d7921ac87efdee41ae241b 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -27,9 +27,9 @@ fi cd ../pytest if [ "$1" == "cron" ]; then - ./fulltest.sh 2>&1 | tee pytest-out.txt + ./fulltest.sh > /dev/null | tee pytest-out.txt else - ./smoketest.sh 2>&1 | tee pytest-out.txt + ./smoketest.sh > /dev/null | tee pytest-out.txt fi totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l` @@ -40,7 +40,6 @@ fi totalPyFailed=`grep 'failed\|fault' pytest-out.txt | wc -l` if [ "$totalPyFailed" -ne "0" ]; then - cat pytest-out.txt echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}" exit $totalPyFailed fi diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c index 25eeb0b3926bced56b4a31ddcafcc7e1a3101c69..902cf46c3ad0ce6970abe3f67a47c07f6d5528c8 100644 --- a/tests/test/c/importOneRow.c +++ b/tests/test/c/importOneRow.c @@ -107,7 +107,7 @@ void* taos_execute(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); void *taos = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (taos == NULL) taos_error(taos); diff --git a/tests/test/c/importPerTabe.c b/tests/test/c/importPerTabe.c index e53707c55f708de20b12f11aeb1e3d46e47296db..15b3fc2572e69a0894bc0f6ed6a90cf7af278a73 100644 --- a/tests/test/c/importPerTabe.c +++ b/tests/test/c/importPerTabe.c @@ -71,7 +71,7 @@ void createDbAndTable() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { @@ -198,7 +198,7 @@ void *syncTest(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { diff --git a/tests/test/c/insertPerRow.c b/tests/test/c/insertPerRow.c index 7d17283b8847e6e6c644d92812eea821f4964d1c..6b5a6780938f534ffc1bcab2618301350c6c09e4 100644 --- a/tests/test/c/insertPerRow.c +++ b/tests/test/c/insertPerRow.c @@ -70,7 +70,7 @@ void createDbAndTable() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("failed to connect to DB, reason:%s", taos_errstr(con)); @@ -197,7 +197,7 @@ void *syncTest(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con)); diff --git a/tests/test/c/insertPerTable.c b/tests/test/c/insertPerTable.c index e280a728547aac4785135f277b1adc588714f0b6..a439abec881d21a7d2a1ae51e701f0da59afed44 100644 --- a/tests/test/c/insertPerTable.c +++ b/tests/test/c/insertPerTable.c @@ -71,7 +71,7 @@ void createDbAndTable() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { @@ -199,7 +199,7 @@ void *syncTest(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c index dd7f268f3efd3bbfff1c5abe0ba125443a78f58a..26291ba992346b595314d3e017272809aad3d62e 100644 --- a/tests/tsim/src/simExe.c +++ b/tests/tsim/src/simExe.c @@ -36,7 +36,12 @@ void simLogSql(char *sql) { fflush(fp); } +char *simParseHostName(char *varName); char *simGetVariable(SScript *script, char *varName, int varLen) { + if (strncmp(varName, "hostname", 8) == 0) { + return simParseHostName(varName); + } + if (strncmp(varName, "error", varLen) == 0) return script->error; if (strncmp(varName, "rows", varLen) == 0) return script->rows; @@ -409,6 +414,7 @@ void simCloseNativeConnect(SScript *script) { simTrace("script:%s, taos:%p closed", script->fileName, script->taos); taos_close(script->taos); + taosMsleep(1000); script->taos = NULL; } diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c index 55f1c97d3e437ededb04530115fa559893bdfec4..bac68c22d3dcbe5607f775a3a805f02d197b4409 100644 --- a/tests/tsim/src/simSystem.c +++ b/tests/tsim/src/simSystem.c @@ -19,6 +19,7 @@ #include "tglobal.h" #include "ttimer.h" #include "tutil.h" +#include "tsocket.h" SScript *simScriptList[MAX_MAIN_SCRIPT_NUM]; SCommand simCmdList[SIM_CMD_END]; @@ -26,8 +27,50 @@ int simScriptPos = -1; int simScriptSucced = 0; int simDebugFlag = 135; void simCloseTaosdConnect(SScript *script); +char simHostName[128]; + +char *simParseHostName(char *varName) { + static char hostName[140]; + + int index = atoi(varName + 8); + int port = 7100; + switch (index) { + case 1: + port = 7100; + break; + case 2: + port = 7200; + break; + case 3: + port = 7300; + break; + case 4: + port = 7400; + break; + case 5: + port = 7500; + break; + case 6: + port = 7600; + break; + case 7: + port = 7700; + break; + case 8: + port = 7800; + break; + case 9: + port = 7900; + break; + } + + sprintf(hostName, "'%s:%d'", simHostName, port); + //simPrint("hostName:%s", hostName); + return hostName; +} bool simSystemInit() { + taosGetFqdn(simHostName); taos_init(); simInitsimCmdList(); memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM);