From f15668cb7df09ce39608e359abb6ed62aa12893e Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Fri, 22 May 2020 02:35:37 +0000 Subject: [PATCH 01/35] [non-jira]change tsdb tag mechanism --- src/common/inc/tdataformat.h | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 51a5dad486..eef2e51cc2 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -198,6 +198,44 @@ void tdPopDataColsPoints(SDataCols *pCols, int pointsToPop); //!!!! int tdMergeDataCols(SDataCols *target, SDataCols *src, int rowsToMerge); void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCols *src2, int *iter2, int tRows); + +// ----------------- Tag row structure + +/* A tag row, the format is like below: ++----------+-------------------------------------------------------------+---------------------------------+ +| int16 | int16 | int64 | int16 | int64 | ...| int16 | int64 | char | ++----------+-------------------------------------------------------------+---------------------------------+ +| ncols | colId1 | offset1 | colId2 | offset2 | ...| colIdN | offsetN | values | ++----------+-------------------------------------------------------------+---------------------------------+ + */ +typedef void *STagRowRaw; + +#define TD_TAG_ROW_HEAD_SIZE sizeof(int16_t) + +#define tagRowNum(r) (*(int16_t *)(r)) +#define tagRowArray(r) POINTER_SHIFT(r, TD_TAG_ROW_HEAD_SIZE) +//#define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r))) +//#define dataRowSetLen(r, l) (dataRowLen(r) = (l)) +//#define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r)) +//#define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE) + +typedef struct { + int16_t colId; // column ID + union{ + int64_t tagOffset; + int64_t tagValue; + }; +} STagCol; + +typedef struct { + int16_t nCols; // Total columns allocated + STagCol tagCols[]; +} STagRow; + + + + + #ifdef __cplusplus } #endif From 0f43e08f591d65812d38df9eeca994a41e751794 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Sat, 23 May 2020 03:37:07 +0000 Subject: [PATCH 02/35] [TD-90]Tag Schema --- src/common/inc/tdataformat.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index eef2e51cc2..30fb18bb95 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -208,7 +208,7 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD | ncols | colId1 | offset1 | colId2 | offset2 | ...| colIdN | offsetN | values | +----------+-------------------------------------------------------------+---------------------------------+ */ -typedef void *STagRowRaw; + #define TD_TAG_ROW_HEAD_SIZE sizeof(int16_t) @@ -221,20 +221,20 @@ typedef void *STagRowRaw; typedef struct { int16_t colId; // column ID - union{ - int64_t tagOffset; - int64_t tagValue; - }; + int16_t colLen; // if col type is binary/Nchar, this is the length of binary/Nchar + int64_t valueOrOffset; //to store value for numeric col or offset for binary/Nchar } STagCol; typedef struct { - int16_t nCols; // Total columns allocated - STagCol tagCols[]; + int32_t len; + void * pBinaryData; // Space to store the binary and Nchar value + int16_t ncols; // Total columns allocated + STagCol tagCols[]; } STagRow; - - - +int tdInsertTagCol(SDataRow *row, void *value, int32_t bytes, int16_t colId); +int tdQuerTagByID(SDataRow row, void *value, int16_t colId); +SDataRow tdNewTagRowFromSchema(STSchema *pSchema); #ifdef __cplusplus } From 9daf6a9d54769fce79d29a969f514f2a774058da Mon Sep 17 00:00:00 2001 From: Ping Xiao Date: Sat, 23 May 2020 14:23:00 +0800 Subject: [PATCH 03/35] query with and/or/illegal filter --- tests/pytest/query/filterCombo.py | 57 +++++++++++++++++++++++++++++++ tests/pytest/query/queryError.py | 0 tests/pytest/smoketest.sh | 8 +++-- 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 tests/pytest/query/filterCombo.py create mode 100644 tests/pytest/query/queryError.py diff --git a/tests/pytest/query/filterCombo.py b/tests/pytest/query/filterCombo.py new file mode 100644 index 0000000000..a140f27000 --- /dev/null +++ b/tests/pytest/query/filterCombo.py @@ -0,0 +1,57 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +import sys +import taos +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + print("==============step1") + tdSql.execute( + "create table if not exists st (ts timestamp, tagtype int, name nchar(16)) tags(dev nchar(50))") + tdSql.execute( + 'CREATE TABLE if not exists dev_001 using st tags("dev_01")') + tdSql.execute( + 'CREATE TABLE if not exists dev_002 using st tags("dev_02")') + + print("==============step2") + + tdSql.execute( + """INSERT INTO dev_001(ts, tagtype, name) VALUES('2020-05-13 10:00:00.000', 1, 'first'),('2020-05-13 10:00:00.001', 2, 'second'), + ('2020-05-13 10:00:00.002', 3, 'third') dev_002 VALUES('2020-05-13 10:00:00.003', 1, 'first'), ('2020-05-13 10:00:00.004', 2, 'second'), + ('2020-05-13 10:00:00.005', 3, 'third')""") + + tdSql.query("select * from db.st where ts > '2020-05-13 10:00:00.002' AND tagtype < 2") + tdSql.checkRows(1) + + tdSql.error("select * from db.st where ts > '2020-05-13 10:00:00.002' OR tagtype < 2") + + + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/query/queryError.py b/tests/pytest/query/queryError.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh index 16fa38487d..8e0ccbd4b0 100755 --- a/tests/pytest/smoketest.sh +++ b/tests/pytest/smoketest.sh @@ -2,10 +2,14 @@ # insert python3 ./test.py $1 -f insert/basic.py python3 ./test.py $1 -s && sleep 1 +python3 ./test.py $1 -f query/filterCombo.py +python3 ./test.py $1 -s && sleep 1 + +:< Date: Sat, 23 May 2020 09:40:46 +0000 Subject: [PATCH 04/35] [TD-90] developing --- src/common/inc/tdataformat.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 30fb18bb95..4c3e578a9a 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -221,20 +221,28 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD typedef struct { int16_t colId; // column ID - int16_t colLen; // if col type is binary/Nchar, this is the length of binary/Nchar - int64_t valueOrOffset; //to store value for numeric col or offset for binary/Nchar + int8_t colType; + int8_t colLen; // if col type is binary/Nchar, this is the length of binary/Nchar + int16_t offset; //to store value for numeric col or offset for binary/Nchar } STagCol; typedef struct { int32_t len; - void * pBinaryData; // Space to store the binary and Nchar value + void * pData; // Space to store the tag value int16_t ncols; // Total columns allocated STagCol tagCols[]; } STagRow; -int tdInsertTagCol(SDataRow *row, void *value, int32_t bytes, int16_t colId); -int tdQuerTagByID(SDataRow row, void *value, int16_t colId); + +#define tagColSize(r) (sizeof(STagCol) + r.colLen) + +int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId); //insert tag value and update all the information +int tdDeleteTagCol(SDataRow row, int16_t colId); // delete tag value and update all the information +int tdQuerTagByID(SDataRow row, int16_t colId, void *value); //if find tag, return value length, else return -1; +int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes); + SDataRow tdNewTagRowFromSchema(STSchema *pSchema); +STSchema *tdGetSchemaFromData(SDataRow *row); #ifdef __cplusplus } From eb6b6e0c746c2968a77cfe8243f315e1f2dc2315 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Sun, 24 May 2020 08:48:51 +0000 Subject: [PATCH 05/35] [TD-90] alter tag function develop --- src/common/inc/tdataformat.h | 20 ++++++++++-------- src/common/src/tdataformat.c | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 4c3e578a9a..0aec948015 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -202,11 +202,15 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD // ----------------- Tag row structure /* A tag row, the format is like below: -+----------+-------------------------------------------------------------+---------------------------------+ -| int16 | int16 | int64 | int16 | int64 | ...| int16 | int64 | char | -+----------+-------------------------------------------------------------+---------------------------------+ -| ncols | colId1 | offset1 | colId2 | offset2 | ...| colIdN | offsetN | values | -+----------+-------------------------------------------------------------+---------------------------------+ ++----------+----------------------------------------------------------------+ +| STagRow | STagCol | STagCol | STagCol | STagCol | ...| STagCol | STagCol | ++----------+----------------------------------------------------------------+ + +pData ++----------+----------------------------------------------------------------+ +| value 1 | value 2 | value 3 | value 4 | ....|value n | ++----------+----------------------------------------------------------------+ + */ @@ -221,8 +225,8 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD typedef struct { int16_t colId; // column ID - int8_t colType; - int8_t colLen; // if col type is binary/Nchar, this is the length of binary/Nchar + int16_t colType; + int16_t colLen; // if col type is binary/Nchar, this is the length of binary/Nchar int16_t offset; //to store value for numeric col or offset for binary/Nchar } STagCol; @@ -238,7 +242,7 @@ typedef struct { int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId); //insert tag value and update all the information int tdDeleteTagCol(SDataRow row, int16_t colId); // delete tag value and update all the information -int tdQuerTagByID(SDataRow row, int16_t colId, void *value); //if find tag, return value length, else return -1; +int tdQuerTagByID(SDataRow row, int16_t colId, void *value, int16_t *type, int16_t *len); //if find tag, 0, else return -1; int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes); SDataRow tdNewTagRowFromSchema(STSchema *pSchema); diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index 9d81cd07af..3df94452d8 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -151,6 +151,26 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { return row; } +int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId){ //insert tag value and update all the information + return 0; +}; + +int tdDeleteTagCol(SDataRow row, int16_t colId){ // delete tag value and update all the information + return o; +}; + +int tdQuerTagByID(SDataRow row, int16_t colId, void *value, int16_t *type, int16_t *len){ //if find tag, 0, else return -1; + return 0; +}; + +int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes){ + return 0; +}; + +SDataRow tdNewTagRowFromSchema(STSchema *pSchema) { + //todo +} + /** * Free the SDataRow object */ @@ -183,6 +203,25 @@ int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_ return 0; } +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_SHIFT(row, dataRowLen(row)); + + switch (type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + *(VarDataOffsetT *)POINTER_SHIFT(row, toffset) = dataRowLen(row); + memcpy(ptr, value, varDataTLen(value)); + dataRowLen(row) += varDataTLen(value); + break; + default: + memcpy(POINTER_SHIFT(row, toffset), value, TYPE_BYTES[type]); + break; + } + + return 0; +} SDataRow tdDataRowDup(SDataRow row) { SDataRow trow = malloc(dataRowLen(row)); From 77ef030ef1d8e6cf780b79763736d64b24714e44 Mon Sep 17 00:00:00 2001 From: Jeff Tao Date: Mon, 25 May 2020 01:41:05 +0000 Subject: [PATCH 06/35] getFileInfo bug --- src/common/src/tglobal.c | 2 +- src/tsdb/src/tsdbMain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 250b79febe..faf15c4215 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -142,7 +142,7 @@ int32_t rpcDebugFlag = 135; int32_t uDebugFlag = 131; int32_t debugFlag = 131; int32_t sDebugFlag = 135; -int32_t tsdbDebugFlag = 131; +int32_t tsdbDebugFlag = 135; // the maximum number of results for projection query on super table that are returned from // one virtual node, to order according to timestamp diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index a9f0d9b6ec..7db61db429 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -1196,7 +1196,7 @@ uint32_t tsdbGetFileInfo(TsdbRepoT *repo, char *name, uint32_t *index, int32_t * // Map index to the file name int fid = (*index) / 3; - if (fid > pFileH->numOfFGroups) { + if (fid >= pFileH->numOfFGroups) { // return meta data file if ((*index) % 3 > 0) { // it is finished tfree(spath); From 9c3ddab8c563c8d8ae569c1b35fe9a6079ef8633 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 25 May 2020 03:04:51 +0000 Subject: [PATCH 07/35] scripts --- tests/script/unique/mnode/mgmt22.sim | 1 + tests/script/unique/mnode/mgmt24.sim | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index 37e38fbf66..c6ea026af9 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/tests/script/unique/mnode/mgmt22.sim @@ -47,6 +47,7 @@ print should not drop master print ============== step4 system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +sleep 2000 sql_error show mnodes print error of no master diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim index 4c61cbd7ae..4813d96f5f 100644 --- a/tests/script/unique/mnode/mgmt24.sim +++ b/tests/script/unique/mnode/mgmt24.sim @@ -42,6 +42,7 @@ endi print ============== step3 system sh/exec_up.sh -n dnode1 -s stop +sleep 2000 sql_error show mnodes print ============== step4 From 374751dba557d9537c6cb4e810ffcfbb7b2da469 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 25 May 2020 13:53:41 +0800 Subject: [PATCH 08/35] [TD-410] fix log print error --- src/client/inc/tscLog.h | 23 +++++-------------- src/client/src/TSDBJNIConnector.c | 18 ++++----------- src/common/inc/tulog.h | 32 +++++++-------------------- src/cq/src/cqMain.c | 8 +++---- src/dnode/inc/dnodeInt.h | 8 +++---- src/mnode/inc/mgmtInt.h | 28 +++++++++++------------ src/plugins/http/inc/httpLog.h | 23 +++++-------------- src/plugins/monitor/src/monitorMain.c | 18 ++++----------- src/query/inc/queryLog.h | 19 ++++------------ src/rpc/inc/rpcLog.h | 25 +++++---------------- src/tsdb/inc/tsdbMain.h | 18 ++++----------- 11 files changed, 62 insertions(+), 158 deletions(-) diff --git a/src/client/inc/tscLog.h b/src/client/inc/tscLog.h index 346e1a6795..f200d91a07 100644 --- a/src/client/inc/tscLog.h +++ b/src/client/inc/tscLog.h @@ -24,24 +24,11 @@ extern "C" { extern int32_t cDebugFlag; -#define tscError(...) \ - if (cDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR TSC ", 255, __VA_ARGS__); \ - } -#define tscWarn(...) \ - if (cDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN TSC ", cDebugFlag, __VA_ARGS__); \ - } -#define tscTrace(...) \ - if (cDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); \ - } -#define tscPrint(...) \ - { taosPrintLog("TSC ", 255, __VA_ARGS__); } -#define tscDump(...) \ - if (cDebugFlag & DEBUG_TRACE) { \ - taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); \ - } +#define tscError(...) { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscWarn(...) { if (cDebugFlag & DEBUG_WARN) { taosPrintLog("WARN TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscTrace(...) { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscDump(...) { if (cDebugFlag & DEBUG_TRACE) { taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); }} +#define tscPrint(...) { taosPrintLog("TSC ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } #ifdef __cplusplus } diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c index 812c197ef7..802d383152 100644 --- a/src/client/src/TSDBJNIConnector.c +++ b/src/client/src/TSDBJNIConnector.c @@ -22,20 +22,10 @@ #include "tlog.h" #include "ttime.h" -#define jniError(...) \ - if (jniDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); \ - } -#define jniWarn(...) \ - if (jniDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); \ - } -#define jniTrace(...) \ - if (jniDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); \ - } -#define jniPrint(...) \ - { taosPrintLog("JNI ", 255, __VA_ARGS__); } +#define jniError(...) { if (jniDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); }} +#define jniWarn(...) { if (jniDebugFlag & DEBUG_WARN) { taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); }} +#define jniTrace(...) { if (jniDebugFlag & DEBUG_TRACE) { taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); }} +#define jniPrint(...) { taosPrintLog("JNI ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } int __init = 0; diff --git a/src/common/inc/tulog.h b/src/common/inc/tulog.h index 143bc56f9f..a47e894e31 100644 --- a/src/common/inc/tulog.h +++ b/src/common/inc/tulog.h @@ -25,31 +25,15 @@ extern "C" { extern int32_t uDebugFlag; extern int32_t tscEmbedded; -#define uError(...) \ - if (uDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR UTL ", uDebugFlag, __VA_ARGS__); \ - } -#define uWarn(...) \ - if (uDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN UTL ", uDebugFlag, __VA_ARGS__); \ - } -#define uTrace(...) \ - if (uDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); \ - } -#define uDump(x, y) \ - if (uDebugFlag & DEBUG_DUMP) { \ - taosDumpData(x, y); \ - } -#define uPrint(...) \ - { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } -#define uForcePrint(...) \ - { taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); } +#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR UTL ", uDebugFlag, __VA_ARGS__); }} +#define uWarn(...) { if (uDebugFlag & DEBUG_WARN) { taosPrintLog("WARN UTL ", uDebugFlag, __VA_ARGS__); }} +#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }} +#define uDump(x, y) { if (uDebugFlag & DEBUG_DUMP) { taosDumpData(x, y); }} +#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__); } -#define pPrint(...) \ - { taosPrintLog("APP ", 255, __VA_ARGS__); } +#define pError(...) { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); } +#define pPrint(...) { taosPrintLog("APP ", 255, __VA_ARGS__); } #ifdef __cplusplus } diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c index 5cc3ce0159..6e81db7db7 100644 --- a/src/cq/src/cqMain.c +++ b/src/cq/src/cqMain.c @@ -27,10 +27,10 @@ #include "tcq.h" #include "taos.h" -#define cError(...) if (cqDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR CQ ", cqDebugFlag, __VA_ARGS__);} -#define cWarn(...) if (cqDebugFlag & DEBUG_WARN) {taosPrintLog("WARN CQ ", cqDebugFlag, __VA_ARGS__);} -#define cTrace(...) if (cqDebugFlag & DEBUG_TRACE) {taosPrintLog("CQ ", cqDebugFlag, __VA_ARGS__);} -#define cPrint(...) {taosPrintLog("CQ ", 255, __VA_ARGS__);} +#define cError(...) { if (cqDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR CQ ", cqDebugFlag, __VA_ARGS__); }} +#define cWarn(...) { if (cqDebugFlag & DEBUG_WARN) { taosPrintLog("WARN CQ ", cqDebugFlag, __VA_ARGS__); }} +#define cTrace(...) { if (cqDebugFlag & DEBUG_TRACE) { taosPrintLog("CQ ", cqDebugFlag, __VA_ARGS__); }} +#define cPrint(...) { taosPrintLog("CQ ", 255, __VA_ARGS__); } typedef struct { int vgId; diff --git a/src/dnode/inc/dnodeInt.h b/src/dnode/inc/dnodeInt.h index c69055723b..663914a959 100644 --- a/src/dnode/inc/dnodeInt.h +++ b/src/dnode/inc/dnodeInt.h @@ -24,10 +24,10 @@ extern "C" { extern int32_t dDebugFlag; -#define dError(...) if (dDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR DND ", 255, __VA_ARGS__); } -#define dWarn(...) if (dDebugFlag & DEBUG_WARN) {taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); } -#define dTrace(...) if (dDebugFlag & DEBUG_TRACE) {taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); } -#define dPrint(...) {taosPrintLog("DND ", 255, __VA_ARGS__); } +#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR DND ", 255, __VA_ARGS__); }} +#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); }} +#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }} +#define dPrint(...) { taosPrintLog("DND ", 255, __VA_ARGS__); } #ifdef __cplusplus } diff --git a/src/mnode/inc/mgmtInt.h b/src/mnode/inc/mgmtInt.h index a83d5beee0..240392f684 100644 --- a/src/mnode/inc/mgmtInt.h +++ b/src/mnode/inc/mgmtInt.h @@ -27,23 +27,23 @@ extern int32_t mDebugFlag; extern int32_t sdbDebugFlag; // mnode log function -#define mError(...) if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND ", 255, __VA_ARGS__); } -#define mWarn(...) if (mDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND ", mDebugFlag, __VA_ARGS__); } -#define mTrace(...) if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); } -#define mPrint(...) { taosPrintLog("MND ", 255, __VA_ARGS__); } +#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND ", 255, __VA_ARGS__); }} +#define mWarn(...) { if (mDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND ", mDebugFlag, __VA_ARGS__); }} +#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }} +#define mPrint(...) { taosPrintLog("MND ", 255, __VA_ARGS__); } -#define mLError(...) monitorSaveLog(2, __VA_ARGS__); mError(__VA_ARGS__) -#define mLWarn(...) monitorSaveLog(1, __VA_ARGS__); mWarn(__VA_ARGS__) -#define mLPrint(...) monitorSaveLog(0, __VA_ARGS__); mPrint(__VA_ARGS__) +#define mLError(...) { monitorSaveLog(2, __VA_ARGS__); mError(__VA_ARGS__) } +#define mLWarn(...) { monitorSaveLog(1, __VA_ARGS__); mWarn(__VA_ARGS__) } +#define mLPrint(...) { monitorSaveLog(0, __VA_ARGS__); mPrint(__VA_ARGS__) } -#define sdbError(...) if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); } -#define sdbWarn(...) if (sdbDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND-SDB ", sdbDebugFlag, __VA_ARGS__); } -#define sdbTrace(...) if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__);} -#define sdbPrint(...) { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); } +#define sdbError(...) { if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); }} +#define sdbWarn(...) { if (sdbDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MND-SDB ", sdbDebugFlag, __VA_ARGS__); }} +#define sdbTrace(...) { if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__);}} +#define sdbPrint(...) { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); } -#define sdbLError(...) monitorSaveLog(2, __VA_ARGS__); sdbError(__VA_ARGS__) -#define sdbLWarn(...) monitorSaveLog(1, __VA_ARGS__); sdbWarn(__VA_ARGS__) -#define sdbLPrint(...) monitorSaveLog(0, __VA_ARGS__); sdbPrint(__VA_ARGS__) +#define sdbLError(...) { monitorSaveLog(2, __VA_ARGS__); sdbError(__VA_ARGS__) } +#define sdbLWarn(...) { monitorSaveLog(1, __VA_ARGS__); sdbWarn(__VA_ARGS__) } +#define sdbLPrint(...) { monitorSaveLog(0, __VA_ARGS__); sdbPrint(__VA_ARGS__) } #ifdef __cplusplus } diff --git a/src/plugins/http/inc/httpLog.h b/src/plugins/http/inc/httpLog.h index 19fa46bd23..0e09f277f0 100644 --- a/src/plugins/http/inc/httpLog.h +++ b/src/plugins/http/inc/httpLog.h @@ -20,23 +20,10 @@ extern int32_t httpDebugFlag; -#define httpError(...) \ - if (httpDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR HTP ", 255, __VA_ARGS__); \ - } -#define httpWarn(...) \ - if (httpDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpTrace(...) \ - if (httpDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpDump(...) \ - if (httpDebugFlag & DEBUG_TRACE) { \ - taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpPrint(...) \ - { taosPrintLog("HTP ", 255, __VA_ARGS__); } +#define httpError(...) { if (httpDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR HTP ", 255, __VA_ARGS__); }} +#define httpWarn(...) { if (httpDebugFlag & DEBUG_WARN) { taosPrintLog("WARN HTP ", httpDebugFlag, __VA_ARGS__); }} +#define httpTrace(...) { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); }} +#define httpDump(...) { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); }} +#define httpPrint(...) { taosPrintLog("HTP ", 255, __VA_ARGS__); } #endif diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c index 72efd5b552..fc958c1b1f 100644 --- a/src/plugins/monitor/src/monitorMain.c +++ b/src/plugins/monitor/src/monitorMain.c @@ -27,20 +27,10 @@ #include "dnode.h" #include "monitor.h" -#define monitorError(...) \ - if (monitorDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR MON ", 255, __VA_ARGS__); \ - } -#define monitorWarn(...) \ - if (monitorDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN MON ", monitorDebugFlag, __VA_ARGS__); \ - } -#define monitorTrace(...) \ - if (monitorDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); \ - } -#define monitorPrint(...) \ - { taosPrintLog("MON ", 255, __VA_ARGS__); } +#define monitorError(...) { if (monitorDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MON ", 255, __VA_ARGS__); }} +#define monitorWarn(...) { if (monitorDebugFlag & DEBUG_WARN) { taosPrintLog("WARN MON ", monitorDebugFlag, __VA_ARGS__); }} +#define monitorTrace(...) { if (monitorDebugFlag & DEBUG_TRACE) { taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); }} +#define monitorPrint(...) { taosPrintLog("MON ", 255, __VA_ARGS__); } #define SQL_LENGTH 1024 #define LOG_LEN_STR 100 diff --git a/src/query/inc/queryLog.h b/src/query/inc/queryLog.h index 32338a4143..e92f6abe87 100644 --- a/src/query/inc/queryLog.h +++ b/src/query/inc/queryLog.h @@ -24,23 +24,12 @@ extern "C" { extern int32_t qDebugFlag; -#define qTrace(...) \ - if (qDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); \ - } - -#define qError(...) \ - if (qDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR QRY ", qDebugFlag, __VA_ARGS__); \ - } - -#define qWarn(...) \ - if (qDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN QRY ", qDebugFlag, __VA_ARGS__); \ - } +#define qTrace(...) { if (qDebugFlag & DEBUG_TRACE) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }} +#define qError(...) { if (qDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR QRY ", qDebugFlag, __VA_ARGS__); }} +#define qWarn(...) { if (qDebugFlag & DEBUG_WARN) { taosPrintLog("WARN QRY ", qDebugFlag, __VA_ARGS__); }} #ifdef __cplusplus } #endif -#endif // TDENGINE_QUERY_CACHE_H +#endif // TDENGINE_QUERY_LOG_H diff --git a/src/rpc/inc/rpcLog.h b/src/rpc/inc/rpcLog.h index 251863f1de..5094d81757 100644 --- a/src/rpc/inc/rpcLog.h +++ b/src/rpc/inc/rpcLog.h @@ -24,27 +24,14 @@ extern "C" { extern int32_t rpcDebugFlag; -#define tError(...) \ - if (rpcDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); \ - } -#define tWarn(...) \ - if (rpcDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN RPC ", rpcDebugFlag, __VA_ARGS__); \ - } -#define tTrace(...) \ - if (rpcDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); \ - } -#define tPrint(...) \ - { taosPrintLog("RPC ", 255, __VA_ARGS__); } -#define tDump(x, y) \ - if (rpcDebugFlag & DEBUG_DUMP) { \ - taosDumpData((unsigned char *)x, y); \ - } +#define tError(...) { if (rpcDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); }} +#define tWarn(...) { if (rpcDebugFlag & DEBUG_WARN) { taosPrintLog("WARN RPC ", rpcDebugFlag, __VA_ARGS__); }} +#define tTrace(...) { if (rpcDebugFlag & DEBUG_TRACE) { taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); }} +#define tDump(x, y) { if (rpcDebugFlag & DEBUG_DUMP) { taosDumpData((unsigned char *)x, y); }} +#define tPrint(...) { taosPrintLog("RPC ", 255, __VA_ARGS__); } #ifdef __cplusplus } #endif -#endif // TDENGINE_RPC_CACHE_H +#endif // TDENGINE_RPC_LOG_H diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index 4225602292..758da3960e 100644 --- a/src/tsdb/inc/tsdbMain.h +++ b/src/tsdb/inc/tsdbMain.h @@ -29,20 +29,10 @@ extern "C" { extern int tsdbDebugFlag; -#define tsdbError(...) \ - if (tsdbDebugFlag & DEBUG_ERROR) { \ - taosPrintLog("ERROR TDB ", tsdbDebugFlag, __VA_ARGS__); \ - } -#define tsdbWarn(...) \ - if (tsdbDebugFlag & DEBUG_WARN) { \ - taosPrintLog("WARN TDB ", tsdbDebugFlag, __VA_ARGS__); \ - } -#define tsdbTrace(...) \ - if (tsdbDebugFlag & DEBUG_TRACE) { \ - taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); \ - } -#define tsdbPrint(...) \ - { taosPrintLog("TDB ", 255, __VA_ARGS__); } +#define tsdbError(...) { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR TDB ", tsdbDebugFlag, __VA_ARGS__); }} +#define tsdbWarn(...) { if (tsdbDebugFlag & DEBUG_WARN) { taosPrintLog("WARN TDB ", tsdbDebugFlag, __VA_ARGS__); }} +#define tsdbTrace(...) { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} +#define tsdbPrint(...) { taosPrintLog("TDB ", 255, __VA_ARGS__); } // ------------------------------ TSDB META FILE INTERFACES ------------------------------ #define TSDB_META_FILE_NAME "meta" From 9dc99b3df7f6cd54ba3874600e5c7ed832b24c0f Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 25 May 2020 13:59:08 +0800 Subject: [PATCH 09/35] [TD-410] not print local error msg --- src/common/src/tlocale.c | 6 +++--- src/os/linux/src/linuxSysPara.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/src/tlocale.c b/src/common/src/tlocale.c index b2631cf08c..46a3d951db 100644 --- a/src/common/src/tlocale.c +++ b/src/common/src/tlocale.c @@ -31,16 +31,16 @@ void tsSetLocale() { // default locale or user specified locale is not valid, abort launch if (locale == NULL) { - uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale); + uError("Invalid locale:%s, please set the valid locale in config file", tsLocale); } if (strlen(tsCharset) == 0) { - uForcePrint("failed to get charset, please set the valid charset in config file"); + uError("failed to get charset, please set the valid charset in config file"); exit(-1); } if (!taosValidateEncodec(tsCharset)) { - uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset); + uError("Invalid charset:%s, please set the valid charset in config file", tsCharset); exit(-1); } } \ No newline at end of file diff --git a/src/os/linux/src/linuxSysPara.c b/src/os/linux/src/linuxSysPara.c index 8b8607a58d..5794ad0302 100644 --- a/src/os/linux/src/linuxSysPara.c +++ b/src/os/linux/src/linuxSysPara.c @@ -226,11 +226,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) { - uForcePrint("can't get locale from system, set it to en_US.UTF-8"); + uError("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)); - uForcePrint("locale not configured, set to system default:%s", tsLocale); + uError("locale not configured, set to system default:%s", tsLocale); } } @@ -245,10 +245,10 @@ static void taosGetSystemLocale() { // get and set default locale strncpy(tsCharset, revisedCharset, tListLen(tsCharset)); free(revisedCharset); - uForcePrint("charset not configured, set to system default:%s", tsCharset); + uError("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"); + uError("can't get locale and charset from system, set it to UTF-8"); } } } From 508dd0b409894017f90e22f45da832fb98cacefc Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 25 May 2020 14:49:15 +0800 Subject: [PATCH 10/35] scripts --- tests/script/basicSuite.sim | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index 420b08c1e1..de6ed85b09 100644 --- a/tests/script/basicSuite.sim +++ b/tests/script/basicSuite.sim @@ -1,21 +1,21 @@ run general/cache/new_metrics.sim +run general/column/commit.sim run general/compress/compress.sim -run general/compute/avg.sim -run general/compute/count.sim -run general/db/len.sim +run general/compute/interval.sim run general/db/basic4.sim +run general/field/binary.sim run general/http/restful_insert.sim -run general/import/basic.sim run general/import/commit.sim -run general/insert/query_file_memory.sim +run general/import/replica1.sim +run general/parser/auto_create_tb_drop_tb.sim run general/parser/binary_escapeCharacter.sim run general/parser/select_from_cache_disk.sim +run general/stable/vnode3.sim run general/table/autocreate.sim -run general/table/column_name.sim -run general/table/int.sim +run general/table/fill.sim run general/table/vgroup.sim -run general/user/basic1.sim -run general/user/pass_alter.sim -run general/vector/single.sim -#run general/connection/connection.sim +run general/tag/filter.sim run general/user/authority.sim +run general/user/pass_alter.sim +run general/vector/metrics_mix.sim +run general/vector/table_field.sim From 9560f319b24021769c0c569786c22134f22433ce Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 25 May 2020 16:12:49 +0800 Subject: [PATCH 11/35] add insert/sparseData.py to test compressing sparse file content. [TD-412] --- tests/pytest/insert/randomNullCommit.py | 14 +- tests/pytest/insert/sparseData.py | 67 ++++ tests/pytest/random-test/random-test.py | 1 + tests/pytest/table/boundary.py | 8 +- tests/pytest/tag_lite/3.py | 206 +++++------ tests/pytest/tag_lite/4.py | 290 ++++++++-------- tests/pytest/tag_lite/5.py | 342 +++++++++--------- tests/pytest/tag_lite/6.py | 410 +++++++++++----------- tests/pytest/tag_lite/add.py | 292 ++++++++-------- tests/pytest/tag_lite/bigint.py | 86 ++--- tests/pytest/tag_lite/binary.py | 86 ++--- tests/pytest/tag_lite/binary_binary.py | 114 +++--- tests/pytest/tag_lite/bool.py | 84 ++--- tests/pytest/tag_lite/bool_binary.py | 114 +++--- tests/pytest/tag_lite/bool_int.py | 122 +++---- tests/pytest/tag_lite/change.py | 194 +++++------ tests/pytest/tag_lite/column.py | 10 +- tests/pytest/tag_lite/commit.py | 444 ++++++++++++------------ tests/pytest/tag_lite/create.py | 182 +++++----- tests/pytest/tag_lite/delete.py | 286 +++++++-------- tests/pytest/tag_lite/double.py | 86 ++--- tests/pytest/tag_lite/filter.py | 18 +- tests/pytest/tag_lite/float.py | 86 ++--- tests/pytest/tag_lite/int.py | 86 ++--- tests/pytest/tag_lite/int_binary.py | 114 +++--- tests/pytest/tag_lite/int_float.py | 122 +++---- tests/pytest/tag_lite/set.py | 204 +++++------ tests/pytest/tag_lite/smallint.py | 86 ++--- tests/pytest/tag_lite/tinyint.py | 86 ++--- tests/pytest/util/dnodes.py | 17 + 30 files changed, 2174 insertions(+), 2083 deletions(-) create mode 100644 tests/pytest/insert/sparseData.py diff --git a/tests/pytest/insert/randomNullCommit.py b/tests/pytest/insert/randomNullCommit.py index f90bb9b3e5..ecacd20daf 100644 --- a/tests/pytest/insert/randomNullCommit.py +++ b/tests/pytest/insert/randomNullCommit.py @@ -29,7 +29,8 @@ class TDTestCase: tdSql.prepare() tdLog.info("=============== step1") - tdSql.execute('create table tb (ts timestamp, speed int, temp float, note binary(5), flag bool)') + tdSql.execute( + 'create table tb (ts timestamp, speed int, temp float, note binary(5), flag bool)') numOfRecords = 0 randomList = [10, 50, 100, 500, 1000, 5000] @@ -38,23 +39,24 @@ class TDTestCase: tdLog.info("will insert %d records" % num) for x in range(0, num): tdLog.info( - 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % x) + 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % + x) tdSql.execute( - 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % x) + 'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' % + x) numOfRecords = numOfRecords + num tdSql.query("select * from tb") tdSql.checkRows(numOfRecords) - tdSql.checkData(numOfRecords-num, 1, None) - tdSql.checkData(numOfRecords-1, 2, None) + tdSql.checkData(numOfRecords - num, 1, None) + tdSql.checkData(numOfRecords - 1, 2, None) tdLog.info("stop dnode to commit data to disk") tdDnodes.stop(1) tdDnodes.start(1) tdLog.sleep(5) - def stop(self): tdSql.close() tdLog.success("%s successfully executed" % __file__) diff --git a/tests/pytest/insert/sparseData.py b/tests/pytest/insert/sparseData.py new file mode 100644 index 0000000000..38b04b339e --- /dev/null +++ b/tests/pytest/insert/sparseData.py @@ -0,0 +1,67 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +import sys + +from util.log import * +from util.cases import * +from util.sql import * +from util.dnodes import * + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + tdLog.info("=============== step1") + tdSql.execute( + 'create table tb (ts timestamp, speed int, temp float, note binary(4000), flag bool)') + + numOfRecords = 1000000 + dividend = 1000 + tdLog.info("will insert %d records" % numOfRecords) + + ts = 1500000000000 + for i in range(0, numOfRecords): + + if (i % dividend): + print(".", end="") + tdSql.execute( + 'insert into tb values (%d + %da, NULL, NULL, NULL, TRUE)' % + (ts, i)) + else: + print("a", end="") + tdSql.execute( + 'insert into tb values (%d + %da, NULL, NULL, "a", FALSE)' % + (ts, i)) + + tdSql.query("select * from tb") + tdSql.checkRows(numOfRecords) + tdSql.checkData(numOfRecords - dividend, 3, 'a') + tdSql.checkData(numOfRecords - dividend - 1, 3, None) + + tdLog.info("stop dnode to commit data to disk") + tdDnodes.stop(1) + tdLog.info("dnodes:%d size is %d" % (1, tdDnodes.getDataSize(1))) + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/random-test/random-test.py b/tests/pytest/random-test/random-test.py index 4e1e6ac2fa..596f33264f 100644 --- a/tests/pytest/random-test/random-test.py +++ b/tests/pytest/random-test/random-test.py @@ -121,6 +121,7 @@ class Test: tdDnodes.start(1) tdSql.prepare() + class TDTestCase: def init(self, conn, logSql): tdLog.debug("start to execute %s" % __file__) diff --git a/tests/pytest/table/boundary.py b/tests/pytest/table/boundary.py index 29fdd5c475..bb5e187f0d 100644 --- a/tests/pytest/table/boundary.py +++ b/tests/pytest/table/boundary.py @@ -98,12 +98,16 @@ class TDTestCase: # create a super table with name exceed max length sname = self.generateString(maxTableNameLen + 1) tdLog.info("create a super table with length %d" % len(sname)) - tdSql.error("create table %s (ts timestamp, value int) tags(id int)" % sname) + tdSql.error( + "create table %s (ts timestamp, value int) tags(id int)" % + sname) # create a super table with name of max length sname = self.generateString(maxTableNameLen) tdLog.info("create a super table with length %d" % len(sname)) - tdSql.execute("create table %s (ts timestamp, value int) tags(id int)" % sname) + tdSql.execute( + "create table %s (ts timestamp, value int) tags(id int)" % + sname) tdLog.info("check table count, should be one") tdSql.query('show stables') tdSql.checkRows(1) diff --git a/tests/pytest/tag_lite/3.py b/tests/pytest/tag_lite/3.py index 68d2e6c5ba..373db1c70f 100644 --- a/tests/pytest/tag_lite/3.py +++ b/tests/pytest/tag_lite/3.py @@ -69,9 +69,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw while (i < 10): tb = "%s%d" % (tbPrefix, i) # TSIM: sql create table $tb using %s tags( 1, 1, 1 ) @@ -89,9 +89,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -102,7 +102,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(%d)' % totalNum) tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from %s where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % mt) @@ -111,7 +111,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % mt) tdSql.query('select * from %s where ts > now + 4m' % mt) @@ -119,7 +119,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % mt) tdSql.query('select * from %s where ts = now + 4m' % mt) @@ -127,7 +127,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -149,14 +149,14 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % mt) tdSql.query('select * from %s where tgcol1 <> 0' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % mt) tdSql.query('select * from %s where tgcol1 = 1' % mt) @@ -164,35 +164,35 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % mt) tdSql.query('select * from %s where tgcol1 <> 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = true tdLog.info('select * from %s where tgcol1 = true' % mt) tdSql.query('select * from %s where tgcol1 = true' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> true tdLog.info('select * from %s where tgcol1 <> true' % mt) tdSql.query('select * from %s where tgcol1 <> true' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = false tdLog.info('select * from %s where tgcol1 = false' % mt) tdSql.query('select * from %s where tgcol1 = false' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> false tdLog.info('select * from %s where tgcol1 <> false' % mt) tdSql.query('select * from %s where tgcol1 <> false' % mt) @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -210,28 +210,28 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % mt) tdSql.query('select * from %s where tgcol2 <> 0' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % mt) tdSql.query('select * from %s where tgcol2 = 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % mt) tdSql.query('select * from %s where tgcol2 <> 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -242,28 +242,28 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % mt) tdSql.query('select * from %s where tgcol3 <> 0' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % mt) tdSql.query('select * from %s where tgcol3 = 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % mt) tdSql.query('select * from %s where tgcol3 <> 1' % mt) tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -277,7 +277,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol1 <> true' % @@ -288,7 +288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 = false' % @@ -299,7 +299,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 <> false' % @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 = false' % @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> false' % @@ -332,7 +332,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> false tdLog.info( @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> false # and ts < now + 5m tdLog.info( @@ -357,7 +357,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -368,7 +368,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt) tdSql.query( @@ -378,7 +378,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) @@ -386,7 +386,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt) tdSql.query( @@ -396,7 +396,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt) tdSql.query( @@ -406,7 +406,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -418,7 +418,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -431,7 +431,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m tdLog.info( @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -455,7 +455,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt) tdSql.query( @@ -465,7 +465,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) @@ -473,7 +473,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt) tdSql.query( @@ -483,7 +483,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt) tdSql.query( @@ -493,7 +493,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -505,7 +505,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -518,7 +518,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m tdLog.info( @@ -531,7 +531,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -547,7 +547,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> true tdLog.info( @@ -560,7 +560,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and # tgcol1 = false tdLog.info( @@ -573,7 +573,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> false tdLog.info( @@ -586,7 +586,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = false tdLog.info( @@ -599,7 +599,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> false tdLog.info( @@ -612,7 +612,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> false tdLog.info( @@ -625,7 +625,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> false tdLog.info( @@ -638,7 +638,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -654,7 +654,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol1 <> true tdLog.info( @@ -667,7 +667,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol1 = false tdLog.info( @@ -680,7 +680,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol1 <> false tdLog.info( @@ -693,7 +693,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol1 = false tdLog.info( @@ -706,7 +706,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol1 <> false tdLog.info( @@ -719,7 +719,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol1 <> false tdLog.info( @@ -732,7 +732,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> false tdLog.info( @@ -745,7 +745,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -761,7 +761,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -774,7 +774,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -787,7 +787,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -800,7 +800,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -813,7 +813,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -826,7 +826,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -839,7 +839,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -852,7 +852,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -868,7 +868,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -881,7 +881,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -894,7 +894,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -907,7 +907,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -920,7 +920,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -933,7 +933,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -946,7 +946,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -959,7 +959,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -977,7 +977,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -995,7 +995,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1012,7 +1012,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1029,7 +1029,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1047,7 +1047,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1064,7 +1064,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1081,7 +1081,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1096,7 +1096,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1114,7 +1114,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2 @@ -1130,7 +1130,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3 @@ -1146,7 +1146,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1165,7 +1165,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1182,7 +1182,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1199,7 +1199,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1218,7 +1218,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1235,7 +1235,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1250,7 +1250,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1263,7 +1263,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1278,7 +1278,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1291,7 +1291,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and @@ -1304,7 +1304,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -1318,7 +1318,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/4.py b/tests/pytest/tag_lite/4.py index 66641f9dfe..aae930ecdf 100644 --- a/tests/pytest/tag_lite/4.py +++ b/tests/pytest/tag_lite/4.py @@ -73,9 +73,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw while (i < 10): tb = "%s%d" % (tbPrefix, i) # TSIM: sql create table $tb using %s tags( 1, 1, 1, 1 ) @@ -96,9 +96,9 @@ class TDTestCase: "insert into %s values (now + %s, %d)" % (tb, ms, x)) x = x + 1 - #TSIM: endw + # TSIM: endw i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -109,7 +109,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from %s where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % mt) @@ -118,7 +118,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % mt) tdSql.query('select * from %s where ts > now + 4m' % mt) @@ -126,7 +126,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % mt) tdSql.query('select * from %s where ts = now + 4m' % mt) @@ -134,7 +134,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -157,7 +157,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % mt) tdSql.query('select * from %s where tgcol1 <> 0' % mt) @@ -165,7 +165,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % mt) tdSql.query('select * from %s where tgcol1 = 1' % mt) @@ -173,7 +173,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % mt) tdSql.query('select * from %s where tgcol1 <> 1' % mt) @@ -181,7 +181,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % mt) tdSql.query('select * from %s where tgcol1 = 1' % mt) @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % mt) tdSql.query('select * from %s where tgcol1 <> 1' % mt) @@ -197,7 +197,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 = 0 tdLog.info('select * from %s where tgcol1 = 0' % mt) tdSql.query('select * from %s where tgcol1 = 0' % mt) @@ -205,7 +205,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % mt) tdSql.query('select * from %s where tgcol1 <> 0' % mt) @@ -213,7 +213,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % mt) tdSql.query('select * from %s where tgcol2 <> 0' % mt) @@ -232,7 +232,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % mt) tdSql.query('select * from %s where tgcol2 = 1' % mt) @@ -240,7 +240,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % mt) tdSql.query('select * from %s where tgcol2 <> 1' % mt) @@ -248,7 +248,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -259,7 +259,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % mt) tdSql.query('select * from %s where tgcol3 <> 0' % mt) @@ -267,7 +267,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % mt) tdSql.query('select * from %s where tgcol3 = 1' % mt) @@ -275,7 +275,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % mt) tdSql.query('select * from %s where tgcol3 <> 1' % mt) @@ -283,7 +283,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -294,7 +294,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol4 <> 0 tdLog.info('select * from %s where tgcol4 <> 0' % mt) tdSql.query('select * from %s where tgcol4 <> 0' % mt) @@ -302,7 +302,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % mt) tdSql.query('select * from %s where tgcol4 = 1' % mt) @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where tgcol4 <> 1 tdLog.info('select * from %s where tgcol4 <> 1' % mt) tdSql.query('select * from %s where tgcol4 <> 1' % mt) @@ -318,7 +318,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol1 <> 1' % mt) tdSql.query( @@ -339,7 +339,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol1 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol1 = 0' % mt) @@ -347,7 +347,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol1 <> 0' % mt) tdSql.query( @@ -357,7 +357,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol1 = 0' % mt) tdSql.query( @@ -367,7 +367,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> 0' % @@ -379,7 +379,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 tdLog.info( @@ -392,7 +392,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts # < now + 5m tdLog.info( @@ -405,7 +405,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -416,7 +416,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt) tdSql.query( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt) @@ -434,7 +434,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt) tdSql.query( @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt) tdSql.query( @@ -454,7 +454,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -466,7 +466,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -479,7 +479,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m tdLog.info( @@ -492,7 +492,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -503,7 +503,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt) tdSql.query( @@ -513,7 +513,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt) @@ -521,7 +521,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt) tdSql.query( @@ -531,7 +531,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt) tdSql.query( @@ -541,7 +541,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -553,7 +553,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -566,7 +566,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m tdLog.info( @@ -579,7 +579,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -590,7 +590,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 tdLog.info('select * from %s where ts > now + 4m and tgcol4 <> 1' % mt) tdSql.query( @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol4 = 0' % mt) tdSql.query('select * from %s where ts < now + 4m and tgcol4 = 0' % mt) @@ -608,7 +608,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 tdLog.info('select * from %s where ts < now + 4m and tgcol4 <> 0' % mt) tdSql.query( @@ -618,7 +618,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 tdLog.info('select * from %s where ts <= now + 4m and tgcol4 = 0' % mt) tdSql.query( @@ -628,7 +628,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 <> 0' % @@ -640,7 +640,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 tdLog.info( @@ -653,7 +653,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts # < now + 5m tdLog.info( @@ -666,7 +666,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -682,7 +682,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -695,7 +695,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -708,7 +708,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -721,7 +721,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -734,7 +734,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -747,7 +747,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> 0 tdLog.info( @@ -760,7 +760,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -773,7 +773,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -789,7 +789,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -802,7 +802,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol1 = 0 tdLog.info( @@ -815,7 +815,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -828,7 +828,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol1 = 0 tdLog.info( @@ -841,7 +841,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -854,7 +854,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -867,7 +867,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -880,7 +880,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -896,7 +896,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -909,7 +909,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -922,7 +922,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -935,7 +935,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -948,7 +948,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -961,7 +961,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -974,7 +974,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -987,7 +987,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -1003,7 +1003,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1016,7 +1016,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1029,7 +1029,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1042,7 +1042,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1055,7 +1055,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1068,7 +1068,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1081,7 +1081,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1094,7 +1094,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1110,7 +1110,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1123,7 +1123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1136,7 +1136,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1149,7 +1149,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1162,7 +1162,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1175,7 +1175,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1188,7 +1188,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1201,7 +1201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1217,7 +1217,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1230,7 +1230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1243,7 +1243,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1256,7 +1256,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1269,7 +1269,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1282,7 +1282,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1295,7 +1295,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1308,7 +1308,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1324,7 +1324,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 tdLog.info( @@ -1337,7 +1337,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1350,7 +1350,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1363,7 +1363,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1376,7 +1376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1389,7 +1389,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1402,7 +1402,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts # < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 @@ -1416,7 +1416,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1434,7 +1434,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1452,7 +1452,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1469,7 +1469,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1486,7 +1486,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1503,7 +1503,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -1521,7 +1521,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1538,7 +1538,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1555,7 +1555,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1572,7 +1572,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1585,7 +1585,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -1603,7 +1603,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2 @@ -1619,7 +1619,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3 @@ -1635,7 +1635,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4 @@ -1651,7 +1651,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -1670,7 +1670,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1687,7 +1687,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1704,7 +1704,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1717,7 +1717,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1736,7 +1736,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1753,7 +1753,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1768,7 +1768,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1781,7 +1781,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and @@ -1795,7 +1795,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -1810,7 +1810,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1823,7 +1823,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1836,7 +1836,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and @@ -1849,7 +1849,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -1863,7 +1863,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/5.py b/tests/pytest/tag_lite/5.py index 6e94e692cd..b3608bebee 100644 --- a/tests/pytest/tag_lite/5.py +++ b/tests/pytest/tag_lite/5.py @@ -86,10 +86,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): tb = "%s%d" % (tbPrefix, i) @@ -115,10 +115,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -129,7 +129,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -154,7 +154,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -166,7 +166,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -177,7 +177,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -185,7 +185,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -193,7 +193,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -209,7 +209,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -217,7 +217,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 0 tdLog.info('select * from %s where tgcol1 = 0' % (mt)) tdSql.query('select * from %s where tgcol1 = 0' % (mt)) @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -233,7 +233,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -244,7 +244,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -252,7 +252,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -260,7 +260,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -268,7 +268,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -279,7 +279,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % (mt)) tdSql.query('select * from %s where tgcol3 <> 0' % (mt)) @@ -287,7 +287,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % (mt)) tdSql.query('select * from %s where tgcol3 = 1' % (mt)) @@ -295,7 +295,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % (mt)) tdSql.query('select * from %s where tgcol3 <> 1' % (mt)) @@ -303,7 +303,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -314,7 +314,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 0 tdLog.info('select * from %s where tgcol4 <> 0' % (mt)) tdSql.query('select * from %s where tgcol4 <> 0' % (mt)) @@ -322,7 +322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) tdSql.query('select * from %s where tgcol4 = 1' % (mt)) @@ -330,7 +330,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 1 tdLog.info('select * from %s where tgcol4 <> 1' % (mt)) tdSql.query('select * from %s where tgcol4 <> 1' % (mt)) @@ -338,7 +338,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -349,7 +349,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 0 tdLog.info('select * from %s where tgcol5 <> 0' % (mt)) tdSql.query('select * from %s where tgcol5 <> 0' % (mt)) @@ -357,7 +357,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 = 1 tdLog.info('select * from %s where tgcol5 = 1' % (mt)) tdSql.query('select * from %s where tgcol5 = 1' % (mt)) @@ -365,7 +365,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 1 tdLog.info('select * from %s where tgcol5 <> 1' % (mt)) tdSql.query('select * from %s where tgcol5 <> 1' % (mt)) @@ -373,7 +373,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol1 <> 1' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 = 0' % @@ -412,7 +412,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 <> 0' % @@ -424,7 +424,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 = 0' % @@ -436,7 +436,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> 0' % @@ -448,7 +448,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 tdLog.info( @@ -461,7 +461,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m tdLog.info( @@ -474,7 +474,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -489,7 +489,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -501,7 +501,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -513,7 +513,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -525,7 +525,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -537,7 +537,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -549,7 +549,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -562,7 +562,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -575,7 +575,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -590,7 +590,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol3 <> 1' % @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 = 0' % @@ -614,7 +614,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 <> 0' % @@ -626,7 +626,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 = 0' % @@ -638,7 +638,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -650,7 +650,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -663,7 +663,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m tdLog.info( @@ -676,7 +676,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -691,7 +691,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol4 <> 1' % @@ -703,7 +703,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 = 0' % @@ -715,7 +715,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 <> 0' % @@ -727,7 +727,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 = 0' % @@ -739,7 +739,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 <> 0' % @@ -751,7 +751,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 tdLog.info( @@ -764,7 +764,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m tdLog.info( @@ -777,7 +777,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -792,7 +792,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol5 <> 1' % @@ -804,7 +804,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 = 0' % @@ -816,7 +816,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 <> 0' % @@ -828,7 +828,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 = 0' % @@ -840,7 +840,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 <> 0' % @@ -852,7 +852,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 tdLog.info( @@ -865,7 +865,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m tdLog.info( @@ -878,7 +878,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -894,7 +894,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -907,7 +907,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -920,7 +920,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -933,7 +933,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -946,7 +946,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -959,7 +959,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> 0 tdLog.info( @@ -972,7 +972,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -985,7 +985,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -1001,7 +1001,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -1014,7 +1014,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1027,7 +1027,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1040,7 +1040,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1053,7 +1053,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1066,7 +1066,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -1079,7 +1079,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -1092,7 +1092,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1108,7 +1108,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1121,7 +1121,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1134,7 +1134,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1147,7 +1147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1160,7 +1160,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1173,7 +1173,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1186,7 +1186,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1199,7 +1199,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1215,7 +1215,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1228,7 +1228,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1241,7 +1241,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1254,7 +1254,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1267,7 +1267,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1280,7 +1280,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1293,7 +1293,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1306,7 +1306,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1322,7 +1322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1335,7 +1335,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1348,7 +1348,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1361,7 +1361,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1374,7 +1374,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1387,7 +1387,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1400,7 +1400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1413,7 +1413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1429,7 +1429,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1442,7 +1442,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1455,7 +1455,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1468,7 +1468,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1481,7 +1481,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1494,7 +1494,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1507,7 +1507,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1520,7 +1520,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1536,7 +1536,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 tdLog.info( @@ -1549,7 +1549,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1562,7 +1562,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1575,7 +1575,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1588,7 +1588,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1601,7 +1601,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1614,7 +1614,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 @@ -1628,7 +1628,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -1644,7 +1644,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 tdLog.info( @@ -1657,7 +1657,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1670,7 +1670,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1683,7 +1683,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1696,7 +1696,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1709,7 +1709,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and # tgcol5 <> 0 @@ -1723,7 +1723,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 and tgcol5 <> 0 @@ -1737,7 +1737,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -1755,7 +1755,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -1773,7 +1773,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1790,7 +1790,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1807,7 +1807,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1824,7 +1824,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -1839,7 +1839,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1857,7 +1857,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1874,7 +1874,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1891,7 +1891,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1908,7 +1908,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1923,7 +1923,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -1937,7 +1937,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -1955,7 +1955,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2 @@ -1971,7 +1971,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3 @@ -1987,7 +1987,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4 @@ -2003,7 +2003,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5 @@ -2019,7 +2019,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step25 tdLog.info('=============== step25') @@ -2038,7 +2038,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2055,7 +2055,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2072,7 +2072,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2087,7 +2087,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2101,7 +2101,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step26 tdLog.info('=============== step26') @@ -2120,7 +2120,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2137,7 +2137,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2154,7 +2154,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2169,7 +2169,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2183,7 +2183,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2197,7 +2197,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step27 @@ -2217,7 +2217,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2234,7 +2234,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2251,7 +2251,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2264,7 +2264,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2278,7 +2278,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -2292,7 +2292,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/6.py b/tests/pytest/tag_lite/6.py index 52f6fe1b37..b789e41794 100644 --- a/tests/pytest/tag_lite/6.py +++ b/tests/pytest/tag_lite/6.py @@ -89,10 +89,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -120,10 +120,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -134,7 +134,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -143,7 +143,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -151,7 +151,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -159,7 +159,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -171,7 +171,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -182,7 +182,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -190,7 +190,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -198,7 +198,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -206,7 +206,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 1 tdLog.info('select * from %s where tgcol1 = 1' % (mt)) tdSql.query('select * from %s where tgcol1 = 1' % (mt)) @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 1 tdLog.info('select * from %s where tgcol1 <> 1' % (mt)) tdSql.query('select * from %s where tgcol1 <> 1' % (mt)) @@ -222,7 +222,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 = 0 tdLog.info('select * from %s where tgcol1 = 0' % (mt)) tdSql.query('select * from %s where tgcol1 = 0' % (mt)) @@ -230,7 +230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol1 <> 0 tdLog.info('select * from %s where tgcol1 <> 0' % (mt)) tdSql.query('select * from %s where tgcol1 <> 0' % (mt)) @@ -238,7 +238,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -249,7 +249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -257,7 +257,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -265,7 +265,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -284,7 +284,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 0 tdLog.info('select * from %s where tgcol3 <> 0' % (mt)) tdSql.query('select * from %s where tgcol3 <> 0' % (mt)) @@ -292,7 +292,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 tdLog.info('select * from %s where tgcol3 = 1' % (mt)) tdSql.query('select * from %s where tgcol3 = 1' % (mt)) @@ -300,7 +300,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 <> 1 tdLog.info('select * from %s where tgcol3 <> 1' % (mt)) tdSql.query('select * from %s where tgcol3 <> 1' % (mt)) @@ -308,7 +308,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -319,7 +319,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 0 tdLog.info('select * from %s where tgcol4 <> 0' % (mt)) tdSql.query('select * from %s where tgcol4 <> 0' % (mt)) @@ -327,7 +327,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) tdSql.query('select * from %s where tgcol4 = 1' % (mt)) @@ -335,7 +335,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 <> 1 tdLog.info('select * from %s where tgcol4 <> 1' % (mt)) tdSql.query('select * from %s where tgcol4 <> 1' % (mt)) @@ -343,7 +343,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 0 tdLog.info('select * from %s where tgcol5 <> 0' % (mt)) tdSql.query('select * from %s where tgcol5 <> 0' % (mt)) @@ -362,7 +362,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 = 1 tdLog.info('select * from %s where tgcol5 = 1' % (mt)) tdSql.query('select * from %s where tgcol5 = 1' % (mt)) @@ -370,7 +370,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 <> 1 tdLog.info('select * from %s where tgcol5 <> 1' % (mt)) tdSql.query('select * from %s where tgcol5 <> 1' % (mt)) @@ -378,7 +378,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -389,7 +389,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 <> 0 tdLog.info('select * from %s where tgcol6 <> 0' % (mt)) tdSql.query('select * from %s where tgcol6 <> 0' % (mt)) @@ -397,7 +397,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = 1 tdLog.info('select * from %s where tgcol6 = 1' % (mt)) tdSql.query('select * from %s where tgcol6 = 1' % (mt)) @@ -405,7 +405,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 <> 1 tdLog.info('select * from %s where tgcol6 <> 1' % (mt)) tdSql.query('select * from %s where tgcol6 <> 1' % (mt)) @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -428,7 +428,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol1 <> 1' % @@ -440,7 +440,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 = 0' % @@ -452,7 +452,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol1 <> 0' % @@ -464,7 +464,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 = 0' % @@ -476,7 +476,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol1 <> 0' % @@ -488,7 +488,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 tdLog.info( @@ -501,7 +501,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m tdLog.info( @@ -514,7 +514,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -529,7 +529,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -541,7 +541,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -553,7 +553,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -565,7 +565,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -577,7 +577,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -589,7 +589,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -615,7 +615,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -630,7 +630,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol3 <> 1' % @@ -642,7 +642,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 = 0' % @@ -654,7 +654,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol3 <> 0' % @@ -666,7 +666,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 = 0' % @@ -678,7 +678,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol3 <> 0' % @@ -690,7 +690,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 tdLog.info( @@ -703,7 +703,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m tdLog.info( @@ -716,7 +716,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -731,7 +731,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol4 <> 1' % @@ -743,7 +743,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 = 0' % @@ -755,7 +755,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol4 <> 0' % @@ -767,7 +767,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 = 0' % @@ -779,7 +779,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol4 <> 0' % @@ -791,7 +791,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 tdLog.info( @@ -804,7 +804,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m tdLog.info( @@ -817,7 +817,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -832,7 +832,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol5 <> 1' % @@ -844,7 +844,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 = 0' % @@ -856,7 +856,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol5 <> 0' % @@ -868,7 +868,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 = 0' % @@ -880,7 +880,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol5 <> 0' % @@ -892,7 +892,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 tdLog.info( @@ -905,7 +905,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m tdLog.info( @@ -918,7 +918,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -933,7 +933,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol6 <> 1' % @@ -945,7 +945,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol6 = 0' % @@ -957,7 +957,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol6 <> 0' % @@ -969,7 +969,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol6 = 0' % @@ -981,7 +981,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol6 <> 0' % @@ -993,7 +993,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol6 <> 0 tdLog.info( @@ -1006,7 +1006,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and # ts < now + 5m tdLog.info( @@ -1019,7 +1019,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -1035,7 +1035,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol1 <> 1 tdLog.info( @@ -1048,7 +1048,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -1061,7 +1061,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -1074,7 +1074,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol1 = 0 tdLog.info( @@ -1087,7 +1087,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol1 <> 0 tdLog.info( @@ -1100,7 +1100,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1113,7 +1113,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol1 <> 0 tdLog.info( @@ -1126,7 +1126,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -1142,7 +1142,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol2 <> 1 tdLog.info( @@ -1155,7 +1155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1168,7 +1168,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1181,7 +1181,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol2 = 0 tdLog.info( @@ -1194,7 +1194,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol2 <> 0 tdLog.info( @@ -1207,7 +1207,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol2 <> 0 tdLog.info( @@ -1220,7 +1220,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 tdLog.info( @@ -1233,7 +1233,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -1249,7 +1249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1262,7 +1262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1275,7 +1275,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1288,7 +1288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and # tgcol4 = 0 tdLog.info( @@ -1301,7 +1301,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1314,7 +1314,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol3 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1327,7 +1327,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1340,7 +1340,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -1356,7 +1356,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and # tgcol4 <> 1 tdLog.info( @@ -1369,7 +1369,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1382,7 +1382,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1395,7 +1395,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and # tgcol4 = 0 tdLog.info( @@ -1408,7 +1408,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and # tgcol4 <> 0 tdLog.info( @@ -1421,7 +1421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 and tgcol4 <> 0 tdLog.info( @@ -1434,7 +1434,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol4 <> 0 tdLog.info( @@ -1447,7 +1447,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -1463,7 +1463,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and # tgcol6 <> 1 tdLog.info( @@ -1476,7 +1476,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and # tgcol6 = 0 tdLog.info( @@ -1489,7 +1489,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and # tgcol6 <> 0 tdLog.info( @@ -1502,7 +1502,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and # tgcol6 = 0 tdLog.info( @@ -1515,7 +1515,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and # tgcol6 <> 0 tdLog.info( @@ -1528,7 +1528,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol5 <> 0 and tgcol6 <> 0 tdLog.info( @@ -1541,7 +1541,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol6 <> 0 tdLog.info( @@ -1554,7 +1554,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -1570,7 +1570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1583,7 +1583,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1596,7 +1596,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1609,7 +1609,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1622,7 +1622,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1635,7 +1635,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1648,7 +1648,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1661,7 +1661,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -1677,7 +1677,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 tdLog.info( @@ -1690,7 +1690,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1703,7 +1703,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1716,7 +1716,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 tdLog.info( @@ -1729,7 +1729,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1742,7 +1742,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1755,7 +1755,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 tdLog.info( @@ -1768,7 +1768,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -1784,7 +1784,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 tdLog.info( @@ -1797,7 +1797,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1810,7 +1810,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1823,7 +1823,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 tdLog.info( @@ -1836,7 +1836,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1849,7 +1849,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 tdLog.info( @@ -1862,7 +1862,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 @@ -1876,7 +1876,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1892,7 +1892,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 tdLog.info( @@ -1905,7 +1905,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1918,7 +1918,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1931,7 +1931,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 tdLog.info( @@ -1944,7 +1944,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 tdLog.info( @@ -1957,7 +1957,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and # tgcol5 <> 0 @@ -1971,7 +1971,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 and tgcol5 <> 0 @@ -1985,7 +1985,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -2002,7 +2002,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and # tgcol2 <> 1 and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and # tgcol6 <> 1 @@ -2016,7 +2016,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = # 0 @@ -2030,7 +2030,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and # tgcol6 <> 0 @@ -2044,7 +2044,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = # 0 @@ -2058,7 +2058,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and # tgcol6 <> 0 @@ -2072,7 +2072,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and # tgcol5 <> 0 and tgcol6 <> 0 @@ -2086,7 +2086,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and # tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0 @@ -2100,7 +2100,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step25 tdLog.info('=============== step25') @@ -2118,7 +2118,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step26 tdLog.info('=============== step26') @@ -2136,7 +2136,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2153,7 +2153,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2170,7 +2170,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2187,7 +2187,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2202,7 +2202,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2216,7 +2216,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step27 tdLog.info('=============== step27') @@ -2234,7 +2234,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2251,7 +2251,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2268,7 +2268,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2285,7 +2285,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2300,7 +2300,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2314,7 +2314,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2328,7 +2328,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step28 tdLog.info('=============== step28') @@ -2346,7 +2346,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2 @@ -2362,7 +2362,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3 @@ -2378,7 +2378,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4 @@ -2394,7 +2394,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5 @@ -2410,7 +2410,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol6 @@ -2426,7 +2426,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step29 tdLog.info('=============== step29') @@ -2445,7 +2445,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2462,7 +2462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2479,7 +2479,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2494,7 +2494,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2508,7 +2508,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2522,7 +2522,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step30 tdLog.info('=============== step30') @@ -2541,7 +2541,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2558,7 +2558,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2575,7 +2575,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2590,7 +2590,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2604,7 +2604,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2618,7 +2618,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m @@ -2632,7 +2632,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step31 tdLog.info('=============== step31') @@ -2651,7 +2651,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2668,7 +2668,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2685,7 +2685,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2698,7 +2698,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2712,7 +2712,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and @@ -2726,7 +2726,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -2740,7 +2740,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/add.py b/tests/pytest/tag_lite/add.py index e9e3675485..1a45237cb0 100644 --- a/tests/pytest/tag_lite/add.py +++ b/tests/pytest/tag_lite/add.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -119,22 +119,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step2 tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt)) @@ -171,22 +171,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -213,22 +213,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step3 tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt)) @@ -265,22 +265,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -289,22 +289,22 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")') tdSql.checkDataType(2, 1, "BIGINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != FLOAT then tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")') tdSql.checkDataType(3, 1, "FLOAT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 2.000000 then tdLog.info('tdSql.checkData(3, 3, 2.000000)') tdSql.checkData(3, 3, 2.000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -331,22 +331,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step4 tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt)) @@ -383,22 +383,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -425,22 +425,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = '1' -x step5 tdLog.info('select * from %s where tgcol3 = "1" -x step5' % (mt)) @@ -477,27 +477,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -540,27 +540,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) @@ -571,27 +571,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 -x step52 tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt)) tdSql.error('select * from %s where tgcol3 = 12' % (mt)) @@ -636,27 +636,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -699,27 +699,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step71 tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt)) @@ -761,27 +761,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -825,27 +825,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 1 then tdLog.info('tdSql.checkData(0, 4, 1)') tdSql.checkData(0, 4, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step81 tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt)) @@ -887,27 +887,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -950,27 +950,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4.000000000 then tdLog.info('tdSql.checkData(0, 2, 4.000000000)') tdSql.checkData(0, 2, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6.00000 then tdLog.info('tdSql.checkData(0, 4, 6.00000)') tdSql.checkData(0, 4, 6.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step91 tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt)) @@ -1016,32 +1016,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step103 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step103' % (mt)) @@ -1090,32 +1090,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 0 then tdLog.info('tdSql.checkData(0, 4, 0)') tdSql.checkData(0, 4, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step101 tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt)) @@ -1161,37 +1161,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.00000 then tdLog.info('tdSql.checkData(0, 5, 4.00000)') tdSql.checkData(0, 5, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step114 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step114' % (mt)) @@ -1261,42 +1261,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 6 then tdLog.info('tdSql.checkData(0, 5, 6)') tdSql.checkData(0, 5, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 7 then tdLog.info('tdSql.checkData(0, 6, 7)') tdSql.checkData(0, 6, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 8 then tdLog.info('tdSql.checkData(0, 7, 8)') tdSql.checkData(0, 7, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step111 tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt)) @@ -1348,42 +1348,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3.00000 then tdLog.info('tdSql.checkData(0, 4, 3.00000)') tdSql.checkData(0, 4, 3.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.000000000 then tdLog.info('tdSql.checkData(0, 5, 4.000000000)') tdSql.checkData(0, 5, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1447,42 +1447,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 3 then tdLog.info('tdSql.checkData(0, 6, 3)') tdSql.checkData(0, 6, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 2 then tdLog.info('tdSql.checkData(0, 7, 2)') tdSql.checkData(0, 7, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '5' tdLog.info('select * from %s where tgcol2 = "5"' % (mt)) @@ -1491,7 +1491,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 4 tdLog.info('select * from %s where tgcol3 = 4' % (mt)) @@ -1500,7 +1500,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 2 tdLog.info('select * from %s where tgcol5 = 2' % (mt)) @@ -1509,7 +1509,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '1' tdLog.info('select * from %s where tgcol6 = "1"' % (mt)) @@ -1518,7 +1518,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -1554,42 +1554,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1647,42 +1647,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 9 then tdLog.info('tdSql.checkData(0, 3, 9)') tdSql.checkData(0, 3, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 11.000000000 then tdLog.info('tdSql.checkData(0, 4, 11.000000000)') tdSql.checkData(0, 4, 11.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 8 then tdLog.info('tdSql.checkData(0, 5, 8)') tdSql.checkData(0, 5, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 10 then tdLog.info('tdSql.checkData(0, 6, 10)') tdSql.checkData(0, 6, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 12 then tdLog.info('tdSql.checkData(0, 7, 12)') tdSql.checkData(0, 7, 12) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -1753,7 +1753,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bigint.py b/tests/pytest/tag_lite/bigint.py index 77a161c5bc..ecc6fad44d 100644 --- a/tests/pytest/tag_lite/bigint.py +++ b/tests/pytest/tag_lite/bigint.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/binary.py b/tests/pytest/tag_lite/binary.py index 543b00b34e..a5757dc5cd 100644 --- a/tests/pytest/tag_lite/binary.py +++ b/tests/pytest/tag_lite/binary.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '0' tdLog.info('select * from %s where tgcol = "0"' % (mt)) tdSql.query('select * from %s where tgcol = "0"' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> "1"' % @@ -356,7 +356,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol = "0"' % @@ -368,7 +368,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> "0"' % @@ -380,7 +380,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = "0"' % @@ -392,7 +392,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> "0"' % @@ -404,7 +404,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> '0' tdLog.info( @@ -417,7 +417,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and # ts < now + 5m tdLog.info( @@ -430,7 +430,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -448,7 +448,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -466,7 +466,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -484,7 +484,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -502,7 +502,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -521,7 +521,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -540,7 +540,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -560,7 +560,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -574,7 +574,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/binary_binary.py b/tests/pytest/tag_lite/binary_binary.py index c0d1c0bfe7..9c789eafd6 100644 --- a/tests/pytest/tag_lite/binary_binary.py +++ b/tests/pytest/tag_lite/binary_binary.py @@ -84,10 +84,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -112,10 +112,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -126,7 +126,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -135,7 +135,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -143,7 +143,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -151,7 +151,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -163,7 +163,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -174,7 +174,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -182,7 +182,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -190,7 +190,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -198,7 +198,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '1' tdLog.info('select * from %s where tgcol = "1"' % (mt)) tdSql.query('select * from %s where tgcol = "1"' % (mt)) @@ -206,7 +206,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '1' tdLog.info('select * from %s where tgcol <> "1"' % (mt)) tdSql.query('select * from %s where tgcol <> "1"' % (mt)) @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '0' tdLog.info('select * from %s where tgcol = "0"' % (mt)) tdSql.query('select * from %s where tgcol = "0"' % (mt)) @@ -222,7 +222,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> '0' tdLog.info('select * from %s where tgcol <> "0"' % (mt)) tdSql.query('select * from %s where tgcol <> "0"' % (mt)) @@ -230,7 +230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -241,7 +241,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '0' tdLog.info('select * from %s where tgcol2 <> "0"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "0"' % (mt)) @@ -249,7 +249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = '1' tdLog.info('select * from %s where tgcol2 = "1"' % (mt)) tdSql.query('select * from %s where tgcol2 = "1"' % (mt)) @@ -257,7 +257,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '1' tdLog.info('select * from %s where tgcol2 <> "1"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "1"' % (mt)) @@ -265,7 +265,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -280,7 +280,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> "1"' % @@ -292,7 +292,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol = "0"' % @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> "0"' % @@ -316,7 +316,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = "0"' % @@ -328,7 +328,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> "0"' % @@ -340,7 +340,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> '0' tdLog.info( @@ -353,7 +353,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and # ts < now + 5m tdLog.info( @@ -366,7 +366,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -381,7 +381,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> "1"' % @@ -393,7 +393,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = "0"' % @@ -405,7 +405,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> "0"' % @@ -417,7 +417,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = "0"' % @@ -429,7 +429,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> "0"' % @@ -441,7 +441,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' tdLog.info( @@ -454,7 +454,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m tdLog.info( @@ -467,7 +467,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -483,7 +483,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and # tgcol <> '1' tdLog.info( @@ -496,7 +496,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and # tgcol = '0' tdLog.info( @@ -509,7 +509,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and # tgcol <> '0' tdLog.info( @@ -522,7 +522,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and # tgcol = '0' tdLog.info( @@ -535,7 +535,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' # and tgcol <> '0' tdLog.info( @@ -548,7 +548,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' and tgcol <> '0' tdLog.info( @@ -561,7 +561,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m and ts < now + 5m and tgcol <> '0' tdLog.info( @@ -574,7 +574,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -592,7 +592,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -610,7 +610,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -626,7 +626,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and @@ -643,7 +643,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -661,7 +661,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -679,7 +679,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -698,7 +698,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -715,7 +715,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and @@ -732,7 +732,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -752,7 +752,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -771,7 +771,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -785,7 +785,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bool.py b/tests/pytest/tag_lite/bool.py index c43d5b2ee5..6f2afd2625 100644 --- a/tests/pytest/tag_lite/bool.py +++ b/tests/pytest/tag_lite/bool.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -107,10 +107,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -130,7 +130,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -154,7 +154,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -166,7 +166,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -190,7 +190,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -203,7 +203,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -223,7 +223,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -231,7 +231,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -239,7 +239,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -251,7 +251,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -270,7 +270,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -280,7 +280,7 @@ class TDTestCase: # TSIM: print expect 100, actual:$rows tdLog.info('expect 100, actual:$rows') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -288,7 +288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = true tdLog.info('select * from %s where tgcol = true' % (mt)) tdSql.query('select * from %s where tgcol = true' % (mt)) @@ -296,7 +296,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> true tdLog.info('select * from %s where tgcol <> true' % (mt)) tdSql.query('select * from %s where tgcol <> true' % (mt)) @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = false tdLog.info('select * from %s where tgcol = false' % (mt)) tdSql.query('select * from %s where tgcol = false' % (mt)) @@ -312,7 +312,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> false tdLog.info('select * from %s where tgcol <> false' % (mt)) tdSql.query('select * from %s where tgcol <> false' % (mt)) @@ -320,7 +320,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -335,7 +335,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> true' % @@ -347,7 +347,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol = false' % @@ -359,7 +359,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> false' % @@ -371,7 +371,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = false' % @@ -383,7 +383,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> false' % @@ -395,7 +395,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> false tdLog.info( @@ -408,7 +408,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false # and ts < now + 5m tdLog.info( @@ -421,7 +421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -439,7 +439,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -457,7 +457,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -475,7 +475,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -493,7 +493,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -512,7 +512,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -531,7 +531,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -555,7 +555,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -569,7 +569,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bool_binary.py b/tests/pytest/tag_lite/bool_binary.py index 7105cc4e78..bfc496e8e4 100644 --- a/tests/pytest/tag_lite/bool_binary.py +++ b/tests/pytest/tag_lite/bool_binary.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): tb = "%s%d" % (tbPrefix, i) @@ -106,10 +106,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -120,7 +120,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -129,7 +129,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -137,7 +137,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -145,7 +145,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -157,7 +157,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -168,7 +168,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -176,7 +176,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -184,7 +184,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -192,7 +192,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = true tdLog.info('select * from %s where tgcol = true' % (mt)) tdSql.query('select * from %s where tgcol = true' % (mt)) @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> true tdLog.info('select * from %s where tgcol <> true' % (mt)) tdSql.query('select * from %s where tgcol <> true' % (mt)) @@ -208,7 +208,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = false tdLog.info('select * from %s where tgcol = false' % (mt)) tdSql.query('select * from %s where tgcol = false' % (mt)) @@ -216,7 +216,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> false tdLog.info('select * from %s where tgcol <> false' % (mt)) tdSql.query('select * from %s where tgcol <> false' % (mt)) @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -235,7 +235,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '0' tdLog.info('select * from %s where tgcol2 <> "0"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "0"' % (mt)) @@ -243,7 +243,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = '1' tdLog.info('select * from %s where tgcol2 = "1"' % (mt)) tdSql.query('select * from %s where tgcol2 = "1"' % (mt)) @@ -251,7 +251,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> "1" tdLog.info('select * from %s where tgcol2 <> "1"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "1"' % (mt)) @@ -259,7 +259,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -274,7 +274,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> true' % @@ -286,7 +286,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol = false' % @@ -298,7 +298,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> false' % @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = false' % @@ -322,7 +322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> false' % @@ -334,7 +334,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> false tdLog.info( @@ -347,7 +347,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false # and ts < now + 5m tdLog.info( @@ -360,7 +360,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -375,7 +375,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> "1"' % @@ -387,7 +387,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = "0"' % @@ -399,7 +399,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> "0"' % @@ -411,7 +411,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = "0"' % @@ -423,7 +423,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> "0"' % @@ -435,7 +435,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' tdLog.info( @@ -448,7 +448,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m tdLog.info( @@ -461,7 +461,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -477,7 +477,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and # tgcol <> true tdLog.info( @@ -490,7 +490,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and # tgcol = false tdLog.info( @@ -503,7 +503,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and # tgcol <> false tdLog.info( @@ -516,7 +516,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and # tgcol = false tdLog.info( @@ -529,7 +529,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' # and tgcol <> false tdLog.info( @@ -542,7 +542,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' and tgcol <> false tdLog.info( @@ -555,7 +555,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m and ts < now + 5m and tgcol <> false tdLog.info( @@ -568,7 +568,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -586,7 +586,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -604,7 +604,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -620,7 +620,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -637,7 +637,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -655,7 +655,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -673,7 +673,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -692,7 +692,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -709,7 +709,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -726,7 +726,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -746,7 +746,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -765,7 +765,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -779,7 +779,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/bool_int.py b/tests/pytest/tag_lite/bool_int.py index b7504b1127..f7bfc7acef 100644 --- a/tests/pytest/tag_lite/bool_int.py +++ b/tests/pytest/tag_lite/bool_int.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): tb = "%s%d" % (tbPrefix, i) @@ -106,10 +106,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -120,7 +120,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -129,7 +129,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -137,7 +137,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -145,7 +145,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -157,7 +157,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -168,7 +168,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -176,7 +176,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -184,7 +184,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -192,7 +192,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = true tdLog.info('select * from %s where tgcol = true' % (mt)) tdSql.query('select * from %s where tgcol = true' % (mt)) @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> true tdLog.info('select * from %s where tgcol <> true' % (mt)) tdSql.query('select * from %s where tgcol <> true' % (mt)) @@ -208,7 +208,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = false tdLog.info('select * from %s where tgcol = false' % (mt)) tdSql.query('select * from %s where tgcol = false' % (mt)) @@ -216,7 +216,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> false tdLog.info('select * from %s where tgcol <> false' % (mt)) tdSql.query('select * from %s where tgcol <> false' % (mt)) @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -235,7 +235,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -243,7 +243,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -251,7 +251,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -259,7 +259,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = true tdLog.info('select * from %s where tgcol2 = true' % (mt)) tdSql.query('select * from %s where tgcol2 = true' % (mt)) @@ -267,7 +267,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> true tdLog.info('select * from %s where tgcol2 <> true' % (mt)) tdSql.query('select * from %s where tgcol2 <> true' % (mt)) @@ -275,7 +275,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = false tdLog.info('select * from %s where tgcol2 = false' % (mt)) tdSql.query('select * from %s where tgcol2 = false' % (mt)) @@ -283,7 +283,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> false tdLog.info('select * from %s where tgcol2 <> false' % (mt)) tdSql.query('select * from %s where tgcol2 <> false' % (mt)) @@ -291,7 +291,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -306,7 +306,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> true' % @@ -318,7 +318,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false tdLog.info( 'select * from %s where ts < now + 4m and tgcol = false' % @@ -330,7 +330,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> false' % @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = false' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> false' % @@ -366,7 +366,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> false tdLog.info( @@ -379,7 +379,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false # and ts < now + 5m tdLog.info( @@ -392,7 +392,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -407,7 +407,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -419,7 +419,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -431,7 +431,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -443,7 +443,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -455,7 +455,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -467,7 +467,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -493,7 +493,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -509,7 +509,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol <> true tdLog.info( @@ -522,7 +522,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol = false tdLog.info( @@ -535,7 +535,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol <> false tdLog.info( @@ -548,7 +548,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol = false tdLog.info( @@ -561,7 +561,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol <> false tdLog.info( @@ -574,7 +574,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol <> false tdLog.info( @@ -587,7 +587,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol <> false tdLog.info( @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -618,7 +618,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -636,7 +636,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 @@ -652,7 +652,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -669,7 +669,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -687,7 +687,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -705,7 +705,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -724,7 +724,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group @@ -741,7 +741,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and @@ -758,7 +758,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -778,7 +778,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -797,7 +797,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -811,7 +811,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/change.py b/tests/pytest/tag_lite/change.py index e1df901d5b..910d11ca7c 100644 --- a/tests/pytest/tag_lite/change.py +++ b/tests/pytest/tag_lite/change.py @@ -66,22 +66,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tagcx tgcol3 -x step21 # TSIM: return -1 @@ -123,22 +123,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol3 # TSIM: sql alter table $mt change tag tgcol2 tgcol4 @@ -167,22 +167,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol3 # TSIM: sql alter table $mt change tag tgcol2 tgcol4 @@ -211,22 +211,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol3 # TSIM: sql alter table $mt change tag tgcol2 tgcol4 @@ -255,42 +255,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 # TSIM: sql reset query cache @@ -331,22 +331,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 2 tdLog.info('select * from $mt where tgcol4 = 2') @@ -357,22 +357,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -400,22 +400,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 2 tdLog.info('select * from $mt where tgcol4 = 2') @@ -426,22 +426,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -469,22 +469,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 2 tdLog.info('select * from $mt where tgcol4 = 2') @@ -495,22 +495,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -538,22 +538,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = '2' tdLog.info('select * from $mt where tgcol4 = '2'') @@ -564,22 +564,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -627,42 +627,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol8 = 2 tdLog.info('select * from $mt where tgcol8 = 2') @@ -673,42 +673,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol9 = '4' tdLog.info('select * from $mt where tgcol9 = '4'') @@ -719,42 +719,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol10 = 5 tdLog.info('select * from $mt where tgcol10 = 5') @@ -765,42 +765,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol11 = '6' tdLog.info('select * from $mt where tgcol11 = '6'') @@ -811,42 +811,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 4 then tdLog.info('tdSql.checkData(0, 4, 4)') tdSql.checkData(0, 4, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 5.000000000 then tdLog.info('tdSql.checkData(0, 5, 5.000000000)') tdSql.checkData(0, 5, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 6 then tdLog.info('tdSql.checkData(0, 6, 6)') tdSql.checkData(0, 6, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -860,7 +860,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/column.py b/tests/pytest/tag_lite/column.py index 4669f74498..f82f83c356 100644 --- a/tests/pytest/tag_lite/column.py +++ b/tests/pytest/tag_lite/column.py @@ -103,7 +103,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(4)') tdSql.checkRows(4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -149,7 +149,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -160,7 +160,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(4)') tdSql.checkRows(4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) @@ -169,7 +169,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -183,7 +183,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/commit.py b/tests/pytest/tag_lite/commit.py index 4ad2ecf8f9..478520a586 100644 --- a/tests/pytest/tag_lite/commit.py +++ b/tests/pytest/tag_lite/commit.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -119,22 +119,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step2 tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt)) @@ -171,22 +171,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -213,22 +213,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step3 tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt)) @@ -265,22 +265,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -289,22 +289,22 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")') tdSql.checkDataType(2, 1, "BIGINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != FLOAT then tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")') tdSql.checkDataType(3, 1, "FLOAT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 2.000000 then tdLog.info('tdSql.checkData(3, 3, 2.000000)') tdSql.checkData(3, 3, 2.000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -331,22 +331,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step4 tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt)) @@ -383,22 +383,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -425,22 +425,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = '1' -x step5 tdLog.info('select * from %s where tgcol3 = "1" -x step5' % (mt)) @@ -477,27 +477,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -540,27 +540,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) @@ -571,27 +571,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) @@ -600,7 +600,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 1 -x step52 tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt)) tdSql.error('select * from %s where tgcol3 = 12' % (mt)) @@ -636,27 +636,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -699,27 +699,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step71 tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt)) @@ -761,27 +761,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -823,27 +823,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 1 then tdLog.info('tdSql.checkData(0, 4, 1)') tdSql.checkData(0, 4, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step81 tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt)) @@ -885,27 +885,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt)) @@ -948,27 +948,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4.000000000 then tdLog.info('tdSql.checkData(0, 2, 4.000000000)') tdSql.checkData(0, 2, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6.00000 then tdLog.info('tdSql.checkData(0, 4, 6.00000)') tdSql.checkData(0, 4, 6.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step91 tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt)) @@ -1014,32 +1014,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step103 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step103' % (mt)) @@ -1088,32 +1088,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 0 then tdLog.info('tdSql.checkData(0, 4, 0)') tdSql.checkData(0, 4, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step101 tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt)) @@ -1159,37 +1159,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.00000 then tdLog.info('tdSql.checkData(0, 5, 4.00000)') tdSql.checkData(0, 5, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step114 tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step114' % (mt)) @@ -1259,42 +1259,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 6 then tdLog.info('tdSql.checkData(0, 5, 6)') tdSql.checkData(0, 5, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 7 then tdLog.info('tdSql.checkData(0, 6, 7)') tdSql.checkData(0, 6, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 8 then tdLog.info('tdSql.checkData(0, 7, 8)') tdSql.checkData(0, 7, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step111 tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt)) @@ -1346,42 +1346,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3.00000 then tdLog.info('tdSql.checkData(0, 4, 3.00000)') tdSql.checkData(0, 4, 3.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.000000000 then tdLog.info('tdSql.checkData(0, 5, 4.000000000)') tdSql.checkData(0, 5, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1445,42 +1445,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 3 then tdLog.info('tdSql.checkData(0, 6, 3)') tdSql.checkData(0, 6, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 2 then tdLog.info('tdSql.checkData(0, 7, 2)') tdSql.checkData(0, 7, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '5' tdLog.info('select * from %s where tgcol2 = "5"' % (mt)) @@ -1489,7 +1489,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 4 tdLog.info('select * from %s where tgcol3 = 4' % (mt)) @@ -1498,7 +1498,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 2 tdLog.info('select * from %s where tgcol5 = 2' % (mt)) @@ -1507,7 +1507,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '1' tdLog.info('select * from %s where tgcol6 = "1"' % (mt)) @@ -1516,7 +1516,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -1552,42 +1552,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -1645,42 +1645,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 9 then tdLog.info('tdSql.checkData(0, 3, 9)') tdSql.checkData(0, 3, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 11.000000000 then tdLog.info('tdSql.checkData(0, 4, 11.000000000)') tdSql.checkData(0, 4, 11.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 8 then tdLog.info('tdSql.checkData(0, 5, 8)') tdSql.checkData(0, 5, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 10 then tdLog.info('tdSql.checkData(0, 6, 10)') tdSql.checkData(0, 6, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 12 then tdLog.info('tdSql.checkData(0, 7, 12)') tdSql.checkData(0, 7, 12) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # TSIM: sleep 5000 @@ -1713,22 +1713,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -1748,22 +1748,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -1783,22 +1783,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step5 @@ -1819,22 +1819,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step6 @@ -1855,27 +1855,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) @@ -1886,27 +1886,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = 1 tdLog.info('select * from %s where tgcol4 = 1' % (mt)) @@ -1915,7 +1915,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -1935,27 +1935,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6 then tdLog.info('tdSql.checkData(0, 4, 6)') tdSql.checkData(0, 4, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step8 @@ -1976,27 +1976,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4 then tdLog.info('tdSql.checkData(0, 2, 4)') tdSql.checkData(0, 2, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 5 then tdLog.info('tdSql.checkData(0, 3, 5)') tdSql.checkData(0, 3, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 1 then tdLog.info('tdSql.checkData(0, 4, 1)') tdSql.checkData(0, 4, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step9 @@ -2017,27 +2017,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 4.000000000 then tdLog.info('tdSql.checkData(0, 2, 4.000000000)') tdSql.checkData(0, 2, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 6.00000 then tdLog.info('tdSql.checkData(0, 4, 6.00000)') tdSql.checkData(0, 4, 6.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step10 @@ -2058,32 +2058,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 0 then tdLog.info('tdSql.checkData(0, 4, 0)') tdSql.checkData(0, 4, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -2103,42 +2103,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 6 then tdLog.info('tdSql.checkData(0, 5, 6)') tdSql.checkData(0, 5, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 7 then tdLog.info('tdSql.checkData(0, 6, 7)') tdSql.checkData(0, 6, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 8 then tdLog.info('tdSql.checkData(0, 7, 8)') tdSql.checkData(0, 7, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -2159,42 +2159,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 1 then tdLog.info('tdSql.checkData(0, 3, 1)') tdSql.checkData(0, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5 then tdLog.info('tdSql.checkData(0, 4, 5)') tdSql.checkData(0, 4, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 3 then tdLog.info('tdSql.checkData(0, 6, 3)') tdSql.checkData(0, 6, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 2 then tdLog.info('tdSql.checkData(0, 7, 2)') tdSql.checkData(0, 7, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '5' tdLog.info('select * from %s where tgcol2 = "5"' % (mt)) @@ -2203,7 +2203,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 4 tdLog.info('select * from %s where tgcol3 = 4' % (mt)) @@ -2212,7 +2212,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 2 tdLog.info('select * from %s where tgcol5 = 2' % (mt)) @@ -2221,7 +2221,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '1' tdLog.info('select * from %s where tgcol6 = "1"' % (mt)) @@ -2230,7 +2230,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -2250,42 +2250,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 9 then tdLog.info('tdSql.checkData(0, 3, 9)') tdSql.checkData(0, 3, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 11.000000000 then tdLog.info('tdSql.checkData(0, 4, 11.000000000)') tdSql.checkData(0, 4, 11.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 8 then tdLog.info('tdSql.checkData(0, 5, 8)') tdSql.checkData(0, 5, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 10 then tdLog.info('tdSql.checkData(0, 6, 10)') tdSql.checkData(0, 6, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 12 then tdLog.info('tdSql.checkData(0, 7, 12)') tdSql.checkData(0, 7, 12) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -2299,7 +2299,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/create.py b/tests/pytest/tag_lite/create.py index 39a2d83a31..83a1450143 100644 --- a/tests/pytest/tag_lite/create.py +++ b/tests/pytest/tag_lite/create.py @@ -76,12 +76,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -89,7 +89,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -120,12 +120,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -133,7 +133,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -164,12 +164,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -177,7 +177,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -207,12 +207,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -220,7 +220,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -251,12 +251,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -264,7 +264,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -295,12 +295,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -310,7 +310,7 @@ class TDTestCase: # TSIM: print expect 0, actual: $rows tdLog.info('expect 0, actual: $rows') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -341,12 +341,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -385,12 +385,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = '0' tdLog.info('select * from %s where tgcol = "0"' % (mt)) tdSql.query('select * from %s where tgcol = "0"' % (mt)) @@ -398,7 +398,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -431,12 +431,12 @@ class TDTestCase: # TSIM: print expect 1, actual: $rows tdLog.info('expect 1, actual: $rows') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -475,12 +475,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -488,7 +488,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -519,12 +519,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -532,7 +532,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step13 tdLog.info('=============== step13') @@ -563,12 +563,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -576,7 +576,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -607,12 +607,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) @@ -621,7 +621,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: print =============== step15 tdLog.info('=============== step15') # TSIM: $i = 15 @@ -651,12 +651,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -664,7 +664,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step16 tdLog.info('=============== step16') @@ -695,12 +695,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -708,7 +708,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step17 tdLog.info('=============== step17') @@ -739,12 +739,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -752,7 +752,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step18 tdLog.info('=============== step18') @@ -783,12 +783,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -796,7 +796,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step19 tdLog.info('=============== step19') @@ -827,12 +827,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -840,7 +840,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step20 tdLog.info('=============== step20') @@ -871,12 +871,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -884,7 +884,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step21 tdLog.info('=============== step21') @@ -915,12 +915,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -928,7 +928,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step22 tdLog.info('=============== step22') @@ -959,12 +959,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -972,7 +972,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step23 tdLog.info('=============== step23') @@ -1003,12 +1003,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -1016,7 +1016,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step24 tdLog.info('=============== step24') @@ -1052,12 +1052,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 2 tdLog.info('select * from %s where tgcol2 = 2' % (mt)) tdSql.query('select * from %s where tgcol2 = 2' % (mt)) @@ -1065,12 +1065,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = 3 tdLog.info('select * from %s where tgcol3 = 3' % (mt)) tdSql.query('select * from %s where tgcol3 = 3' % (mt)) @@ -1078,12 +1078,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol4 = 4 tdLog.info('select * from %s where tgcol4 = 4' % (mt)) tdSql.query('select * from %s where tgcol4 = 4' % (mt)) @@ -1091,12 +1091,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol5 = 5 tdLog.info('select * from %s where tgcol5 = 5' % (mt)) tdSql.query('select * from %s where tgcol5 = 5' % (mt)) @@ -1104,12 +1104,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = '6' tdLog.info('select * from %s where tgcol6 = "6"' % (mt)) tdSql.query('select * from %s where tgcol6 = "6"' % (mt)) @@ -1117,12 +1117,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = '0' tdLog.info('select * from %s where tgcol6 = "0"' % (mt)) tdSql.query('select * from %s where tgcol6 = "0"' % (mt)) @@ -1130,7 +1130,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step25 tdLog.info('=============== step25') @@ -1166,12 +1166,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol6 = '0' tdLog.info('select * from %s where tgcol6 = "0"' % (mt)) tdSql.query('select * from %s where tgcol6 = "0"' % (mt)) @@ -1179,7 +1179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step26 tdLog.info('=============== step26') @@ -1216,12 +1216,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol3 = '0' tdLog.info('select * from %s where tgcol3 = "0"' % (mt)) tdSql.query('select * from %s where tgcol3 = "0"' % (mt)) @@ -1229,7 +1229,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step27 tdLog.info('=============== step27') @@ -1280,12 +1280,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step29 tdLog.info('=============== step29') @@ -1316,12 +1316,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step30 tdLog.info('=============== step30') @@ -1376,7 +1376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print $data00 $data01 $data02 tdLog.info('$data00 $data01 $data02') @@ -1384,7 +1384,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 2, "12345")') tdSql.checkData(0, 2, "12345") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/delete.py b/tests/pytest/tag_lite/delete.py index d4a55a4a75..88615e0406 100644 --- a/tests/pytest/tag_lite/delete.py +++ b/tests/pytest/tag_lite/delete.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -127,22 +127,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -177,22 +177,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -201,17 +201,17 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")') tdSql.checkDataType(2, 1, "BIGINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != FLOAT then tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")') tdSql.checkDataType(3, 1, "FLOAT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol1 -x step40 tdLog.info('alter table %s drop tag tgcol1 -x step40' % (mt)) @@ -251,22 +251,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol1 -x step50 tdLog.info('alter table %s drop tag tgcol1 -x step50' % (mt)) @@ -306,27 +306,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -364,27 +364,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -393,47 +393,47 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "SMALLINT")') tdSql.checkDataType(2, 1, "SMALLINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != TINYINT then tdLog.info('tdSql.checkDataType(3, 1, "TINYINT")') tdSql.checkDataType(3, 1, "TINYINT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data41 != BINARY then tdLog.info('tdSql.checkDataType(4, 1, "BINARY")') tdSql.checkDataType(4, 1, "BINARY") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data22 != 2 then tdLog.info('tdSql.checkData(2, 2, 2)') tdSql.checkData(2, 2, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data32 != 1 then tdLog.info('tdSql.checkData(3, 2, 1)') tdSql.checkData(3, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data42 != 10 then tdLog.info('tdSql.checkData(4, 2, 10)') tdSql.checkData(4, 2, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != 1 then tdLog.info('tdSql.checkData(2, 3, 1)') tdSql.checkData(2, 3, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 2 then tdLog.info('tdSql.checkData(3, 3, 2)') tdSql.checkData(3, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data43 != 3 then tdLog.info('tdSql.checkData(4, 3, 3)') tdSql.checkData(4, 3, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -471,27 +471,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -531,27 +531,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -593,32 +593,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -663,37 +663,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.00000 then tdLog.info('tdSql.checkData(0, 5, 4.00000)') tdSql.checkData(0, 5, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -739,42 +739,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3.00000 then tdLog.info('tdSql.checkData(0, 4, 3.00000)') tdSql.checkData(0, 4, 3.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4.000000000 then tdLog.info('tdSql.checkData(0, 5, 4.000000000)') tdSql.checkData(0, 5, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5 then tdLog.info('tdSql.checkData(0, 6, 5)') tdSql.checkData(0, 6, 5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol2 tdLog.info('alter table %s drop tag tgcol2' % (mt)) @@ -823,42 +823,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -890,22 +890,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step2 tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt)) @@ -931,22 +931,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step3 tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt)) @@ -972,22 +972,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step4 tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt)) @@ -1013,22 +1013,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '1' -x step5 tdLog.info('select * from %s where tgcol2 = "1" -x step5' % (mt)) @@ -1054,27 +1054,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step51 tdLog.info('select * from %s where tgcol2 = 1 -x step51' % (mt)) @@ -1105,27 +1105,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step71 tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt)) @@ -1156,27 +1156,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step81 tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt)) @@ -1207,27 +1207,27 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step91 tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt)) @@ -1258,32 +1258,32 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != NULL then tdLog.info('tdSql.checkData(0, 3, NULL)') tdSql.checkData(0, 3, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step101 tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt)) @@ -1319,37 +1319,37 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != NULL then tdLog.info('tdSql.checkData(0, 6, NULL)') tdSql.checkData(0, 6, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step111 tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt)) @@ -1385,42 +1385,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.000000000 then tdLog.info('tdSql.checkData(0, 3, 4.000000000)') tdSql.checkData(0, 3, 4.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != NULL then tdLog.info('tdSql.checkData(0, 4, NULL)') tdSql.checkData(0, 4, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != NULL then tdLog.info('tdSql.checkData(0, 6, NULL)') tdSql.checkData(0, 6, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 1 -x step120 tdLog.info('select * from %s where tgcol2 = 1 -x step120' % (mt)) @@ -1464,42 +1464,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 5.000000000 then tdLog.info('tdSql.checkData(0, 4, 5.000000000)') tdSql.checkData(0, 4, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != NULL then tdLog.info('tdSql.checkData(0, 5, NULL)') tdSql.checkData(0, 5, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != NULL then tdLog.info('tdSql.checkData(0, 6, NULL)') tdSql.checkData(0, 6, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol3 = 1 -x step130 tdLog.info('select * from %s where tgcol3 = 1 -x step130' % (mt)) @@ -1583,7 +1583,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/double.py b/tests/pytest/tag_lite/double.py index f70c6871af..b1f29f592e 100644 --- a/tests/pytest/tag_lite/double.py +++ b/tests/pytest/tag_lite/double.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/filter.py b/tests/pytest/tag_lite/filter.py index cdba8964ef..aeb13a1715 100644 --- a/tests/pytest/tag_lite/filter.py +++ b/tests/pytest/tag_lite/filter.py @@ -120,7 +120,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tg = '1' -x @@ -162,12 +162,12 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data00 != 10 then tdLog.info('tdSql.checkData(0, 0, 10)') tdSql.checkData(0, 0, 10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -194,7 +194,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -263,7 +263,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -293,7 +293,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -313,7 +313,7 @@ class TDTestCase: # TSIM: print expect 100, actual $data00 tdLog.info('expect 100, actual $data00') # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step15 tdLog.info('=============== step15') @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -358,7 +358,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/float.py b/tests/pytest/tag_lite/float.py index 1bfb1ac94d..7b93cb0ac9 100644 --- a/tests/pytest/tag_lite/float.py +++ b/tests/pytest/tag_lite/float.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/int.py b/tests/pytest/tag_lite/int.py index b831244790..99d4a69624 100644 --- a/tests/pytest/tag_lite/int.py +++ b/tests/pytest/tag_lite/int.py @@ -81,10 +81,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -107,10 +107,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -130,7 +130,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -138,7 +138,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -146,7 +146,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -154,7 +154,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -166,7 +166,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -188,7 +188,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -200,7 +200,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -213,7 +213,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -224,7 +224,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -233,7 +233,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -241,7 +241,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -249,7 +249,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -261,7 +261,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -272,7 +272,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -280,7 +280,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -288,7 +288,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -296,7 +296,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -312,7 +312,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -320,7 +320,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -328,7 +328,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -341,7 +341,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -353,7 +353,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -363,7 +363,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -375,7 +375,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -387,7 +387,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -399,7 +399,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -412,7 +412,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -425,7 +425,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -443,7 +443,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -461,7 +461,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -479,7 +479,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -497,7 +497,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -516,7 +516,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -535,7 +535,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -555,7 +555,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -569,7 +569,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/int_binary.py b/tests/pytest/tag_lite/int_binary.py index 62d8f2a604..7760814f66 100644 --- a/tests/pytest/tag_lite/int_binary.py +++ b/tests/pytest/tag_lite/int_binary.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -159,7 +159,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -170,7 +170,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -186,7 +186,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -194,7 +194,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -202,7 +202,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -210,7 +210,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -218,7 +218,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -226,7 +226,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -237,7 +237,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '0' tdLog.info('select * from %s where tgcol2 <> "0"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "0"' % (mt)) @@ -245,7 +245,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = '1' tdLog.info('select * from %s where tgcol2 = "1"' % (mt)) tdSql.query('select * from %s where tgcol2 = "1"' % (mt)) @@ -253,7 +253,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> '1' tdLog.info('select * from %s where tgcol2 <> "1"' % (mt)) tdSql.query('select * from %s where tgcol2 <> "1"' % (mt)) @@ -261,7 +261,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -274,7 +274,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -286,7 +286,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -296,7 +296,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -308,7 +308,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -320,7 +320,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -332,7 +332,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -345,7 +345,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -358,7 +358,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -373,7 +373,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> "1"' % @@ -385,7 +385,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = "0"' % @@ -397,7 +397,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> "0"' % @@ -409,7 +409,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = "0"' % @@ -421,7 +421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> "0"' % @@ -433,7 +433,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' tdLog.info( @@ -446,7 +446,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m tdLog.info( @@ -459,7 +459,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -475,7 +475,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and # tgcol <> 1 tdLog.info( @@ -488,7 +488,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and # tgcol = 0 tdLog.info( @@ -501,7 +501,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and # tgcol <> 0 tdLog.info( @@ -514,7 +514,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and # tgcol = 0 tdLog.info( @@ -527,7 +527,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' # and tgcol <> 0 tdLog.info( @@ -540,7 +540,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> '0' and tgcol <> 0 tdLog.info( @@ -553,7 +553,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and # ts < now + 5m and ts < now + 5m and tgcol <> 0 tdLog.info( @@ -566,7 +566,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -584,7 +584,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -618,7 +618,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -635,7 +635,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -653,7 +653,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -671,7 +671,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -690,7 +690,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' @@ -707,7 +707,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -724,7 +724,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -744,7 +744,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -763,7 +763,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -777,7 +777,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/int_float.py b/tests/pytest/tag_lite/int_float.py index 8a544c6110..31c94130ab 100644 --- a/tests/pytest/tag_lite/int_float.py +++ b/tests/pytest/tag_lite/int_float.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -122,7 +122,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -159,7 +159,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -170,7 +170,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -178,7 +178,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -186,7 +186,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -194,7 +194,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -202,7 +202,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -210,7 +210,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -218,7 +218,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -226,7 +226,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -237,7 +237,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 < 0.5 tdLog.info('select * from %s where tgcol2 < 0.5' % (mt)) tdSql.query('select * from %s where tgcol2 < 0.5' % (mt)) @@ -245,7 +245,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5 tdLog.info( 'select * from %s where tgcol2 > 0.5 and tgcol2 < 1.5' % @@ -257,7 +257,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -265,7 +265,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 1 tdLog.info('select * from %s where tgcol2 = 1' % (mt)) tdSql.query('select * from %s where tgcol2 = 1' % (mt)) @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 1 tdLog.info('select * from %s where tgcol2 <> 1' % (mt)) tdSql.query('select * from %s where tgcol2 <> 1' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 = 0 tdLog.info('select * from %s where tgcol2 = 0' % (mt)) tdSql.query('select * from %s where tgcol2 = 0' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol2 <> 0 tdLog.info('select * from %s where tgcol2 <> 0' % (mt)) tdSql.query('select * from %s where tgcol2 <> 0' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -310,7 +310,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -322,7 +322,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -332,7 +332,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -344,7 +344,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -356,7 +356,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -368,7 +368,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -381,7 +381,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -394,7 +394,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -409,7 +409,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol2 <> 1' % @@ -421,7 +421,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 = 0' % @@ -433,7 +433,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol2 <> 0' % @@ -445,7 +445,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 = 0' % @@ -457,7 +457,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol2 <> 0' % @@ -469,7 +469,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 tdLog.info( @@ -482,7 +482,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m tdLog.info( @@ -495,7 +495,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -511,7 +511,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and # tgcol <> 1 tdLog.info( @@ -524,7 +524,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and # tgcol = 0 tdLog.info( @@ -537,7 +537,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and # tgcol <> 0 tdLog.info( @@ -550,7 +550,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and # tgcol = 0 tdLog.info( @@ -563,7 +563,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and # tgcol <> 0 tdLog.info( @@ -576,7 +576,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol2 <> 0 and tgcol <> 0 tdLog.info( @@ -589,7 +589,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and # ts < now + 5m and ts < now + 5m and tgcol <> 0 tdLog.info( @@ -602,7 +602,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -620,7 +620,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -638,7 +638,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 @@ -654,7 +654,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -671,7 +671,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -689,7 +689,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -707,7 +707,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step12 tdLog.info('=============== step12') @@ -726,7 +726,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group @@ -743,7 +743,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and @@ -760,7 +760,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step13 @@ -780,7 +780,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step14 tdLog.info('=============== step14') @@ -799,7 +799,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -813,7 +813,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/set.py b/tests/pytest/tag_lite/set.py index 44f5a0890d..2573600dc4 100644 --- a/tests/pytest/tag_lite/set.py +++ b/tests/pytest/tag_lite/set.py @@ -77,22 +77,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tagcx 1 -x step21 tdLog.info('alter table %s set tag tagcx 1 -x step21' % (tb)) @@ -119,22 +119,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 4 tdLog.info('select * from %s where tgcol2 = 4' % (mt)) @@ -145,22 +145,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 0 then tdLog.info('tdSql.checkData(0, 2, 0)') tdSql.checkData(0, 2, 0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql describe $tb tdLog.info('describe %s' % (tb)) @@ -171,22 +171,22 @@ class TDTestCase: tdLog.info('tdSql.checkDataType(2, 1, "BOOL")') tdSql.checkDataType(2, 1, "BOOL") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data31 != INT then tdLog.info('tdSql.checkDataType(3, 1, "INT")') tdSql.checkDataType(3, 1, "INT") # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data23 != false then tdLog.info('tdSql.checkData(2, 3, false)') tdSql.checkData(2, 3, false) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data33 != 4 then tdLog.info('tdSql.checkData(3, 3, 4)') tdSql.checkData(3, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -217,22 +217,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tgcol1=3 tdLog.info('alter table %s set tag tgcol1=3' % (tb)) @@ -254,22 +254,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 4 tdLog.info('select * from %s where tgcol2 = 4' % (mt)) @@ -280,22 +280,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 2 tdLog.info('select * from %s where tgcol2 = 2' % (mt)) @@ -304,7 +304,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step4 @@ -336,22 +336,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2.00000 then tdLog.info('tdSql.checkData(0, 3, 2.00000)') tdSql.checkData(0, 3, 2.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tgcol1=3 tdLog.info('alter table %s set tag tgcol1=3' % (tb)) @@ -373,22 +373,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 4 tdLog.info('select * from %s where tgcol2 = 4' % (mt)) @@ -399,22 +399,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3 then tdLog.info('tdSql.checkData(0, 2, 3)') tdSql.checkData(0, 2, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4.00000 then tdLog.info('tdSql.checkData(0, 3, 4.00000)') tdSql.checkData(0, 3, 4.00000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step5 @@ -446,22 +446,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1.000000000 then tdLog.info('tdSql.checkData(0, 2, 1.000000000)') tdSql.checkData(0, 2, 1.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $tb set tag tgcol1=3 tdLog.info('alter table %s set tag tgcol1=3' % (tb)) @@ -483,22 +483,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3.000000000 then tdLog.info('tdSql.checkData(0, 2, 3.000000000)') tdSql.checkData(0, 2, 3.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = '4' tdLog.info('select * from %s where tgcol2 = "4"' % (mt)) @@ -509,22 +509,22 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 3.000000000 then tdLog.info('tdSql.checkData(0, 2, 3.000000000)') tdSql.checkData(0, 2, 3.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 4 then tdLog.info('tdSql.checkData(0, 3, 4)') tdSql.checkData(0, 3, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -560,42 +560,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 1 then tdLog.info('tdSql.checkData(0, 2, 1)') tdSql.checkData(0, 2, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 2 then tdLog.info('tdSql.checkData(0, 3, 2)') tdSql.checkData(0, 3, 2) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 3 then tdLog.info('tdSql.checkData(0, 4, 3)') tdSql.checkData(0, 4, 3) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 4 then tdLog.info('tdSql.checkData(0, 5, 4)') tdSql.checkData(0, 5, 4) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 5.000000000 then tdLog.info('tdSql.checkData(0, 6, 5.000000000)') tdSql.checkData(0, 6, 5.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != 6 then tdLog.info('tdSql.checkData(0, 7, 6)') tdSql.checkData(0, 7, 6) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql alter table $mt drop tag tgcol3 tdLog.info('alter table %s drop tag tgcol3' % (mt)) @@ -629,42 +629,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol2 = 8 tdLog.info('select * from %s where tgcol2 = 8' % (mt)) @@ -675,42 +675,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol4 = '9' tdLog.info('select * from %s where tgcol4 = "9"' % (mt)) @@ -721,42 +721,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol5 = 10 tdLog.info('select * from %s where tgcol5 = 10' % (mt)) @@ -767,42 +767,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where tgcol6 = '11' tdLog.info('select * from %s where tgcol6 = "11"' % (mt)) @@ -813,42 +813,42 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data01 != 1 then tdLog.info('tdSql.checkData(0, 1, 1)') tdSql.checkData(0, 1, 1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data02 != 7 then tdLog.info('tdSql.checkData(0, 2, 7)') tdSql.checkData(0, 2, 7) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data03 != 8 then tdLog.info('tdSql.checkData(0, 3, 8)') tdSql.checkData(0, 3, 8) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data04 != 9 then tdLog.info('tdSql.checkData(0, 4, 9)') tdSql.checkData(0, 4, 9) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data05 != 10.000000000 then tdLog.info('tdSql.checkData(0, 5, 10.000000000)') tdSql.checkData(0, 5, 10.000000000) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data06 != 11 then tdLog.info('tdSql.checkData(0, 6, 11)') tdSql.checkData(0, 6, 11) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: if $data07 != NULL then tdLog.info('tdSql.checkData(0, 7, NULL)') tdSql.checkData(0, 7, None) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -862,7 +862,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/smallint.py b/tests/pytest/tag_lite/smallint.py index a047b0afee..089af55a34 100644 --- a/tests/pytest/tag_lite/smallint.py +++ b/tests/pytest/tag_lite/smallint.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/tag_lite/tinyint.py b/tests/pytest/tag_lite/tinyint.py index 6e1820713c..55e33d013b 100644 --- a/tests/pytest/tag_lite/tinyint.py +++ b/tests/pytest/tag_lite/tinyint.py @@ -82,10 +82,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: while $i < 10 while (i < 10): # TSIM: $tb = $tbPrefix . $i @@ -108,10 +108,10 @@ class TDTestCase: (tb, ms, x)) # TSIM: $x = $x + 1 x = x + 1 - #TSIM: endw + # TSIM: endw # TSIM: $i = $i + 1 i = i + 1 - #TSIM: endw + # TSIM: endw # TSIM: # TSIM: print =============== step2 tdLog.info('=============== step2') @@ -123,7 +123,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($rowNum)') tdSql.checkRows(rowNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (tb)) tdSql.query('select * from %s where ts < now + 4m' % (tb)) @@ -131,7 +131,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts <= now + 4m tdLog.info('select * from %s where ts <= now + 4m' % (tb)) tdSql.query('select * from %s where ts <= now + 4m' % (tb)) @@ -139,7 +139,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (tb)) tdSql.query('select * from %s where ts > now + 4m' % (tb)) @@ -147,7 +147,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts >= now + 4m tdLog.info('select * from %s where ts >= now + 4m' % (tb)) tdSql.query('select * from %s where ts >= now + 4m' % (tb)) @@ -155,7 +155,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(15)') tdSql.checkRows(15) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -167,7 +167,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m tdLog.info( 'select * from %s where ts < now + 4m and ts > now + 5m' % @@ -179,7 +179,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > 100000 and ts < 100000 tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb)) tdSql.query( @@ -189,7 +189,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 3m' % @@ -201,7 +201,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and # ts < now + 6m tdLog.info( @@ -214,7 +214,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(1)') tdSql.checkRows(1) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step3 tdLog.info('=============== step3') @@ -225,7 +225,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow($totalNum)') tdSql.checkRows(totalNum) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: sql select * from $mt where ts < now + 4m tdLog.info('select * from %s where ts < now + 4m' % (mt)) @@ -234,7 +234,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(50)') tdSql.checkRows(50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m tdLog.info('select * from %s where ts > now + 4m' % (mt)) tdSql.query('select * from %s where ts > now + 4m' % (mt)) @@ -242,7 +242,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(150)') tdSql.checkRows(150) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts = now + 4m tdLog.info('select * from %s where ts = now + 4m' % (mt)) tdSql.query('select * from %s where ts = now + 4m' % (mt)) @@ -250,7 +250,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m tdLog.info( 'select * from %s where ts > now + 4m and ts < now + 5m' % @@ -262,7 +262,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(10)') tdSql.checkRows(10) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step4 tdLog.info('=============== step4') @@ -273,7 +273,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -281,7 +281,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -289,7 +289,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -297,7 +297,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 1 tdLog.info('select * from %s where tgcol = 1' % (mt)) tdSql.query('select * from %s where tgcol = 1' % (mt)) @@ -305,7 +305,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 1 tdLog.info('select * from %s where tgcol <> 1' % (mt)) tdSql.query('select * from %s where tgcol <> 1' % (mt)) @@ -313,7 +313,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol = 0 tdLog.info('select * from %s where tgcol = 0' % (mt)) tdSql.query('select * from %s where tgcol = 0' % (mt)) @@ -321,7 +321,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where tgcol <> 0 tdLog.info('select * from %s where tgcol <> 0' % (mt)) tdSql.query('select * from %s where tgcol <> 0' % (mt)) @@ -329,7 +329,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(100)') tdSql.checkRows(100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step5 tdLog.info('=============== step5') @@ -342,7 +342,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1 tdLog.info( 'select * from %s where ts > now + 4m and tgcol <> 1' % @@ -354,7 +354,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(75)') tdSql.checkRows(75) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0 tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt)) tdSql.query( @@ -364,7 +364,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts < now + 4m and tgcol <> 0' % @@ -376,7 +376,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol = 0' % @@ -388,7 +388,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0 tdLog.info( 'select * from %s where ts <= now + 4m and tgcol <> 0' % @@ -400,7 +400,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(25)') tdSql.checkRows(25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and # tgcol <> 0 tdLog.info( @@ -413,7 +413,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts # < now + 5m tdLog.info( @@ -426,7 +426,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(5)') tdSql.checkRows(5) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step6 tdLog.info('=============== step6') @@ -444,7 +444,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 200)') tdSql.checkData(0, 0, 200) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step7 tdLog.info('=============== step7') @@ -462,7 +462,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step8 tdLog.info('=============== step8') @@ -480,7 +480,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 50)') tdSql.checkData(0, 0, 50) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step9 tdLog.info('=============== step9') @@ -498,7 +498,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step10 tdLog.info('=============== step10') @@ -517,7 +517,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 100)') tdSql.checkData(0, 0, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== step11 tdLog.info('=============== step11') @@ -536,7 +536,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 0, 25)') tdSql.checkData(0, 0, 25) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: # TSIM: print =============== step12 @@ -556,7 +556,7 @@ class TDTestCase: tdLog.info('tdSql.checkData(0, 1, 100)') tdSql.checkData(0, 1, 100) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: print =============== clear tdLog.info('=============== clear') @@ -570,7 +570,7 @@ class TDTestCase: tdLog.info('tdSql.checkRow(0)') tdSql.checkRows(0) # TSIM: return -1 - #TSIM: endi + # TSIM: endi # TSIM: # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT # convert end diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py index ea178baf93..e9f0dad076 100644 --- a/tests/pytest/util/dnodes.py +++ b/tests/pytest/util/dnodes.py @@ -99,6 +99,19 @@ class TDDnode: def setValgrind(self, value): self.valgrind = value + def getDataSize(self): + totalSize = 0 + + if (self.deployed == 1): + for dirpath, dirnames, filenames in os.walk(self.dataDir): + for f in filenames: + fp = os.path.join(dirpath, f) + + if not os.path.islink(fp): + totalSize = totalSize + os.path.getsize(fp) + + return totalSize + def deploy(self): self.logDir = "%s/pysim/dnode%d/log" % (self.path, self.index) self.dataDir = "%s/pysim/dnode%d/data" % (self.path, self.index) @@ -384,6 +397,10 @@ class TDDnodes: self.check(index) self.dnodes[index - 1].stop() + def getDataSize(self, index): + self.check(index) + return self.dnodes[index - 1].getDataSize() + def forcestop(self, index): self.check(index) self.dnodes[index - 1].forcestop() From 3a650da645b6859c164d751bde957f1530436d8b Mon Sep 17 00:00:00 2001 From: Bomin Zhang Date: Mon, 25 May 2020 17:16:18 +0800 Subject: [PATCH 12/35] TD-407: add config for binary column display width --- src/common/src/tglobal.c | 12 + src/kit/shell/inc/shell.h | 14 +- src/kit/shell/src/shellDarwin.c | 44 +- src/kit/shell/src/shellEngine.c | 680 +++++++++++++++---------------- src/kit/shell/src/shellLinux.c | 43 +- src/kit/shell/src/shellMain.c | 1 - src/kit/shell/src/shellWindows.c | 42 +- 7 files changed, 408 insertions(+), 428 deletions(-) diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index faf15c4215..763b3f5c22 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -202,6 +202,8 @@ char tsTimezone[64] = {0}; char tsLocale[TSDB_LOCALE_LEN] = {0}; char tsCharset[TSDB_LOCALE_LEN] = {0}; // default encode string +int32_t tsMaxBinaryDisplayWidth = 30; + static pthread_once_t tsInitGlobalCfgOnce = PTHREAD_ONCE_INIT; void taosSetAllDebugFlag() { @@ -1227,6 +1229,16 @@ static void doInitGlobalConfig() { cfg.ptrLength = 0; cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); + + cfg.option = "maxBinaryDisplayWidth"; + cfg.ptr = &tsMaxBinaryDisplayWidth; + cfg.valType = TAOS_CFG_VTYPE_INT32; + cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT; + cfg.minValue = 1; + cfg.maxValue = 0x7fffffff; + cfg.ptrLength = 0; + cfg.unitType = TAOS_CFG_UTYPE_NONE; + taosInitConfigOption(cfg); } void taosInitGlobalCfg() { diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h index 549b0ef977..51bd1c1102 100644 --- a/src/kit/shell/inc/shell.h +++ b/src/kit/shell/inc/shell.h @@ -29,18 +29,6 @@ #define MAX_COMMAND_SIZE 65536 #define HISTORY_FILE ".taos_history" -#define BOOL_OUTPUT_LENGTH 6 -#define TINYINT_OUTPUT_LENGTH 6 -#define SMALLINT_OUTPUT_LENGTH 7 -#define INT_OUTPUT_LENGTH 11 -#define BIGINT_OUTPUT_LENGTH 21 -#define FLOAT_OUTPUT_LENGTH 20 -#define DOUBLE_OUTPUT_LENGTH 25 -#define BINARY_OUTPUT_LENGTH 20 - -// dynamic config timestamp width according to maximum time precision -extern int32_t TIMESTAMP_OUTPUT_LENGTH; - typedef struct SShellHistory { char* hist[MAX_HISTORY_SIZE]; int hstart; @@ -80,7 +68,7 @@ void get_history_path(char* history); void cleanup_handler(void* arg); void exitShell(); int shellDumpResult(TAOS* con, char* fname, int* error_no, bool printMode); -void shellPrintNChar(char* str, int width, bool printMode); +int shellPrintNChar(const char* str, int length, int width); void shellGetGrantInfo(void *con); int isCommentLine(char *line); diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c index cd2fe6df33..2f5d1f421d 100644 --- a/src/kit/shell/src/shellDarwin.c +++ b/src/kit/shell/src/shellDarwin.c @@ -352,37 +352,29 @@ void *shellLoopQuery(void *arg) { return NULL; } -void shellPrintNChar(char *str, int width, bool printMode) { - int col_left = width; - wchar_t wc; - while (col_left > 0) { - if (*str == '\0') break; - char *tstr = str; - int byte_width = mbtowc(&wc, tstr, MB_CUR_MAX); - if (byte_width <= 0) break; - int col_width = wcwidth(wc); - if (col_width <= 0) { - str += byte_width; - continue; +int shellPrintNChar(const char *str, int length, int width) { + int pos = 0, cols = 0; + while (pos < length) { + wchar_t wc; + pos += mbtowc(&wc, str + pos, MB_CUR_MAX); + if (pos > length) { + break; + } + + int w = wcwidth(wc); + if (w > 0) { + if (width > 0 && cols + w > width) { + break; + } + printf("%lc", wc); + cols += w; } - if (col_left < col_width) break; - printf("%lc", wc); - str += byte_width; - col_left -= col_width; } - while (col_left > 0) { - printf(" "); - col_left--; - } - - if (!printMode) { - printf("|"); - } else { - printf("\n"); - } + return cols; } + int get_old_terminal_mode(struct termios *tio) { /* Make sure stdin is a terminal. */ if (!isatty(STDIN_FILENO)) { diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index dbb05f6a35..b4103ab331 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -35,6 +35,9 @@ int prompt_size = 6; TAOS_RES *result = NULL; SShellHistory history; +#define DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30 +extern int32_t tsMaxBinaryDisplayWidth; + /* * FUNCTION: Initialize the shell. */ @@ -195,7 +198,15 @@ int32_t shellRunCommand(TAOS *con, char *command) { } else if (regex_match(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) { // If clear the screen. system("clear"); - return 0; + } else if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$", REG_EXTENDED | REG_ICASE)) { + strtok(command, " \t"); + strtok(NULL, " \t"); + char* p = strtok(NULL, " \t"); + if (strcasecmp(p, "default") == 0) { + tsMaxBinaryDisplayWidth = DEFAULT_MAX_BINARY_DISPLAY_WIDTH; + } else { + tsMaxBinaryDisplayWidth = atoi(p); + } } else if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) { /* If source file. */ char *c_ptr = strtok(command, " ;"); @@ -310,360 +321,349 @@ int regex_match(const char *s, const char *reg, int cflags) { return 0; } -int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) { - TAOS_ROW row = NULL; - int numOfRows = 0; - time_t tt; - char buf[25] = "\0"; - struct tm *ptm; - int output_bytes = 0; - FILE * fp = NULL; - int num_fields = taos_field_count(con); - wordexp_t full_path; - assert(num_fields != 0); +static char* formatTimestamp(char* buf, int64_t val, int precision) { + if (args.is_raw_time) { + sprintf(buf, "%" PRId64, val); + return buf; + } - result = taos_use_result(con); + time_t tt; + if (precision == TSDB_TIME_PRECISION_MICRO) { + tt = (time_t)(val / 1000000); + } else { + tt = (time_t)(val / 1000); + } + + struct tm* ptm = localtime(&tt); + size_t pos = strftime(buf, 32, "%Y-%m-%d %H:%M:%S", ptm); + + if (precision == TSDB_TIME_PRECISION_MICRO) { + sprintf(buf + pos, ".%06d", (int)(val % 1000000)); + } else { + sprintf(buf + pos, ".%03d", (int)(val % 1000)); + } + + return buf; +} + + +static void dumpFieldToFile(FILE* fp, const char* val, TAOS_FIELD* field, int32_t length, int precision) { + if (val == NULL) { + fprintf(fp, "%s", TSDB_DATA_NULL_STR); + return; + } + + char buf[TSDB_MAX_BYTES_PER_ROW]; + switch (field->type) { + case TSDB_DATA_TYPE_BOOL: + fprintf(fp, "%d", ((((int)(*((char *)val))) == 1) ? 1 : 0)); + break; + case TSDB_DATA_TYPE_TINYINT: + fprintf(fp, "%d", (int)(*((char *)val))); + break; + case TSDB_DATA_TYPE_SMALLINT: + fprintf(fp, "%d", (int)(*((short *)val))); + break; + case TSDB_DATA_TYPE_INT: + fprintf(fp, "%d", *((int *)val)); + break; + case TSDB_DATA_TYPE_BIGINT: + fprintf(fp, "%" PRId64, *((int64_t *)val)); + break; + case TSDB_DATA_TYPE_FLOAT: + fprintf(fp, "%.5f", GET_FLOAT_VAL(val)); + break; + case TSDB_DATA_TYPE_DOUBLE: + fprintf(fp, "%.9f", GET_DOUBLE_VAL(val)); + break; + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + memcpy(buf, val, length); + buf[length] = 0; + fprintf(fp, "\'%s\'", buf); + break; + case TSDB_DATA_TYPE_TIMESTAMP: + formatTimestamp(buf, *(int64_t*)val, precision); + fprintf(fp, "'%s'", buf); + break; + default: + break; + } +} + +static int dumpResultToFile(const char* fname, TAOS_RES* result) { + TAOS_ROW row = taos_fetch_row(result); + if (row == NULL) { + return 0; + } + + wordexp_t full_path; + + if (wordexp(fname, &full_path, 0) != 0) { + fprintf(stderr, "ERROR: invalid file name: %s\n", fname); + return -1; + } + + FILE* fp = fopen(full_path.we_wordv[0], "w"); + if (fp == NULL) { + fprintf(stderr, "ERROR: failed to open file: %s\n", full_path.we_wordv[0]); + wordfree(&full_path); + return -1; + } + + wordfree(&full_path); + + int num_fields = taos_num_fields(result); + TAOS_FIELD *fields = taos_fetch_fields(result); + int32_t* length = taos_fetch_lengths(result); + int precision = taos_result_precision(result); + + for (int col = 0; col < num_fields; col++) { + if (col > 0) { + fprintf(fp, ","); + } + fprintf(fp, "%s", fields[col].name); + } + fputc('\n', fp); + + int numOfRows = 0; + do { + for (int i = 0; i < num_fields; i++) { + if (i > 0) { + fputc(',', fp); + } + dumpFieldToFile(fp, row[i], fields +i, length[i], precision); + } + fputc('\n', fp); + + numOfRows++; + row = taos_fetch_row(result); + } while( row != NULL); + + fclose(fp); + return numOfRows; +} + + +static void printField(const char* val, TAOS_FIELD* field, int width, int32_t length, int precision) { + if (val == NULL) { + int w = width; + if (field->type < TSDB_DATA_TYPE_TINYINT || field->type > TSDB_DATA_TYPE_DOUBLE) { + w = 0; + } + w = printf("%*s", w, TSDB_DATA_NULL_STR); + for (; w < width; w++) { + putchar(' '); + } + return; + } + + char buf[TSDB_MAX_BYTES_PER_ROW]; + switch (field->type) { + case TSDB_DATA_TYPE_BOOL: + printf("%*s", width, ((((int)(*((char *)val))) == 1) ? "true" : "false")); + break; + case TSDB_DATA_TYPE_TINYINT: + printf("%*d", width, (int)(*((char *)val))); + break; + case TSDB_DATA_TYPE_SMALLINT: + printf("%*d", width, (int)(*((short *)val))); + break; + case TSDB_DATA_TYPE_INT: + printf("%*d", width, *((int *)val)); + break; + case TSDB_DATA_TYPE_BIGINT: + printf("%*" PRId64, width, *((int64_t *)val)); + break; + case TSDB_DATA_TYPE_FLOAT: + printf("%*.5f", width, GET_FLOAT_VAL(val)); + break; + case TSDB_DATA_TYPE_DOUBLE: + printf("%*.9f", width, GET_DOUBLE_VAL(val)); + break; + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + for (int w = shellPrintNChar(val, length, width); w < width; w++) { + putchar(' '); + } + break; + case TSDB_DATA_TYPE_TIMESTAMP: + formatTimestamp(buf, *(int64_t*)val, precision); + printf("%s", buf); + break; + default: + break; + } +} + + +static int verticalPrintResult(TAOS_RES* result) { + TAOS_ROW row = taos_fetch_row(result); + if (row == NULL) { + return 0; + } + + int num_fields = taos_num_fields(result); + TAOS_FIELD *fields = taos_fetch_fields(result); + int32_t* length = taos_fetch_lengths(result); + int precision = taos_result_precision(result); + + int maxColNameLen = 0; + for (int col = 0; col < num_fields; col++) { + int len = strlen(fields[col].name); + if (len > maxColNameLen) { + maxColNameLen = len; + } + } + + int numOfRows = 0; + do { + printf("*************************** %d.row ***************************\n", numOfRows + 1); + for (int i = 0; i < num_fields; i++) { + TAOS_FIELD* field = fields + i; + + int padding = (int)(maxColNameLen - strlen(field->name)); + printf("%*.s%s: ", padding, " ", field->name); + + printField(row[i], field, 0, length[i], precision); + putchar('\n'); + } + + numOfRows++; + row = taos_fetch_row(result); + } while(row != NULL); + + return numOfRows; +} + + +static int calcColWidth(TAOS_FIELD* field, int precision) { + int width = strlen(field->name); + + switch (field->type) { + case TSDB_DATA_TYPE_BOOL: + return MAX(5, width); // 'false' + + case TSDB_DATA_TYPE_TINYINT: + return MAX(4, width); // '-127' + + case TSDB_DATA_TYPE_SMALLINT: + return MAX(6, width); // '-32767' + + case TSDB_DATA_TYPE_INT: + return MAX(11, width); // '-2147483648' + + case TSDB_DATA_TYPE_BIGINT: + return MAX(21, width); // '-9223372036854775807' + + case TSDB_DATA_TYPE_FLOAT: + return MAX(20, width); + + case TSDB_DATA_TYPE_DOUBLE: + return MAX(25, width); + + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + if (field->bytes > tsMaxBinaryDisplayWidth) { + return MAX(tsMaxBinaryDisplayWidth, width); + } else { + return MAX(field->bytes, width); + } + + case TSDB_DATA_TYPE_TIMESTAMP: + if (args.is_raw_time) { + return MAX(14, width); + } else if (precision == TSDB_TIME_PRECISION_MICRO) { + return MAX(26, width); // '2020-01-01 00:00:00.000000' + } else { + return MAX(23, width); // '2020-01-01 00:00:00.000' + } + + default: + assert(false); + } + + return 0; +} + + +static void printHeader(TAOS_FIELD* fields, int* width, int num_fields) { + int rowWidth = 0; + for (int col = 0; col < num_fields; col++) { + TAOS_FIELD* field = fields + col; + int padding = (int)(width[col] - strlen(field->name)); + int left = padding / 2; + printf(" %*.s%s%*.s |", left, " ", field->name, padding - left, " "); + rowWidth += width[col] + 3; + } + + putchar('\n'); + for (int i = 0; i < rowWidth; i++) { + putchar('='); + } + putchar('\n'); +} + + +static int horizontalPrintResult(TAOS_RES* result) { + TAOS_ROW row = taos_fetch_row(result); + if (row == NULL) { + return 0; + } + + int num_fields = taos_num_fields(result); + TAOS_FIELD *fields = taos_fetch_fields(result); + int32_t* length = taos_fetch_lengths(result); + int precision = taos_result_precision(result); + + int width[TSDB_MAX_COLUMNS]; + for (int col = 0; col < num_fields; col++) { + width[col] = calcColWidth(fields + col, precision); + } + + printHeader(fields, width, num_fields); + + int numOfRows = 0; + do { + for (int i = 0; i < num_fields; i++) { + putchar(' '); + printField(row[i], fields + i, width[i], length[i], precision); + putchar(' '); + putchar('|'); + } + putchar('\n'); + numOfRows++; + row = taos_fetch_row(result); + } while(row != NULL); + + return numOfRows; +} + + +int shellDumpResult(TAOS *con, char *fname, int *error_no, bool vertical) { + int numOfRows = 0; + + TAOS_RES* result = taos_use_result(con); if (result == NULL) { taos_error(con); return -1; } if (fname != NULL) { - if (wordexp(fname, &full_path, 0) != 0) { - fprintf(stderr, "ERROR: invalid file name: %s\n", fname); - return -1; - } - - fp = fopen(full_path.we_wordv[0], "w"); - if (fp == NULL) { - fprintf(stderr, "ERROR: failed to open file: %s\n", full_path.we_wordv[0]); - wordfree(&full_path); - return -1; - } - - wordfree(&full_path); - } - - TAOS_FIELD *fields = taos_fetch_fields(result); - - row = taos_fetch_row(result); - int32_t* length = taos_fetch_lengths(result); - - char t_str[TSDB_MAX_BYTES_PER_ROW] = "\0"; - int l[TSDB_MAX_COLUMNS] = {0}; - int maxLenColumnName = 0; - - if (row) { - // Print the header indicator - if (fname == NULL) { // print to standard output - if (!printMode) { - for (int col = 0; col < num_fields; col++) { - switch (fields[col].type) { - case TSDB_DATA_TYPE_BOOL: - l[col] = MAX(BOOL_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_TINYINT: - l[col] = MAX(TINYINT_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_SMALLINT: - l[col] = MAX(SMALLINT_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_INT: - l[col] = MAX(INT_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_BIGINT: - l[col] = MAX(BIGINT_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_FLOAT: - l[col] = MAX(FLOAT_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_DOUBLE: - l[col] = MAX(DOUBLE_OUTPUT_LENGTH, strlen(fields[col].name)); - break; - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - l[col] = MAX(fields[col].bytes, strlen(fields[col].name)); - /* l[col] = max(BINARY_OUTPUT_LENGTH, strlen(fields[col].name)); */ - break; - case TSDB_DATA_TYPE_TIMESTAMP: { - int32_t defaultWidth = TIMESTAMP_OUTPUT_LENGTH; - if (args.is_raw_time) { - defaultWidth = 14; - } - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - defaultWidth += 3; - } - l[col] = MAX(defaultWidth, strlen(fields[col].name)); - - break; - } - default: - break; - } - - int spaces = (int)(l[col] - strlen(fields[col].name)); - int left_space = spaces / 2; - int right_space = (spaces % 2 ? left_space + 1 : left_space); - printf("%*.s%s%*.s|", left_space, " ", fields[col].name, right_space, " "); - output_bytes += (l[col] + 1); - } - printf("\n"); - for (int k = 0; k < output_bytes; k++) printf("="); - printf("\n"); - } else { - for (int col = 0; col < num_fields; col++) { - if (strlen(fields[col].name) > maxLenColumnName) maxLenColumnName = strlen(fields[col].name); - } - } - - // print the elements - do { - if (!printMode) { - for (int i = 0; i < num_fields; i++) { - if (row[i] == NULL) { - printf("%*s|", l[i], TSDB_DATA_NULL_STR); - continue; - } - - switch (fields[i].type) { - case TSDB_DATA_TYPE_BOOL: - printf("%*s|", l[i], ((((int)(*((char *)row[i]))) == 1) ? "true" : "false")); - break; - case TSDB_DATA_TYPE_TINYINT: - printf("%*d|", l[i], (int)(*((char *)row[i]))); - break; - case TSDB_DATA_TYPE_SMALLINT: - printf("%*d|", l[i], (int)(*((short *)row[i]))); - break; - case TSDB_DATA_TYPE_INT: - printf("%*d|", l[i], *((int *)row[i])); - break; - case TSDB_DATA_TYPE_BIGINT: - printf("%*" PRId64 "|", l[i], *((int64_t *)row[i])); - break; - case TSDB_DATA_TYPE_FLOAT: { - float fv = 0; - fv = GET_FLOAT_VAL(row[i]); - printf("%*.5f|", l[i], fv); - } - break; - case TSDB_DATA_TYPE_DOUBLE: { - double dv = 0; - dv = GET_DOUBLE_VAL(row[i]); - printf("%*.9f|", l[i], dv); - } - break; - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW); - memcpy(t_str, row[i], length[i]); - /* printf("%-*s|",max(fields[i].bytes, strlen(fields[i].name)), - * t_str); */ - /* printf("%-*s|", l[i], t_str); */ - shellPrintNChar(t_str, l[i], printMode); - break; - case TSDB_DATA_TYPE_TIMESTAMP: - if (args.is_raw_time) { - printf(" %" PRId64 "|", *(int64_t *)row[i]); - } else { - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - tt = (time_t)((*(int64_t *)row[i]) / 1000000); - } else { - tt = (time_t)((*(int64_t *)row[i]) / 1000); - } - - ptm = localtime(&tt); - strftime(buf, 64, "%y-%m-%d %H:%M:%S", ptm); - - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - printf(" %s.%06d|", buf, (int)(*(int64_t *)row[i] % 1000000)); - } else { - printf(" %s.%03d|", buf, (int)(*(int64_t *)row[i] % 1000)); - } - } - break; - default: - break; - } - } - printf("\n"); - } else { - printf("*************************** %d.row ***************************\n", numOfRows + 1); - for (int i = 0; i < num_fields; i++) { - // 1. print column name - int left_space = (int)(maxLenColumnName - strlen(fields[i].name)); - printf("%*.s%s: ", left_space, " ", fields[i].name); - - // 2. print column value - if (row[i] == NULL) { - printf("%s\n", TSDB_DATA_NULL_STR); - continue; - } - - switch (fields[i].type) { - case TSDB_DATA_TYPE_BOOL: - printf("%s\n", ((((int)(*((char *)row[i]))) == 1) ? "true" : "false")); - break; - case TSDB_DATA_TYPE_TINYINT: - printf("%d\n", (int)(*((char *)row[i]))); - break; - case TSDB_DATA_TYPE_SMALLINT: - printf("%d\n", (int)(*((short *)row[i]))); - break; - case TSDB_DATA_TYPE_INT: - printf("%d\n", *((int *)row[i])); - break; - case TSDB_DATA_TYPE_BIGINT: - printf("%" PRId64 "\n", *((int64_t *)row[i])); - break; - case TSDB_DATA_TYPE_FLOAT: { - float fv = 0; - fv = GET_FLOAT_VAL(row[i]); - printf("%.5f\n", fv); - } - break; - case TSDB_DATA_TYPE_DOUBLE: { - double dv = 0; - dv = GET_DOUBLE_VAL(row[i]); - printf("%.9f\n", dv); - } - break; - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW); - memcpy(t_str, row[i], length[i]); - - l[i] = MAX(fields[i].bytes, strlen(fields[i].name)); - shellPrintNChar(t_str, l[i], printMode); - break; - case TSDB_DATA_TYPE_TIMESTAMP: - if (args.is_raw_time) { - printf("%" PRId64 "\n", *(int64_t *)row[i]); - } else { - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - tt = (time_t)((*(int64_t *)row[i]) / 1000000); - } else { - tt = (time_t)((*(int64_t *)row[i]) / 1000); - } - - ptm = localtime(&tt); - strftime(buf, 64, "%y-%m-%d %H:%M:%S", ptm); - - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - printf("%s.%06d\n", buf, (int)(*(int64_t *)row[i] % 1000000)); - } else { - printf("%s.%03d\n", buf, (int)(*(int64_t *)row[i] % 1000)); - } - } - break; - default: - break; - } - } - } - - numOfRows++; - } while ((row = taos_fetch_row(result))); - - } else { // dump to file - // first write column - for (int col = 0; col < num_fields; col++) { - fprintf(fp, "%s", fields[col].name); - if (col < num_fields - 1) { - fprintf(fp, ","); - } else { - fprintf(fp, "\n"); - } - } - - do { - for (int i = 0; i < num_fields; i++) { - if (row[i]) { - switch (fields[i].type) { - case TSDB_DATA_TYPE_BOOL: - fprintf(fp, "%d", ((((int)(*((char *)row[i]))) == 1) ? 1 : 0)); - break; - case TSDB_DATA_TYPE_TINYINT: - fprintf(fp, "%d", (int)(*((char *)row[i]))); - break; - case TSDB_DATA_TYPE_SMALLINT: - fprintf(fp, "%d", (int)(*((short *)row[i]))); - break; - case TSDB_DATA_TYPE_INT: - fprintf(fp, "%d", *((int *)row[i])); - break; - case TSDB_DATA_TYPE_BIGINT: - fprintf(fp, "%" PRId64, *((int64_t *)row[i])); - break; - case TSDB_DATA_TYPE_FLOAT: { - float fv = 0; - fv = GET_FLOAT_VAL(row[i]); - fprintf(fp, "%.5f", fv); - } - break; - case TSDB_DATA_TYPE_DOUBLE: { - double dv = 0; - dv = GET_DOUBLE_VAL(row[i]); - fprintf(fp, "%.9f", dv); - } - break; - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW); - memcpy(t_str, row[i], length[i]); - fprintf(fp, "\'%s\'", t_str); - break; - case TSDB_DATA_TYPE_TIMESTAMP: - if (args.is_raw_time) { - fprintf(fp, "%" PRId64, *(int64_t *)row[i]); - } else { - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - tt = (time_t)((*(int64_t *)row[i]) / 1000000); - } else { - tt = (time_t)((*(int64_t *)row[i]) / 1000); - } - - ptm = localtime(&tt); - strftime(buf, 64, "%Y-%m-%d %H:%M:%S", ptm); - - if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) { - fprintf(fp, "\'%s.%06d\'", buf, (int)(*(int64_t *)row[i] % 1000000)); - } else { - fprintf(fp, "\'%s.%03d\'", buf, (int)(*(int64_t *)row[i] % 1000)); - } - } - break; - default: - break; - } - } else { - fprintf(fp, "%s", TSDB_DATA_NULL_STR); - } - if (i < num_fields - 1) { - fprintf(fp, ","); - } else { - fprintf(fp, "\n"); - } - } - - numOfRows++; - } while ((row = taos_fetch_row(result))); - } + numOfRows = dumpResultToFile(fname, result); + } else if(vertical) { + numOfRows = verticalPrintResult(result); + } else { + numOfRows = horizontalPrintResult(result); } *error_no = taos_errno(con); - taos_free_result(result); - result = NULL; - - if (fname != NULL) { - fclose(fp); - } - return numOfRows; } + void read_history() { // Initialize history memset(history.hist, 0, sizeof(char *) * MAX_HISTORY_SIZE); diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c index da2bd94814..37c08d7ae9 100644 --- a/src/kit/shell/src/shellLinux.c +++ b/src/kit/shell/src/shellLinux.c @@ -329,35 +329,26 @@ void *shellLoopQuery(void *arg) { return NULL; } -void shellPrintNChar(char *str, int width, bool printMode) { - int col_left = width; - wchar_t wc; - while (col_left > 0) { - if (*str == '\0') break; - char *tstr = str; - int byte_width = mbtowc(&wc, tstr, MB_CUR_MAX); - if (byte_width <= 0) break; - int col_width = wcwidth(wc); - if (col_width <= 0) { - str += byte_width; - continue; +int shellPrintNChar(const char *str, int length, int width) { + int pos = 0, cols = 0; + while (pos < length) { + wchar_t wc; + pos += mbtowc(&wc, str + pos, MB_CUR_MAX); + if (pos > length) { + break; + } + + int w = wcwidth(wc); + if (w > 0) { + if (width > 0 && cols + w > width) { + break; + } + printf("%lc", wc); + cols += w; } - if (col_left < col_width) break; - printf("%lc", wc); - str += byte_width; - col_left -= col_width; } - while (col_left > 0) { - printf(" "); - col_left--; - } - - if (!printMode) { - printf("|"); - } else { - printf("\n"); - } + return cols; } int get_old_terminal_mode(struct termios *tio) { diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c index f8010b84cd..3485a964d7 100644 --- a/src/kit/shell/src/shellMain.c +++ b/src/kit/shell/src/shellMain.c @@ -20,7 +20,6 @@ TAOS* con; pthread_t pid; -int32_t TIMESTAMP_OUTPUT_LENGTH = 22; // TODO: IMPLEMENT INTERRUPT HANDLER. void interruptHandler(int signum) { diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c index ac04c593fb..8c7f24ef52 100644 --- a/src/kit/shell/src/shellWindows.c +++ b/src/kit/shell/src/shellWindows.c @@ -217,32 +217,30 @@ void *shellLoopQuery(void *arg) { return NULL; } -void shellPrintNChar(char *str, int width, bool printMode) { - int col_left = width; - wchar_t wc; - while (col_left > 0) { - if (*str == '\0') break; - char *tstr = str; - int byte_width = mbtowc(&wc, tstr, MB_CUR_MAX); - int col_width = byte_width; - if (col_left < col_width) break; - printf("%lc", wc); - str += byte_width; - col_left -= col_width; +int shellPrintNChar(const char *str, int length, int width) { + int pos = 0, cols = 0; + while (pos < length) { + wchar_t wc; + int bytes = mbtowc(&wc, str + pos, MB_CUR_MAX); + pos += bytes; + if (pos > length) { + break; + } + + int w = bytes; + if (w > 0) { + if (width > 0 && cols + w > width) { + break; + } + printf("%lc", wc); + cols += w; + } } - while (col_left > 0) { - printf(" "); - col_left--; - } - - if (!printMode) { - printf("|"); - } else { - printf("\n"); - } + return cols; } + void get_history_path(char *history) { sprintf(history, "%s/%s", ".", HISTORY_FILE); } void exitShell() { exit(EXIT_SUCCESS); } From d3aaceedb5e8d5010263e9c83a35df82ffb2597d Mon Sep 17 00:00:00 2001 From: sunguofeng Date: Mon, 25 May 2020 17:25:08 +0800 Subject: [PATCH 13/35] Update TSDBDriver.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 多数据源下，driver驱动根据acceptsURL判断url使用合适的驱动，增加判断TAOS驱动 --- .../jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java index c297fb67b0..f4c9ec765a 100755 --- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java +++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java @@ -188,7 +188,7 @@ public class TSDBDriver implements java.sql.Driver { } public boolean acceptsURL(String url) throws SQLException { - return true; + return StringUtils.isNotBlank(url) && url.startsWith(URL_PREFIX); } public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException { @@ -355,4 +355,4 @@ public class TSDBDriver implements java.sql.Driver { public String database(Properties props) { return props.getProperty(PROPERTY_KEY_DBNAME); } -} \ No newline at end of file +} From 4e3aa5d5d3228ffb193582f2c25a648eea704b30 Mon Sep 17 00:00:00 2001 From: Bomin Zhang Date: Mon, 25 May 2020 18:45:43 +0800 Subject: [PATCH 14/35] update shellPrintNChar it padding the output to be exactly `width` columns now. --- src/kit/shell/inc/shell.h | 2 +- src/kit/shell/src/shellDarwin.c | 6 ++++-- src/kit/shell/src/shellEngine.c | 4 +--- src/kit/shell/src/shellLinux.c | 6 ++++-- src/kit/shell/src/shellWindows.c | 6 ++++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h index 51bd1c1102..5400d9c5ba 100644 --- a/src/kit/shell/inc/shell.h +++ b/src/kit/shell/inc/shell.h @@ -68,7 +68,7 @@ void get_history_path(char* history); void cleanup_handler(void* arg); void exitShell(); int shellDumpResult(TAOS* con, char* fname, int* error_no, bool printMode); -int shellPrintNChar(const char* str, int length, int width); +void shellPrintNChar(const char* str, int length, int width); void shellGetGrantInfo(void *con); int isCommentLine(char *line); diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c index 2f5d1f421d..e4ef06c403 100644 --- a/src/kit/shell/src/shellDarwin.c +++ b/src/kit/shell/src/shellDarwin.c @@ -352,7 +352,7 @@ void *shellLoopQuery(void *arg) { return NULL; } -int shellPrintNChar(const char *str, int length, int width) { +void shellPrintNChar(const char *str, int length, int width) { int pos = 0, cols = 0; while (pos < length) { wchar_t wc; @@ -371,7 +371,9 @@ int shellPrintNChar(const char *str, int length, int width) { } } - return cols; + for (; cols < width; cols++) { + putchar(' '); + } } diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index b4103ab331..ba5909923b 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -484,9 +484,7 @@ static void printField(const char* val, TAOS_FIELD* field, int width, int32_t le break; case TSDB_DATA_TYPE_BINARY: case TSDB_DATA_TYPE_NCHAR: - for (int w = shellPrintNChar(val, length, width); w < width; w++) { - putchar(' '); - } + shellPrintNChar(val, length, width); break; case TSDB_DATA_TYPE_TIMESTAMP: formatTimestamp(buf, *(int64_t*)val, precision); diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c index 37c08d7ae9..856e011a78 100644 --- a/src/kit/shell/src/shellLinux.c +++ b/src/kit/shell/src/shellLinux.c @@ -329,7 +329,7 @@ void *shellLoopQuery(void *arg) { return NULL; } -int shellPrintNChar(const char *str, int length, int width) { +void shellPrintNChar(const char *str, int length, int width) { int pos = 0, cols = 0; while (pos < length) { wchar_t wc; @@ -348,7 +348,9 @@ int shellPrintNChar(const char *str, int length, int width) { } } - return cols; + for (; cols < width; cols++) { + putchar(' '); + } } int get_old_terminal_mode(struct termios *tio) { diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c index 8c7f24ef52..c446677276 100644 --- a/src/kit/shell/src/shellWindows.c +++ b/src/kit/shell/src/shellWindows.c @@ -217,7 +217,7 @@ void *shellLoopQuery(void *arg) { return NULL; } -int shellPrintNChar(const char *str, int length, int width) { +void shellPrintNChar(const char *str, int length, int width) { int pos = 0, cols = 0; while (pos < length) { wchar_t wc; @@ -237,7 +237,9 @@ int shellPrintNChar(const char *str, int length, int width) { } } - return cols; + for (; cols < width; cols++) { + putchar(' '); + } } From 316e807c5151db17fd546f13135966f5ba03e411 Mon Sep 17 00:00:00 2001 From: Hui Li Date: Mon, 25 May 2020 18:46:14 +0800 Subject: [PATCH 15/35] [modify script for arbitrator function] --- tests/script/sh/deploy.sh | 1 + tests/script/sh/exec_tarbitrator.sh | 64 +++++ tests/script/sh/stop_dnodes.sh | 9 + tests/script/test.sh | 8 + .../replica_changeWithArbitrator.sim | 242 ++++++++++++++++++ tests/tsim/src/simExe.c | 5 + tests/tsim/src/simSystem.c | 6 + 7 files changed, 335 insertions(+) create mode 100755 tests/script/sh/exec_tarbitrator.sh create mode 100644 tests/script/unique/arbitrator/replica_changeWithArbitrator.sim diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 83ecea555a..b3134938cb 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -96,6 +96,7 @@ echo "second ${HOSTNAME}:7200" >> $TAOS_CFG echo "serverPort ${NODE}" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG +echo "debugFlag 135" >> $TAOS_CFG echo "dDebugFlag 135" >> $TAOS_CFG echo "mDebugFlag 135" >> $TAOS_CFG echo "sdbDebugFlag 135" >> $TAOS_CFG diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh new file mode 100755 index 0000000000..cb0a8858cb --- /dev/null +++ b/tests/script/sh/exec_tarbitrator.sh @@ -0,0 +1,64 @@ +#!/bin/sh + +# if [ $# != 2 || $# != 3 ]; then + # echo "argument list need input : " + # echo " -s start/stop" + # exit 1 +# fi + +EXEC_OPTON= +while getopts "n:s:u:x:ct" arg +do + case $arg in + n) + NODE_NAME=$OPTARG + ;; + s) + EXEC_OPTON=$OPTARG + ;; + c) + CLEAR_OPTION="clear" + ;; + t) + SHELL_OPTION="true" + ;; + u) + USERS=$OPTARG + ;; + x) + SIGNAL=$OPTARG + ;; + ?) + echo "unkown argument" + ;; + esac +done + + +SCRIPT_DIR=`dirname $0` +cd $SCRIPT_DIR/../ +SCRIPT_DIR=`pwd` + +cd ../../ +TAOS_DIR=`pwd` + +BUILD_DIR=$TAOS_DIR/../debug/build +SIM_DIR=$TAOS_DIR/sim +NODE_DIR=$SIM_DIR/arbitrator +EXE_DIR=$BUILD_DIR/bin +LOG_DIR=$NODE_DIR/log + +echo "------------ $EXEC_OPTON tarbitrator" + +if [ "$EXEC_OPTON" = "start" ]; then + echo "------------ log path: $LOG_DIR" + nohup $EXE_DIR/tarbitrator -p 8000 -d 135 -g $LOG_DIR > /dev/null 2>&1 & +else + #relative path + PID=`ps -ef|grep tarbitrator | grep -v grep | awk '{print $2}'` + if [ -n "$PID" ]; then + sudo kill -9 $PID + sudo pkill -9 tarbitrator + fi +fi + diff --git a/tests/script/sh/stop_dnodes.sh b/tests/script/sh/stop_dnodes.sh index 2364dff9b3..1a6e7153c3 100755 --- a/tests/script/sh/stop_dnodes.sh +++ b/tests/script/sh/stop_dnodes.sh @@ -13,3 +13,12 @@ while [ -n "$PID" ]; do fuser -k -n tcp 6030 PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` done + +PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'` +while [ -n "$PID" ]; do + echo kill -9 $PID + pkill -9 tarbitrator + fuser -k -n tcp 6040 + PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'` +done + diff --git a/tests/script/test.sh b/tests/script/test.sh index 96ab3c5808..984eb13c4c 100755 --- a/tests/script/test.sh +++ b/tests/script/test.sh @@ -62,6 +62,11 @@ CFG_DIR=$PRG_DIR/cfg LOG_DIR=$PRG_DIR/log DATA_DIR=$PRG_DIR/data + +ARBITRATOR_PRG_DIR=$SIM_DIR/arbitrator +ARBITRATOR_LOG_DIR=$ARBITRATOR_PRG_DIR/log + + chmod -R 777 $PRG_DIR echo "------------------------------------------------------------------------" echo "Start TDengine Testing Case ..." @@ -72,9 +77,12 @@ echo "CFG_DIR : $CFG_DIR" rm -rf $LOG_DIR rm -rf $CFG_DIR +rm -rf $ARBITRATOR_LOG_DIR + mkdir -p $PRG_DIR mkdir -p $LOG_DIR mkdir -p $CFG_DIR +mkdir -p $ARBITRATOR_LOG_DIR TAOS_CFG=$PRG_DIR/cfg/taos.cfg touch -f $TAOS_CFG diff --git a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim new file mode 100644 index 0000000000..9a04d187fa --- /dev/null +++ b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim @@ -0,0 +1,242 @@ +system sh/stop_dnodes.sh +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 walLevel -v 1 +system sh/cfg.sh -n dnode2 -c walLevel -v 1 +system sh/cfg.sh -n dnode3 -c walLevel -v 1 + +system sh/cfg.sh -n dnode1 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode3 -c balanceInterval -v 10 + +system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator +system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator +system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator + +print ============== step0: start tarbitrator +system sh/exec_tarbitrator.sh -s start + + +print ============== step1: replica is 1, and start 1 dnode +system sh/exec_up.sh -n dnode1 -s start +sleep 3000 +sql connect + +$db = replica_db1 +sql create database $db replica 1 maxTables 4 +sql use $db + +# create table , insert data +$stb = repl_stb +sql create table $stb (ts timestamp, c1 int) tags(t1 int) +$rowNum = 10 +$tblNum = 12 + +$ts0 = 1420041600000 +$ts = $ts0 +$delta = 1 + +$i = 0 +while $i < $tblNum + $tb = tb . $i + sql create table $tb using $stb tags( $i ) + + $x = 0 + while $x < $rowNum + $xs = $x * $delta + $ts = $ts0 + $xs + sql insert into $tb values ( $ts , $x ) + $x = $x + 1 + endw + $i = $i + 1 +endw + +print ============== step2: add 1 new dnode, expect balanced +system sh/exec_up.sh -n dnode2 -s start +sql create dnode $hostname2 + +# expect after balanced, 2 vondes in dnode1, 1 vonde in dnode2 +$x = 0 +show2: + $x = $x + 1 + sleep 2000 + if $x == 10 then + return -1 + endi + +sql show dnodes +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 2 then + goto show2 +endi +if $data2_2 != 1 then + goto show2 +endi + +#print ============== step3: start tarbitrator +#system sh/exec_tarbitrator.sh -s start + +return 1 + +print ============== step4: stop dnode1, and wait dnode2 master +system sh/exec_up.sh -n dnode1 -s stop + +$x = 0 +loop_wait: + $x = $x + 1 + sleep 2000 + if $x == 10 then + print ERROR: after dnode1 stop, dnode2 didn't become a master! + return -1 + endi +sql show mnodes +$dnodeRole = $data2_1 +print dnodeRole ==> $dnodeRole +print dnodeEp ==> $data1_1 +print hostname1 ==> $hostname1 +print arbitrator ==> $arbitrator + +if $dnodeRole != master then + goto loop_wait +endi + + + + + + + + + + + + + + + + + + + + + + +# alter replica to 2 +#print ============== step3: alter replica to 2 +#sql alter database $db replica 2 + + + + + + + + + + + + + + + + + + + +#$x = 0 +#show2: +# $x = $x + 1 +# sleep 2000 +# if $x == 10 then +# return -1 +# endi +# +#sql show mnodes +#print dnode1 ==> $data2_1 +#print dnode2 ==> $data2_2 +#if $data2_1 != master then +# goto show2 +#endi +#if $data2_2 != slave then +# goto show2 +#endi +# +#print ============== step3 +#sql_error drop dnode $hostname1 -x error1 +#print should not drop master +# +#print ============== step4 +#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +#sql_error show mnodes +#print error of no master +# +#print ============== step5 +#sql_error drop dnode $hostname1 +#print error of no master +# +#print ============== step6 +#system sh/exec_up.sh -n dnode1 -s start +#sleep 2000 +#sql close +#sql connect +# +#$x = 0 +#show6: +# $x = $x + 1 +# sleep 2000 +# if $x == 10 then +# return -1 +# endi +# +#sql show mnodes -x show6 +#print dnode1 ==> $data2_1 +#print dnode2 ==> $data2_2 +#if $data2_1 != master then +# goto show6 +#endi +#if $data2_2 != slave then +# goto show6 +#endi +# +#print ============== step7 +#system sh/exec_up.sh -n dnode3 -s start +#sql create dnode $hostname3 +#sleep 5000 +# +#$x = 0 +#show7: +# $x = $x + 1 +# sleep 2000 +# if $x == 10 then +# return -1 +# endi +# +#sql show mnodes +#print dnode1 ==> $data2_1 +#print dnode2 ==> $data2_2 +#print dnode3 ==> $data2_3 +#if $data2_1 != master then +# goto show7 +#endi +#if $data2_2 != slave then +# goto show7 +#endi +#if $data3_3 != null then +# goto show7 +#endi +# +#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode4 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode5 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode6 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode7 -s stop -x SIGINT +#system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c index 5ea1cb4a1a..0c35e3668c 100644 --- a/tests/tsim/src/simExe.c +++ b/tests/tsim/src/simExe.c @@ -36,12 +36,17 @@ void simLogSql(char *sql) { fflush(fp); } +char *simParseArbitratorName(char *varName); char *simParseHostName(char *varName); char *simGetVariable(SScript *script, char *varName, int varLen) { if (strncmp(varName, "hostname", 8) == 0) { return simParseHostName(varName); } + if (strncmp(varName, "arbitrator", 10) == 0) { + return simParseArbitratorName(varName); + } + if (strncmp(varName, "error", varLen) == 0) return script->error; if (strncmp(varName, "rows", varLen) == 0) return script->rows; diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c index bac68c22d3..3acfebb9bd 100644 --- a/tests/tsim/src/simSystem.c +++ b/tests/tsim/src/simSystem.c @@ -29,6 +29,12 @@ int simDebugFlag = 135; void simCloseTaosdConnect(SScript *script); char simHostName[128]; +char *simParseArbitratorName(char *varName) { + static char hostName[140]; + sprintf(hostName, "%s:%d", simHostName, 8000); + return hostName; +} + char *simParseHostName(char *varName) { static char hostName[140]; From 41556c085bde0a5d34209db33ab0c7e151b32fb1 Mon Sep 17 00:00:00 2001 From: Hui Li Date: Mon, 25 May 2020 18:56:24 +0800 Subject: [PATCH 16/35] [modify script for arbitrator function] --- .../replica_changeWithArbitrator.sim | 142 ------------------ 1 file changed, 142 deletions(-) diff --git a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim index 9a04d187fa..d1b4a2ec72 100644 --- a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim +++ b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim @@ -80,11 +80,6 @@ if $data2_2 != 1 then goto show2 endi -#print ============== step3: start tarbitrator -#system sh/exec_tarbitrator.sh -s start - -return 1 - print ============== step4: stop dnode1, and wait dnode2 master system sh/exec_up.sh -n dnode1 -s stop @@ -99,144 +94,7 @@ loop_wait: sql show mnodes $dnodeRole = $data2_1 print dnodeRole ==> $dnodeRole -print dnodeEp ==> $data1_1 -print hostname1 ==> $hostname1 -print arbitrator ==> $arbitrator if $dnodeRole != master then goto loop_wait endi - - - - - - - - - - - - - - - - - - - - - - -# alter replica to 2 -#print ============== step3: alter replica to 2 -#sql alter database $db replica 2 - - - - - - - - - - - - - - - - - - - -#$x = 0 -#show2: -# $x = $x + 1 -# sleep 2000 -# if $x == 10 then -# return -1 -# endi -# -#sql show mnodes -#print dnode1 ==> $data2_1 -#print dnode2 ==> $data2_2 -#if $data2_1 != master then -# goto show2 -#endi -#if $data2_2 != slave then -# goto show2 -#endi -# -#print ============== step3 -#sql_error drop dnode $hostname1 -x error1 -#print should not drop master -# -#print ============== step4 -#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -#sql_error show mnodes -#print error of no master -# -#print ============== step5 -#sql_error drop dnode $hostname1 -#print error of no master -# -#print ============== step6 -#system sh/exec_up.sh -n dnode1 -s start -#sleep 2000 -#sql close -#sql connect -# -#$x = 0 -#show6: -# $x = $x + 1 -# sleep 2000 -# if $x == 10 then -# return -1 -# endi -# -#sql show mnodes -x show6 -#print dnode1 ==> $data2_1 -#print dnode2 ==> $data2_2 -#if $data2_1 != master then -# goto show6 -#endi -#if $data2_2 != slave then -# goto show6 -#endi -# -#print ============== step7 -#system sh/exec_up.sh -n dnode3 -s start -#sql create dnode $hostname3 -#sleep 5000 -# -#$x = 0 -#show7: -# $x = $x + 1 -# sleep 2000 -# if $x == 10 then -# return -1 -# endi -# -#sql show mnodes -#print dnode1 ==> $data2_1 -#print dnode2 ==> $data2_2 -#print dnode3 ==> $data2_3 -#if $data2_1 != master then -# goto show7 -#endi -#if $data2_2 != slave then -# goto show7 -#endi -#if $data3_3 != null then -# goto show7 -#endi -# -#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode3 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode4 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode5 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode6 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode7 -s stop -x SIGINT -#system sh/exec_up.sh -n dnode8 -s stop -x SIGINT \ No newline at end of file From 5583060b00388b25979ba92642a29e7962a43315 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 25 May 2020 22:37:54 +0800 Subject: [PATCH 17/35] support glibc 2.17 (default version of CentOS7). [TD-420] --- src/client/src/tscSQLParser.c | 3 ++- src/kit/shell/src/shellEngine.c | 2 ++ src/kit/shell/src/shellImport.c | 1 + src/util/src/ttime.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 35a4937fd7..82460b6a76 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -13,7 +13,8 @@ * along with this program. If not, see . */ -#define _XOPEN_SOURCE +#define _BSD_SOURCE +#define _XOPEN_SOURCE 500 #define _DEFAULT_SOURCE #include "os.h" diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index ba5909923b..93818d7d73 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -13,6 +13,8 @@ * along with this program. If not, see . */ +#define _BSD_SOURCE +#define _GNU_SOURCE #define _XOPEN_SOURCE #define _DEFAULT_SOURCE diff --git a/src/kit/shell/src/shellImport.c b/src/kit/shell/src/shellImport.c index 2cbd07db4b..70660254a5 100644 --- a/src/kit/shell/src/shellImport.c +++ b/src/kit/shell/src/shellImport.c @@ -13,6 +13,7 @@ * along with this program. If not, see . */ +#define _GNU_SOURCE #define _XOPEN_SOURCE #define _DEFAULT_SOURCE diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c index d34bf0e6ce..8355ed9dc1 100644 --- a/src/util/src/ttime.c +++ b/src/util/src/ttime.c @@ -13,6 +13,7 @@ * along with this program. If not, see . */ +#define _BSD_SOURCE #define _XOPEN_SOURCE #define _DEFAULT_SOURCE From c1bc7ef982d1021579a141b119762fb3c36ca4b1 Mon Sep 17 00:00:00 2001 From: Bomin Zhang Date: Tue, 26 May 2020 16:51:26 +0800 Subject: [PATCH 18/35] shell suport multiple commands in single statement --- src/kit/shell/src/shellDarwin.c | 9 +- src/kit/shell/src/shellEngine.c | 201 +++++++++++++++++-------------- src/kit/shell/src/shellLinux.c | 10 +- src/kit/shell/src/shellWindows.c | 7 +- 4 files changed, 116 insertions(+), 111 deletions(-) diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c index e4ef06c403..987087d71f 100644 --- a/src/kit/shell/src/shellDarwin.c +++ b/src/kit/shell/src/shellDarwin.c @@ -335,17 +335,14 @@ void *shellLoopQuery(void *arg) { tscError("failed to malloc command"); return NULL; } - while (1) { - // Read command from shell. + do { + // Read command from shell. memset(command, 0, MAX_COMMAND_SIZE); set_terminal_mode(); shellReadCommand(con, command); reset_terminal_mode(); - - // Run the command - shellRunCommand(con, command); - } + } while (shellRunCommand(con, command) == 0); pthread_cleanup_pop(1); diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index 93818d7d73..4ef51eaa5a 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/src/kit/shell/src/shellEngine.c @@ -82,20 +82,15 @@ TAOS *shellInit(SShellArguments *args) { // Check if it is temperory run if (args->commands != NULL || args->file[0] != 0) { if (args->commands != NULL) { - char *token; - token = strtok(args->commands, ";"); - while (token != NULL) { - printf("%s%s\n", PROMPT_HEADER, token); - shellRunCommand(con, token); - token = strtok(NULL, ";"); - } + printf("%s%s\n", PROMPT_HEADER, args->commands); + shellRunCommand(con, args->commands); } if (args->file[0] != 0) { source_file(con, args->file); } - taos_close(con); + taos_close(con); write_history(); exit(EXIT_SUCCESS); } @@ -111,67 +106,66 @@ TAOS *shellInit(SShellArguments *args) { return con; } -void shellReplaceCtrlChar(char *str) { - _Bool ctrlOn = false; - char *pstr = NULL; - char quote = 0; - for (pstr = str; *str != '\0'; ++str) { - if (ctrlOn) { - switch (*str) { - case 'n': - *pstr = '\n'; - pstr++; - break; - case 'r': - *pstr = '\r'; - pstr++; - break; - case 't': - *pstr = '\t'; - pstr++; - break; - case 'G': - *pstr++ = '\\'; - *pstr++ = *str; - break; - case '\\': - *pstr = '\\'; - pstr++; - break; - case '\'': - case '"': - if (quote) { - *pstr++ = '\\'; - *pstr++ = *str; - } - break; - default: - *pstr = *str; - pstr++; - break; - } - ctrlOn = false; - } else { - if (*str == '\\') { - ctrlOn = true; - } else { - if (quote == *str) { - quote = 0; - } else if (*str == '\'' || *str == '"') { - quote = *str; - } - *pstr = *str; - pstr++; - } +static bool isEmptyCommand(const char* cmd) { + for (char c = *cmd++; c != 0; c = *cmd++) { + if (c != ' ' && c != '\t' && c != ';') { + return false; } } - *pstr = '\0'; + return true; } -int32_t shellRunCommand(TAOS *con, char *command) { + +static int32_t shellRunSingleCommand(TAOS *con, char *command) { /* If command is empty just return */ - if (regex_match(command, "^[ \t;]*$", REG_EXTENDED)) { + if (isEmptyCommand(command)) { + return 0; + } + + // Analyse the command. + if (regex_match(command, "^[ \t]*(quit|q|exit)[ \t;]*$", REG_EXTENDED | REG_ICASE)) { + taos_close(con); + write_history(); + return -1; + } + + if (regex_match(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) { + // If clear the screen. + system("clear"); + return 0; + } + + if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$", REG_EXTENDED | REG_ICASE)) { + strtok(command, " \t"); + strtok(NULL, " \t"); + char* p = strtok(NULL, " \t"); + if (strcasecmp(p, "default") == 0) { + tsMaxBinaryDisplayWidth = DEFAULT_MAX_BINARY_DISPLAY_WIDTH; + } else { + tsMaxBinaryDisplayWidth = atoi(p); + } + return 0; + } + + if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) { + /* If source file. */ + char *c_ptr = strtok(command, " ;"); + assert(c_ptr != NULL); + c_ptr = strtok(NULL, " ;"); + assert(c_ptr != NULL); + source_file(con, c_ptr); + return 0; + } + + shellRunCommandOnServer(con, command); + return 0; +} + + +int32_t shellRunCommand(TAOS* con, char* command) { + /* If command is empty just return */ + if (isEmptyCommand(command)) { return 0; } @@ -190,40 +184,63 @@ int32_t shellRunCommand(TAOS *con, char *command) { } } - shellReplaceCtrlChar(command); - - // Analyse the command. - if (regex_match(command, "^[ \t]*(quit|q|exit)[ \t;]*$", REG_EXTENDED | REG_ICASE)) { - taos_close(con); - write_history(); - return -1; - } else if (regex_match(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) { - // If clear the screen. - system("clear"); - } else if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$", REG_EXTENDED | REG_ICASE)) { - strtok(command, " \t"); - strtok(NULL, " \t"); - char* p = strtok(NULL, " \t"); - if (strcasecmp(p, "default") == 0) { - tsMaxBinaryDisplayWidth = DEFAULT_MAX_BINARY_DISPLAY_WIDTH; - } else { - tsMaxBinaryDisplayWidth = atoi(p); + bool esc = false; + char quote = 0, *cmd = command, *p = command; + for (char c = *command++; c != 0; c = *command++) { + if (esc) { + switch (c) { + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + case 'G': + *p++ = '\\'; + break; + case '\'': + case '"': + if (quote) { + *p++ = '\\'; + } + break; + } + *p++ = c; + esc = false; + continue; + } + + if (c == '\\') { + esc = true; + continue; } - } else if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) { - /* If source file. */ - char *c_ptr = strtok(command, " ;"); - assert(c_ptr != NULL); - c_ptr = strtok(NULL, " ;"); - assert(c_ptr != NULL); - source_file(con, c_ptr); - } else { - shellRunCommandOnServer(con, command); + if (quote == c) { + quote = 0; + } else if (c == '\'' || c == '"') { + quote = c; + } + + *p++ = c; + if (c == ';') { + c = *p; + *p = 0; + if (shellRunSingleCommand(con, cmd) < 0) { + return -1; + } + *p = c; + p = cmd; + } } - - return 0; + + *p = 0; + return shellRunSingleCommand(con, cmd); } + void shellRunCommandOnServer(TAOS *con, char command[]) { int64_t st, et; wordexp_t full_path; diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c index 856e011a78..d8b3e9bb4d 100644 --- a/src/kit/shell/src/shellLinux.c +++ b/src/kit/shell/src/shellLinux.c @@ -307,19 +307,13 @@ void *shellLoopQuery(void *arg) { return NULL; } - while (1) { + do { // Read command from shell. - memset(command, 0, MAX_COMMAND_SIZE); set_terminal_mode(); shellReadCommand(con, command); reset_terminal_mode(); - - // Run the command - if (shellRunCommand(con, command) != 0) { - break; - } - } + } while (shellRunCommand(con, command) == 0); tfree(command); exitShell(); diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c index c446677276..440aa508ab 100644 --- a/src/kit/shell/src/shellWindows.c +++ b/src/kit/shell/src/shellWindows.c @@ -203,16 +203,13 @@ void *shellLoopQuery(void *arg) { char *command = malloc(MAX_COMMAND_SIZE); if (command == NULL) return NULL; - while (1) { + do { memset(command, 0, MAX_COMMAND_SIZE); shellPrintPrompt(); // Read command from shell. shellReadCommand(con, command); - - // Run the command - shellRunCommand(con, command); - } + } while (shellRunCommand(con, command) == 0); return NULL; } From fbc50a3da38563a032abf3b9ffa83935c698c453 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Tue, 26 May 2020 11:02:05 +0000 Subject: [PATCH 19/35] [TD-90] tag schema develop --- src/common/inc/tdataformat.h | 17 ++-- src/common/src/tdataformat.c | 151 ++++++++++++++++++++++++++++------- src/tsdb/src/tsdbMeta.c | 28 ++++--- src/tsdb/src/tsdbRead.c | 16 ++-- src/vnode/src/vnodeWrite.c | 6 +- 5 files changed, 162 insertions(+), 56 deletions(-) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 0aec948015..b1dda88d50 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -226,13 +226,13 @@ pData typedef struct { int16_t colId; // column ID int16_t colType; - int16_t colLen; // if col type is binary/Nchar, this is the length of binary/Nchar - int16_t offset; //to store value for numeric col or offset for binary/Nchar + uint16_t offset; //to store value for numeric col or offset for binary/Nchar } STagCol; typedef struct { - int32_t len; + int32_t len; void * pData; // Space to store the tag value + uint16_t dataLen; int16_t ncols; // Total columns allocated STagCol tagCols[]; } STagRow; @@ -242,10 +242,13 @@ typedef struct { int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId); //insert tag value and update all the information int tdDeleteTagCol(SDataRow row, int16_t colId); // delete tag value and update all the information -int tdQuerTagByID(SDataRow row, int16_t colId, void *value, int16_t *type, int16_t *len); //if find tag, 0, else return -1; -int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes); - -SDataRow tdNewTagRowFromSchema(STSchema *pSchema); +void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type); //if find tag, 0, else return -1; +int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId); +SDataRow tdTagRowDup(SDataRow row); +void tdFreeTagRow(SDataRow row); +SDataRow tdTagRowDecode(SDataRow row); +int tdTagRowCpy(SDataRow dst, SDataRow src); +void * tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags); STSchema *tdGetSchemaFromData(SDataRow *row); #ifdef __cplusplus diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index 3df94452d8..822a92322a 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -14,6 +14,7 @@ */ #include "tdataformat.h" #include "wchar.h" +#include "talgo.h" /** * Create a SSchema object with nCols columns @@ -152,25 +153,136 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { } int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId){ //insert tag value and update all the information + //todo return 0; }; int tdDeleteTagCol(SDataRow row, int16_t colId){ // delete tag value and update all the information - return o; -}; - -int tdQuerTagByID(SDataRow row, int16_t colId, void *value, int16_t *type, int16_t *len){ //if find tag, 0, else return -1; - return 0; -}; - -int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes){ + //todo return 0; }; -SDataRow tdNewTagRowFromSchema(STSchema *pSchema) { - //todo +static int compTagVal(const void *key1, const void *key2) { + if (*(int16_t *)key1 > *(int16_t *)key2) { + return 1; + } else if (*(int16_t *)key1 == *(int16_t *)key2) { + return 0; + } else { + return -1; + } } +void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) { //if find tag, 0, else return -1; + //todo + ASSERT(((STagRow *)row)->pData != NULL); + + STagCol *pBase = ((STagRow *)row)->tagCols; + int16_t nCols = ((STagRow *)row)->ncols; + + STagCol * stCol = taosbsearch(&colId, pBase, nCols, sizeof(STagCol), compTagVal, TD_EQ); + if (NULL == stCol) { + return NULL; + } + + void * pData = ((STagRow *)row)->pData; + *type = stCol->colType; + + return pData + stCol->offset; +}; + +int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId){ + ASSERT(value != NULL); + //ASSERT(bytes-2 == varDataTLen(value)); + ASSERT(row != NULL); + STagRow *pTagrow = row; + + pTagrow->tagCols[pTagrow->ncols].colId = colId; + pTagrow->tagCols[pTagrow->ncols].colType = type; + pTagrow->tagCols[pTagrow->ncols].offset = pTagrow->dataLen; + + switch (type) { + case TSDB_DATA_TYPE_BINARY: + case TSDB_DATA_TYPE_NCHAR: + memcpy((char *)pTagrow->pData + pTagrow->dataLen, value, varDataTLen(value)); + pTagrow->dataLen += varDataTLen(value); + break; + default: + memcpy((char *)pTagrow->pData + pTagrow->dataLen, value, TYPE_BYTES[type]); + pTagrow->dataLen += TYPE_BYTES[type]; + break; + } + + pTagrow->ncols++; + + return 0; +}; + +void * tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags) { + int32_t size = sizeof(STagRow) + numofTags * sizeof(STagCol); + + STagRow *row = malloc(size); + if (row == NULL) return NULL; + + int32_t datasize = pSchema->tlen - pSchema->flen; + row->pData = malloc(datasize); + if (NULL == row->pData) { + free(row); + return NULL; + } + + row->len = size; + row->dataLen = 0; + row->ncols = 0; + return row; +} +/** + * free tag row + */ + +void tdFreeTagRow(SDataRow row) { + if (row) { + free(((STagRow *)row)->pData); + free(row); + } +} + +SDataRow tdTagRowDup(SDataRow row) { + STagRow *trow = malloc(dataRowLen(row)); + if (trow == NULL) return NULL; + + dataRowCpy(trow, row); + trow->pData = malloc(trow->dataLen); + if (NULL == trow->pData) { + free(trow); + return NULL; + } + memcpy(trow->pData, ((STagRow *)row)->pData, trow->dataLen); + return trow; +} + +SDataRow tdTagRowDecode(SDataRow row) { + STagRow *trow = malloc(dataRowLen(row)); + if (trow == NULL) return NULL; + + dataRowCpy(trow, row); + trow->pData = malloc(trow->dataLen); + if (NULL == trow->pData) { + free(trow); + return NULL; + } + char * pData = (char *)row + dataRowLen(row) + sizeof(int32_t); + memcpy(trow->pData, pData, trow->dataLen); + return trow; +} + +int tdTagRowCpy(SDataRow dst, SDataRow src) { + if (src == NULL) return -1; + + dataRowCpy(dst, src); + void * pData = dst + dataRowLen(src); + memcpy(pData, ((STagRow *)src)->pData, ((STagRow *)src)->dataLen); + return 0; +} /** * Free the SDataRow object */ @@ -203,25 +315,6 @@ int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_ return 0; } -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_SHIFT(row, dataRowLen(row)); - - switch (type) { - case TSDB_DATA_TYPE_BINARY: - case TSDB_DATA_TYPE_NCHAR: - *(VarDataOffsetT *)POINTER_SHIFT(row, toffset) = dataRowLen(row); - memcpy(ptr, value, varDataTLen(value)); - dataRowLen(row) += varDataTLen(value); - break; - default: - memcpy(POINTER_SHIFT(row, toffset), value, TYPE_BYTES[type]); - break; - } - - return 0; -} SDataRow tdDataRowDup(SDataRow row) { SDataRow trow = malloc(dataRowLen(row)); diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 356e9c77f1..c16bb74df8 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -54,7 +54,7 @@ void *tsdbEncodeTable(STable *pTable, int *contLen) { ptr = tdEncodeSchema(ptr, pTable->schema); ptr = tdEncodeSchema(ptr, pTable->tagSchema); } else if (pTable->type == TSDB_CHILD_TABLE) { - dataRowCpy(ptr, pTable->tagVal); + tdTagRowCpy(ptr, pTable->tagVal); } else { ptr = tdEncodeSchema(ptr, pTable->schema); } @@ -96,7 +96,7 @@ STable *tsdbDecodeTable(void *cont, int contLen) { pTable->schema = tdDecodeSchema(&ptr); pTable->tagSchema = tdDecodeSchema(&ptr); } else if (pTable->type == TSDB_CHILD_TABLE) { - pTable->tagVal = tdDataRowDup(ptr); + pTable->tagVal = tdTagRowDecode(ptr); } else { pTable->schema = tdDecodeSchema(&ptr); } @@ -114,8 +114,10 @@ static char* getTagIndexKey(const void* pData) { SDataRow row = elem->pTable->tagVal; STSchema* pSchema = tsdbGetTableTagSchema(elem->pMeta, elem->pTable); STColumn* pCol = &pSchema->columns[DEFAULT_TAG_INDEX_COLUMN]; - - return tdGetRowDataOfCol(row, pCol->type, TD_DATA_ROW_HEAD_SIZE + pCol->offset); + int16_t type = 0; + void * res = tdQueryTagByID(row, pCol->colId,&type); + ASSERT(type == pCol->type); + return res; } int tsdbRestoreTable(void *pHandle, void *cont, int contLen) { @@ -255,8 +257,9 @@ int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId* id, int32_t colId, int16_t } SDataRow row = (SDataRow)pTable->tagVal; - char* d = tdGetRowDataOfCol(row, pCol->type, TD_DATA_ROW_HEAD_SIZE + pCol->offset); - + int16_t tagtype = 0; + char* d = tdQueryTagByID(row, pCol->colId, &tagtype); + //ASSERT((int8_t)tagtype == pCol->type) *val = d; *type = pCol->type; *bytes = pCol->bytes; @@ -321,7 +324,7 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) { if (super->pIndex == NULL) { tdFreeSchema(super->schema); tdFreeSchema(super->tagSchema); - tdFreeDataRow(super->tagVal); + tdFreeTagRow(super->tagVal); free(super); return -1; } @@ -346,7 +349,7 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) { if (IS_CREATE_STABLE(pCfg)) { // TSDB_CHILD_TABLE table->type = TSDB_CHILD_TABLE; table->superUid = pCfg->superUid; - table->tagVal = tdDataRowDup(pCfg->tagValues); + table->tagVal = tdTagRowDup(pCfg->tagValues); } else { // TSDB_NORMAL_TABLE table->type = TSDB_NORMAL_TABLE; table->superUid = -1; @@ -433,7 +436,7 @@ static void tsdbFreeMemTable(SMemTable *pMemTable) { static int tsdbFreeTable(STable *pTable) { // TODO: finish this function if (pTable->type == TSDB_CHILD_TABLE) { - tdFreeDataRow(pTable->tagVal); + tdFreeTagRow(pTable->tagVal); } else { tdFreeSchema(pTable->schema); } @@ -571,7 +574,9 @@ static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) { STSchema* pSchema = tsdbGetTableTagSchema(pMeta, pTable); STColumn* pCol = &pSchema->columns[DEFAULT_TAG_INDEX_COLUMN]; - char* key = tdGetRowDataOfCol(pTable->tagVal, pCol->type, TD_DATA_ROW_HEAD_SIZE + pCol->offset); + int16_t tagtype = 0; + char* key = tdQueryTagByID(pTable->tagVal, pCol->colId, &tagtype); + ASSERT(pCol->type == tagtype); SArray* res = tSkipListGet(pSTable->pIndex, key); size_t size = taosArrayGetSize(res); @@ -602,7 +607,8 @@ static int tsdbEstimateTableEncodeSize(STable *pTable) { size += tdGetSchemaEncodeSize(pTable->schema); size += tdGetSchemaEncodeSize(pTable->tagSchema); } else if (pTable->type == TSDB_CHILD_TABLE) { - size += dataRowLen(pTable->tagVal); + STagRow *pTagRow = (STagRow *)(pTable->tagVal); + size += dataRowLen(pTable->tagVal) + pTagRow->dataLen; } else { size += tdGetSchemaEncodeSize(pTable->schema); } diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index ad3da226f6..4912f6f2e8 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -1746,9 +1746,9 @@ int32_t tableGroupComparFn(const void *p1, const void *p2, const void *param) { STColumn* pCol = schemaColAt(pTableGroupSupp->pTagSchema, colIndex); bytes = pCol->bytes; type = pCol->type; - - f1 = tdGetRowDataOfCol(pTable1->tagVal, pCol->type, TD_DATA_ROW_HEAD_SIZE + pCol->offset); - f2 = tdGetRowDataOfCol(pTable2->tagVal, pCol->type, TD_DATA_ROW_HEAD_SIZE + pCol->offset); + int16_t tgtype1, tgtype2 = 0; + f1 = tdQueryTagByID(pTable1->tagVal, pCol->colId, &tgtype1); + f2 = tdQueryTagByID(pTable2->tagVal, pCol->colId, &tgtype2); } int32_t ret = doCompare(f1, f2, type, bytes); @@ -1836,10 +1836,12 @@ bool indexedNodeFilterFp(const void* pNode, void* param) { val = (char*) elem->pTable->name; type = TSDB_DATA_TYPE_BINARY; } else { - STSchema* pTSchema = (STSchema*) pInfo->param; // todo table schema is identical to stable schema?? - - int32_t offset = pTSchema->columns[pInfo->colIndex].offset; - val = tdGetRowDataOfCol(elem->pTable->tagVal, pInfo->sch.type, TD_DATA_ROW_HEAD_SIZE + offset); +// STSchema* pTSchema = (STSchema*) pInfo->param; // todo table schema is identical to stable schema?? + int16_t type; + // int32_t offset = pTSchema->columns[pInfo->colIndex].offset; + // val = tdGetRowDataOfCol(elem->pTable->tagVal, pInfo->sch.type, TD_DATA_ROW_HEAD_SIZE + offset); + val = tdQueryTagByID(elem->pTable->tagVal, pInfo->colIndex, &type); + // ASSERT(pInfo->sch.type == type); } int32_t ret = 0; diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c index 9c415d6af7..96ca19e129 100644 --- a/src/vnode/src/vnodeWrite.c +++ b/src/vnode/src/vnodeWrite.c @@ -139,11 +139,13 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe char *pTagData = pTable->data + totalCols * sizeof(SSchema); int accumBytes = 0; - dataRow = tdNewDataRowFromSchema(pDestTagSchema); + //dataRow = tdNewDataRowFromSchema(pDestTagSchema); + dataRow = tdNewTagRowFromSchema(pDestTagSchema, numOfTags); for (int i = 0; i < numOfTags; i++) { STColumn *pTCol = schemaColAt(pDestTagSchema, i); - tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset); +// tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset); + tdAppendTagColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->colId); accumBytes += htons(pSchema[i + numOfColumns].bytes); } tsdbTableSetTagValue(&tCfg, dataRow, false); From da266b1c1b9f79ba439a53924e8a962ef911f087 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Tue, 26 May 2020 19:32:16 +0800 Subject: [PATCH 20/35] fix tests/test/c/importPerTabe.c typo [TD-429] --- tests/test/c/CMakeLists.txt | 4 ++-- tests/test/c/{importPerTabe.c => importPerTable.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/test/c/{importPerTabe.c => importPerTable.c} (100%) diff --git a/tests/test/c/CMakeLists.txt b/tests/test/c/CMakeLists.txt index 893abb8e82..d40db5ee40 100644 --- a/tests/test/c/CMakeLists.txt +++ b/tests/test/c/CMakeLists.txt @@ -16,6 +16,6 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) add_executable(importOneRow importOneRow.c) target_link_libraries(importOneRow taos_static pthread) - add_executable(importPerTabe importPerTabe.c) - target_link_libraries(importPerTabe taos_static pthread) + add_executable(importPerTable importPerTable.c) + target_link_libraries(importPerTable taos_static pthread) ENDIF() diff --git a/tests/test/c/importPerTabe.c b/tests/test/c/importPerTable.c similarity index 100% rename from tests/test/c/importPerTabe.c rename to tests/test/c/importPerTable.c From 3882d0fa2d4f455f08e9a2a37518234096ecb778 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Tue, 26 May 2020 13:46:50 +0000 Subject: [PATCH 21/35] [TD-90]tagschema develop --- src/common/src/tdataformat.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index 38d82f628b..5359d98535 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -162,10 +162,10 @@ int tdDeleteTagCol(SDataRow row, int16_t colId){ // delete tag value and updat return 0; }; -static int compTagVal(const void *key1, const void *key2) { - if (*(int16_t *)key1 > *(int16_t *)key2) { +static int compTagId(const void *key1, const void *key2) { + if (((STagCol *)key1)->colId > ((STagCol *)key2)->colId) { return 1; - } else if (*(int16_t *)key1 == *(int16_t *)key2) { + } else if (((STagCol *)key1)->colId == ((STagCol *)key2)->colId) { return 0; } else { return -1; @@ -178,8 +178,9 @@ void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) { //if find t STagCol *pBase = ((STagRow *)row)->tagCols; int16_t nCols = ((STagRow *)row)->ncols; + STagCol key = {colId,0,0}; - STagCol * stCol = taosbsearch(&colId, pBase, nCols, sizeof(STagCol), compTagVal, TD_EQ); + STagCol * stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, TD_EQ); if (NULL == stCol) { return NULL; } @@ -270,7 +271,7 @@ SDataRow tdTagRowDecode(SDataRow row) { free(trow); return NULL; } - char * pData = (char *)row + dataRowLen(row) + sizeof(int32_t); + char * pData = (char *)row + dataRowLen(row); memcpy(trow->pData, pData, trow->dataLen); return trow; } From 1dc32106052ca9228895de39db9c1965accc7103 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Tue, 26 May 2020 15:14:50 +0000 Subject: [PATCH 22/35] TD-423 --- src/tsdb/src/tsdbMain.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index 55342ffd38..27473e805c 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -936,7 +936,7 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables) for (int tid = 1; tid < maxTables; tid++) { STable *pTable = pMeta->tables[tid]; - if (pTable == NULL || pTable->imem == NULL) continue; + if (pTable == NULL || pTable->imem == NULL || pTable->imem->numOfRows == 0) continue; iters[tid] = tSkipListCreateIter(pTable->imem->pData); if (iters[tid] == NULL) goto _err; @@ -968,12 +968,12 @@ static void *tsdbCommitData(void *arg) { SRWHelper whelper = {{0}}; if (pCache->imem == NULL) return NULL; - tsdbPrint("vgId: %d, starting to commit....", pRepo->config.tsdbId); + tsdbPrint("vgId:%d, starting to commit....", pRepo->config.tsdbId); // Create the iterator to read from cache SSkipListIterator **iters = tsdbCreateTableIters(pMeta, pCfg->maxTables); if (iters == NULL) { - // TODO: deal with the error + ASSERT(0); return NULL; } @@ -1015,6 +1015,7 @@ _exit: } } tsdbUnLockRepo(arg); + tsdbPrint("vgId:%d, commit over....", pRepo->config.tsdbId); return NULL; } From 36daff8edca00c168c7867d67dc271ee77fc05f2 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Wed, 27 May 2020 02:47:00 +0000 Subject: [PATCH 23/35] [TD-90] tagschema develop --- src/common/src/tdataformat.c | 4 ---- src/tsdb/src/tsdbRead.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index 5359d98535..6a567c6e6c 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -173,13 +173,10 @@ static int compTagId(const void *key1, const void *key2) { } void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) { //if find tag, 0, else return -1; - //todo ASSERT(((STagRow *)row)->pData != NULL); - STagCol *pBase = ((STagRow *)row)->tagCols; int16_t nCols = ((STagRow *)row)->ncols; STagCol key = {colId,0,0}; - STagCol * stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, TD_EQ); if (NULL == stCol) { return NULL; @@ -196,7 +193,6 @@ int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int //ASSERT(bytes-2 == varDataTLen(value)); ASSERT(row != NULL); STagRow *pTagrow = row; - pTagrow->tagCols[pTagrow->ncols].colId = colId; pTagrow->tagCols[pTagrow->ncols].colType = type; pTagrow->tagCols[pTagrow->ncols].offset = pTagrow->dataLen; diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 720479130b..2220ebfd88 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -1847,10 +1847,10 @@ bool indexedNodeFilterFp(const void* pNode, void* param) { int16_t type; // int32_t offset = pTSchema->columns[pInfo->colIndex].offset; // val = tdGetRowDataOfCol(elem->pTable->tagVal, pInfo->sch.type, TD_DATA_ROW_HEAD_SIZE + offset); - val = tdQueryTagByID(elem->pTable->tagVal, pInfo->colIndex, &type); + val = tdQueryTagByID(elem->pTable->tagVal, pInfo->sch.colId, &type); // ASSERT(pInfo->sch.type == type); } - + //todo :the val is possible to be null, so check it out carefully int32_t ret = 0; if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) { if (pInfo->optr == TSDB_RELATION_IN) { From a46e41f0e51568931d42ab22d5e14caee2e56845 Mon Sep 17 00:00:00 2001 From: Jeff Tao Date: Wed, 27 May 2020 02:48:00 +0000 Subject: [PATCH 24/35] security flag shall be reset if a newlink from client --- src/rpc/src/rpcMain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c index a8bb2fd65b..297ff31ed9 100644 --- a/src/rpc/src/rpcMain.c +++ b/src/rpc/src/rpcMain.c @@ -594,7 +594,10 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) { // check if it is already allocated SRpcConn **ppConn = (SRpcConn **)(taosHashGet(pRpc->hash, hashstr, size)); if (ppConn) pConn = *ppConn; - if (pConn) return pConn; + if (pConn) { + pConn->secured = 0; + return pConn; + } int sid = taosAllocateId(pRpc->idPool); if (sid <= 0) { From 5270b1e331ec924c9fa5548a898c8a85dae4a6d3 Mon Sep 17 00:00:00 2001 From: Bomin Zhang Date: Wed, 27 May 2020 10:51:46 +0800 Subject: [PATCH 25/35] define error in hex --- src/inc/taoserror.h | 223 ++++++++++++++++++++++---------------------- 1 file changed, 111 insertions(+), 112 deletions(-) diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h index ae30efd93e..ca520ff803 100644 --- a/src/inc/taoserror.h +++ b/src/inc/taoserror.h @@ -46,145 +46,144 @@ static STaosError errors[] = { #endif // rpc -TAOS_DEFINE_ERROR(TSDB_CODE_ACTION_IN_PROGRESS, 0, 1, "action in progress") -TAOS_DEFINE_ERROR(TSDB_CODE_ACTION_NEED_REPROCESSED, 0, 3, "action need to be reprocessed") -TAOS_DEFINE_ERROR(TSDB_CODE_MSG_NOT_PROCESSED, 0, 4, "message not processed") -TAOS_DEFINE_ERROR(TSDB_CODE_ALREADY_PROCESSED, 0, 5, "message already processed") -TAOS_DEFINE_ERROR(TSDB_CODE_REDIRECT, 0, 6, "redirect") -TAOS_DEFINE_ERROR(TSDB_CODE_LAST_SESSION_NOT_FINISHED, 0, 7, "last session not finished") -TAOS_DEFINE_ERROR(TSDB_CODE_MAX_SESSIONS, 0, 8, "max sessions") // too many sessions -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_SESSION_ID, 0, 9, "invalid session id") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TRAN_ID, 0, 10, "invalid transaction id") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_TYPE, 0, 11, "invalid message type") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_LEN, 0, 12, "invalid message length") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_CONTENT, 0, 13, "invalid message content") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_VERSION, 0, 14, "invalid message version") -TAOS_DEFINE_ERROR(TSDB_CODE_UNEXPECTED_RESPONSE, 0, 15, "unexpected response") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_RESPONSE_TYPE, 0, 16, "invalid response type") -TAOS_DEFINE_ERROR(TSDB_CODE_MISMATCHED_METER_ID, 0, 17, "mismatched meter id") -TAOS_DEFINE_ERROR(TSDB_CODE_DISCONNECTED, 0, 18, "disconnected") -TAOS_DEFINE_ERROR(TSDB_CODE_NOT_READY, 0, 19, "not ready") // peer is not ready to process data -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_SLOW, 0, 20, "too slow") -TAOS_DEFINE_ERROR(TSDB_CODE_OTHERS, 0, 21, "others") -TAOS_DEFINE_ERROR(TSDB_CODE_APP_ERROR, 0, 22, "app error") -TAOS_DEFINE_ERROR(TSDB_CODE_ALREADY_THERE, 0, 23, "already there") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_RESOURCE, 0, 14, "no resource") -TAOS_DEFINE_ERROR(TSDB_CODE_OPS_NOT_SUPPORT, 0, 25, "operations not support") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_OPTION, 0, 26, "invalid option") -TAOS_DEFINE_ERROR(TSDB_CODE_NOT_CONFIGURED, 0, 27, "not configured") -TAOS_DEFINE_ERROR(TSDB_CODE_NODE_OFFLINE, 0, 28, "node offline") -TAOS_DEFINE_ERROR(TSDB_CODE_NETWORK_UNAVAIL, 0, 29, "network unavailable") -TAOS_DEFINE_ERROR(TSDB_CODE_AUTH_REQUIRED, 0, 30, "auth required") +TAOS_DEFINE_ERROR(TSDB_CODE_ACTION_IN_PROGRESS, 0, 0x0001, "action in progress") +TAOS_DEFINE_ERROR(TSDB_CODE_ACTION_NEED_REPROCESSED, 0, 0x0003, "action need to be reprocessed") +TAOS_DEFINE_ERROR(TSDB_CODE_MSG_NOT_PROCESSED, 0, 0x0004, "message not processed") +TAOS_DEFINE_ERROR(TSDB_CODE_ALREADY_PROCESSED, 0, 0x0005, "message already processed") +TAOS_DEFINE_ERROR(TSDB_CODE_REDIRECT, 0, 0x0006, "redirect") +TAOS_DEFINE_ERROR(TSDB_CODE_LAST_SESSION_NOT_FINISHED, 0, 0x0007, "last session not finished") +TAOS_DEFINE_ERROR(TSDB_CODE_MAX_SESSIONS, 0, 0x0008, "max sessions") // too many sessions +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_SESSION_ID, 0, 0x0009, "invalid session id") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TRAN_ID, 0, 0x000A, "invalid transaction id") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_TYPE, 0, 0x000B, "invalid message type") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_LEN, 0, 0x000C, "invalid message length") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_CONTENT, 0, 0x000D, "invalid message content") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_MSG_VERSION, 0, 0x000E, "invalid message version") +TAOS_DEFINE_ERROR(TSDB_CODE_UNEXPECTED_RESPONSE, 0, 0x000F, "unexpected response") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_RESPONSE_TYPE, 0, 0x0010, "invalid response type") +TAOS_DEFINE_ERROR(TSDB_CODE_MISMATCHED_METER_ID, 0, 0x0011, "mismatched meter id") +TAOS_DEFINE_ERROR(TSDB_CODE_DISCONNECTED, 0, 0x0012, "disconnected") +TAOS_DEFINE_ERROR(TSDB_CODE_NOT_READY, 0, 0x0013, "not ready") // peer is not ready to process data +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_SLOW, 0, 0x0014, "too slow") +TAOS_DEFINE_ERROR(TSDB_CODE_OTHERS, 0, 0x0015, "others") +TAOS_DEFINE_ERROR(TSDB_CODE_APP_ERROR, 0, 0x0016, "app error") +TAOS_DEFINE_ERROR(TSDB_CODE_ALREADY_THERE, 0, 0x0017, "already there") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_RESOURCE, 0, 0x0018, "no resource") +TAOS_DEFINE_ERROR(TSDB_CODE_OPS_NOT_SUPPORT, 0, 0x0019, "operations not support") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_OPTION, 0, 0x001A, "invalid option") +TAOS_DEFINE_ERROR(TSDB_CODE_NOT_CONFIGURED, 0, 0x001B, "not configured") +TAOS_DEFINE_ERROR(TSDB_CODE_NODE_OFFLINE, 0, 0x001C, "node offline") +TAOS_DEFINE_ERROR(TSDB_CODE_NETWORK_UNAVAIL, 0, 0x001D, "network unavailable") +TAOS_DEFINE_ERROR(TSDB_CODE_AUTH_REQUIRED, 0, 0x001E, "auth required") // db -TAOS_DEFINE_ERROR(TSDB_CODE_DB_NOT_SELECTED, 0, 100, "db not selected") -TAOS_DEFINE_ERROR(TSDB_CODE_DB_ALREADY_EXIST, 0, 101, "database aleady exist") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_DB, 0, 102, "invalid database") -TAOS_DEFINE_ERROR(TSDB_CODE_MONITOR_DB_FORBIDDEN, 0, 103, "monitor db forbidden") +TAOS_DEFINE_ERROR(TSDB_CODE_DB_NOT_SELECTED, 0, 0x0100, "db not selected") +TAOS_DEFINE_ERROR(TSDB_CODE_DB_ALREADY_EXIST, 0, 0x0101, "database aleady exist") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_DB, 0, 0x0102, "invalid database") +TAOS_DEFINE_ERROR(TSDB_CODE_MONITOR_DB_FORBIDDEN, 0, 0x0103, "monitor db forbidden") // user -TAOS_DEFINE_ERROR(TSDB_CODE_USER_ALREADY_EXIST, 0, 150, "user already exist") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER, 0, 151, "invalid user") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS, 0, 152, "invalid password") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER_FORMAT, 0, 153, "invalid user format") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS_FORMAT, 0, 154, "invalid password format") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_USER_FROM_CONN, 0, 155, "can not get user from conn") +TAOS_DEFINE_ERROR(TSDB_CODE_USER_ALREADY_EXIST, 0, 0x0180, "user already exist") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER, 0, 0x0181, "invalid user") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS, 0, 0x0182, "invalid password") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER_FORMAT, 0, 0x0183, "invalid user format") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS_FORMAT, 0, 0x0184, "invalid password format") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_USER_FROM_CONN, 0, 0x0185, "can not get user from conn") // table -TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ALREADY_EXIST, 0, 200, "table already exist") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_ID, 0, 201, "invalid table id") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_TYPE, 0, 202, "invalid table typee") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE, 0, 203, "invalid table name") -TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUPER_TABLE, 0, 204, "no super table") // operation only available for super table -TAOS_DEFINE_ERROR(TSDB_CODE_NOT_ACTIVE_TABLE, 0, 205, "not active table") -TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ID_MISMATCH, 0, 206, "table id mismatch") -TAOS_DEFINE_ERROR(TSDB_CODE_TAG_ALREAY_EXIST, 0, 207, "tag already exist") -TAOS_DEFINE_ERROR(TSDB_CODE_TAG_NOT_EXIST, 0, 208, "tag not exist") -TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_ALREAY_EXIST, 0, 209, "field already exist") -TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_NOT_EXIST, 0, 210, "field not exist") -TAOS_DEFINE_ERROR(TSDB_CODE_COL_NAME_TOO_LONG, 0, 211, "column name too long") -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TAGS, 0, 211, "too many tags") +TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ALREADY_EXIST, 0, 0x0200, "table already exist") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_ID, 0, 0x0201, "invalid table id") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_TYPE, 0, 0x0202, "invalid table typee") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE, 0, 0x0203, "invalid table name") +TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUPER_TABLE, 0, 0x0204, "no super table") // operation only available for super table +TAOS_DEFINE_ERROR(TSDB_CODE_NOT_ACTIVE_TABLE, 0, 0x0205, "not active table") +TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ID_MISMATCH, 0, 0x0206, "table id mismatch") +TAOS_DEFINE_ERROR(TSDB_CODE_TAG_ALREAY_EXIST, 0, 0x0207, "tag already exist") +TAOS_DEFINE_ERROR(TSDB_CODE_TAG_NOT_EXIST, 0, 0x0208, "tag not exist") +TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_ALREAY_EXIST, 0, 0x0209, "field already exist") +TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_NOT_EXIST, 0, 0x020A, "field not exist") +TAOS_DEFINE_ERROR(TSDB_CODE_COL_NAME_TOO_LONG, 0, 0x020B, "column name too long") +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TAGS, 0, 0x020C, "too many tags") // dnode & mnode -TAOS_DEFINE_ERROR(TSDB_CODE_NO_ENOUGH_DNODES, 0, 250, "no enough dnodes") -TAOS_DEFINE_ERROR(TSDB_CODE_DNODE_ALREADY_EXIST, 0, 251, "dnode already exist") -TAOS_DEFINE_ERROR(TSDB_CODE_DNODE_NOT_EXIST, 0, 252, "dnode not exist") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_MASTER, 0, 253, "no master") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_REMOVE_MASTER, 0, 254, "no remove master") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_QUERY_ID, 0, 255, "invalid query id") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_STREAM_ID, 0, 256, "invalid stream id") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CONNECTION, 0, 257, "invalid connection") -TAOS_DEFINE_ERROR(TSDB_CODE_SDB_ERROR, 0, 258, "sdb error") -TAOS_DEFINE_ERROR(TSDB_CODE_TIMESTAMP_OUT_OF_RANGE, 0, 259, "timestamp is out of range") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_ENOUGH_DNODES, 0, 0x0280, "no enough dnodes") +TAOS_DEFINE_ERROR(TSDB_CODE_DNODE_ALREADY_EXIST, 0, 0x0281, "dnode already exist") +TAOS_DEFINE_ERROR(TSDB_CODE_DNODE_NOT_EXIST, 0, 0x0282, "dnode not exist") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_MASTER, 0, 0x0283, "no master") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_REMOVE_MASTER, 0, 0x0284, "no remove master") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_QUERY_ID, 0, 0x0285, "invalid query id") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_STREAM_ID, 0, 0x0286, "invalid stream id") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CONNECTION, 0, 0x0287, "invalid connection") +TAOS_DEFINE_ERROR(TSDB_CODE_SDB_ERROR, 0, 0x0288, "sdb error") +TAOS_DEFINE_ERROR(TSDB_CODE_TIMESTAMP_OUT_OF_RANGE, 0, 0x0289, "timestamp is out of range") // acct -TAOS_DEFINE_ERROR(TSDB_CODE_ACCT_ALREADY_EXIST, 0, 300, "accounts already exist") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_ACCT, 0, 301, "invalid account") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_ACCT_PARAMETER, 0, 302, "invalid account parameter") -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_ACCTS, 0, 303, "too many accounts") -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_USERS, 0, 304, "too many users") -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TABLES, 0, 305, "too many tables") -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_DATABASES, 0, 306, "too many databases") -TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TIME_SERIES, 0, 307, "not enough time series") +TAOS_DEFINE_ERROR(TSDB_CODE_ACCT_ALREADY_EXIST, 0, 0x0300, "accounts already exist") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_ACCT, 0, 0x0301, "invalid account") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_ACCT_PARAMETER, 0, 0x0302, "invalid account parameter") +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_ACCTS, 0, 0x0303, "too many accounts") +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_USERS, 0, 0x0304, "too many users") +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TABLES, 0, 0x0305, "too many tables") +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_DATABASES, 0, 0x0306, "too many databases") +TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TIME_SERIES, 0, 0x0307, "not enough time series") // grant -TAOS_DEFINE_ERROR(TSDB_CODE_AUTH_FAILURE, 0, 350, "auth failure") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_RIGHTS, 0, 351, "no rights") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_WRITE_ACCESS, 0, 352, "no write access") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_READ_ACCESS, 0, 353, "no read access") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED, 0, 354, "grant expired") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DNODE_LIMITED, 0, 355, "grant dnode limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_ACCT_LIMITED, 0, 356, "grant account limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_TIMESERIES_LIMITED, 0, 357, "grant timeseries limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DB_LIMITED, 0, 358, "grant db limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_USER_LIMITED, 0, 359, "grant user limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CONN_LIMITED, 0, 360, "grant conn limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STREAM_LIMITED, 0, 361, "grant stream limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_SPEED_LIMITED, 0, 362, "grant speed limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STORAGE_LIMITED, 0, 363, "grant storage limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_QUERYTIME_LIMITED, 0, 364, "grant query time limited") -TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CPU_LIMITED, 0, 365, "grant cpu limited") +TAOS_DEFINE_ERROR(TSDB_CODE_AUTH_FAILURE, 0, 0x0380, "auth failure") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_RIGHTS, 0, 0x0381, "no rights") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_WRITE_ACCESS, 0, 0x0382, "no write access") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_READ_ACCESS, 0, 0x0383, "no read access") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED, 0, 0x0384, "grant expired") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DNODE_LIMITED, 0, 0x0385, "grant dnode limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_ACCT_LIMITED, 0, 0x0386, "grant account limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_TIMESERIES_LIMITED, 0, 0x0387, "grant timeseries limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DB_LIMITED, 0, 0x0388, "grant db limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_USER_LIMITED, 0, 0x0389, "grant user limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CONN_LIMITED, 0, 0x038A, "grant conn limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STREAM_LIMITED, 0, 0x038B, "grant stream limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_SPEED_LIMITED, 0, 0x038C, "grant speed limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STORAGE_LIMITED, 0, 0x038D, "grant storage limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_QUERYTIME_LIMITED, 0, 0x038E, "grant query time limited") +TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CPU_LIMITED, 0, 0x038F, "grant cpu limited") // server -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VGROUP_ID, 0, 400, "invalid vgroup id") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VNODE_ID, 0, 401, "invalid vnode id") -TAOS_DEFINE_ERROR(TSDB_CODE_NOT_ACTIVE_VNODE, 0, 402, "not active vnode") -TAOS_DEFINE_ERROR(TSDB_CODE_VG_INIT_FAILED, 0, 403, "vg init failed") -TAOS_DEFINE_ERROR(TSDB_CODE_SERV_NO_DISKSPACE, 0, 404, "server no diskspace") -TAOS_DEFINE_ERROR(TSDB_CODE_SERV_OUT_OF_MEMORY, 0, 405, "server out of memory") -TAOS_DEFINE_ERROR(TSDB_CODE_NO_DISK_PERMISSIONS, 0, 406, "no disk permissions") -TAOS_DEFINE_ERROR(TSDB_CODE_FILE_CORRUPTED, 0, 407, "file corrupted") -TAOS_DEFINE_ERROR(TSDB_CODE_MEMORY_CORRUPTED, 0, 408, "memory corrupted") -TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUCH_FILE_OR_DIR, 0, 409, "no such file or directory") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VGROUP_ID, 0, 0x0400, "invalid vgroup id") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VNODE_ID, 0, 0x0401, "invalid vnode id") +TAOS_DEFINE_ERROR(TSDB_CODE_NOT_ACTIVE_VNODE, 0, 0x0402, "not active vnode") +TAOS_DEFINE_ERROR(TSDB_CODE_VG_INIT_FAILED, 0, 0x0403, "vg init failed") +TAOS_DEFINE_ERROR(TSDB_CODE_SERV_NO_DISKSPACE, 0, 0x0404, "server no diskspace") +TAOS_DEFINE_ERROR(TSDB_CODE_SERV_OUT_OF_MEMORY, 0, 0x0405, "server out of memory") +TAOS_DEFINE_ERROR(TSDB_CODE_NO_DISK_PERMISSIONS, 0, 0x0406, "no disk permissions") +TAOS_DEFINE_ERROR(TSDB_CODE_FILE_CORRUPTED, 0, 0x0407, "file corrupted") +TAOS_DEFINE_ERROR(TSDB_CODE_MEMORY_CORRUPTED, 0, 0x0408, "memory corrupted") +TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUCH_FILE_OR_DIR, 0, 0x0409, "no such file or directory") // client -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CLIENT_VERSION, 0, 451, "invalid client version") -TAOS_DEFINE_ERROR(TSDB_CODE_CLI_OUT_OF_MEMORY, 0, 452, "client out of memory") -TAOS_DEFINE_ERROR(TSDB_CODE_CLI_NO_DISKSPACE, 0, 453, "client no disk space") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TIME_STAMP, 0, 454, "invalid timestamp") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_SQL, 0, 455, "invalid sql") -TAOS_DEFINE_ERROR(TSDB_CODE_QUERY_CACHE_ERASED, 0, 456, "query cache erased") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_QUERY_MSG, 0, 457, "invalid query message") // failed to validate the sql expression msg by vnode -TAOS_DEFINE_ERROR(TSDB_CODE_SORTED_RES_TOO_MANY, 0, 458, "sorted res too many") // too many result for ordered super table projection query -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_QHANDLE, 0, 459, "invalid handle") -TAOS_DEFINE_ERROR(TSDB_CODE_QUERY_CANCELLED, 0, 460, "query cancelled") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_IE, 0, 461, "invalid ie") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VALUE, 0, 462, "invalid value") -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_FQDN, 0, 463, "invalid FQDN") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CLIENT_VERSION, 0, 0x0481, "invalid client version") +TAOS_DEFINE_ERROR(TSDB_CODE_CLI_OUT_OF_MEMORY, 0, 0x0482, "client out of memory") +TAOS_DEFINE_ERROR(TSDB_CODE_CLI_NO_DISKSPACE, 0, 0x0483, "client no disk space") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TIME_STAMP, 0, 0x0484, "invalid timestamp") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_SQL, 0, 0x0485, "invalid sql") +TAOS_DEFINE_ERROR(TSDB_CODE_QUERY_CACHE_ERASED, 0, 0x0486, "query cache erased") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_QUERY_MSG, 0, 0x0487, "invalid query message") // failed to validate the sql expression msg by vnode +TAOS_DEFINE_ERROR(TSDB_CODE_SORTED_RES_TOO_MANY, 0, 0x0488, "sorted res too many") // too many result for ordered super table projection query +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_QHANDLE, 0, 0x0489, "invalid handle") +TAOS_DEFINE_ERROR(TSDB_CODE_QUERY_CANCELLED, 0, 0x048A, "query cancelled") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_IE, 0, 0x048B, "invalid ie") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VALUE, 0, 0x048C, "invalid value") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_FQDN, 0, 0x048D, "invalid FQDN") // others -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_FILE_FORMAT, 0, 500, "invalid file format") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_FILE_FORMAT, 0, 0x0500, "invalid file format") // TSDB -TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CONFIG, 0, 550, "invalid TSDB configuration") +TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CONFIG, 0, 0x0580, "invalid TSDB configuration") #ifdef TAOS_ERROR_C }; #endif -#define TSDB_CODE_MAX_ERROR_CODE 120 #ifdef __cplusplus } From 9c11c959d519b3471e568bbfd2d15dd3ef282aea Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 27 May 2020 03:28:12 +0000 Subject: [PATCH 26/35] fix option uint print --- src/common/src/tglobal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 763b3f5c22..b5252502a3 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -607,7 +607,7 @@ static void doInitGlobalConfig() { cfg.minValue = TSDB_MIN_CACHE_BLOCK_SIZE; cfg.maxValue = TSDB_MAX_CACHE_BLOCK_SIZE; cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_BYTE; + cfg.unitType = TAOS_CFG_UTYPE_Mb; taosInitConfigOption(cfg); cfg.option = "blocks"; @@ -617,7 +617,7 @@ static void doInitGlobalConfig() { cfg.minValue = TSDB_MIN_TOTAL_BLOCKS; cfg.maxValue = TSDB_MAX_TOTAL_BLOCKS; cfg.ptrLength = 0; - cfg.unitType = TAOS_CFG_UTYPE_BYTE; + cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); cfg.option = "days"; From c27edd47b7f9aad15c4224d40c1005b8779b583e Mon Sep 17 00:00:00 2001 From: Bomin Zhang Date: Wed, 27 May 2020 10:22:32 +0800 Subject: [PATCH 27/35] update connector document --- documentation/webdocs/markdowndocs/Connector.md | 2 ++ documentation/webdocs/markdowndocs/connector-ch.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/documentation/webdocs/markdowndocs/Connector.md b/documentation/webdocs/markdowndocs/Connector.md index a0433d1f09..563d306128 100644 --- a/documentation/webdocs/markdowndocs/Connector.md +++ b/documentation/webdocs/markdowndocs/Connector.md @@ -2,6 +2,8 @@ TDengine provides many connectors for development, including C/C++, JAVA, Python, RESTful, Go, Node.JS, etc. +NOTE: All APIs which require a SQL string as parameter, including but not limit to `taos_query`, `taos_query_a`, `taos_subscribe` in the C/C++ Connector and their counterparts in other connectors, can ONLY process one SQL statement at a time. If more than one SQL statements are provided, their behaviors are undefined. + ## C/C++ API C/C++ APIs are similar to the MySQL APIs. Applications should include TDengine head file _taos.h_ to use C/C++ APIs by adding the following line in code: diff --git a/documentation/webdocs/markdowndocs/connector-ch.md b/documentation/webdocs/markdowndocs/connector-ch.md index b5d8fb5afb..47c8381f69 100644 --- a/documentation/webdocs/markdowndocs/connector-ch.md +++ b/documentation/webdocs/markdowndocs/connector-ch.md @@ -2,6 +2,8 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、JAVA、Python、RESTful、Go等，便于用户快速开发应用。 +注意：所以执行 SQL 语句的 API，例如 C/C++ Connector 中的 `tao_query`、`taos_query_a`、`taos_subscribe` 等，以及其它语言中与它们对应的API，每次都只能执行一条 SQL 语句，如果实际参数中包含了多条语句，它们的行为是未定义的。 + ## C/C++ Connector C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine头文件 _taos.h_（安装后，位于 _/usr/local/taos/include_）： From 89da3e1479974f3fc72f0d586c2e8db2adf26e49 Mon Sep 17 00:00:00 2001 From: freemine Date: Wed, 27 May 2020 11:53:57 +0800 Subject: [PATCH 28/35] bugfix: alloc space for holding null-terminator --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 47ad633e34..72d018d315 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5298,7 +5298,7 @@ static int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SArray **pTableIdList, if (pColFilter->filterstr) { pColFilter->len = htobe64(pFilterMsg->len); - pColFilter->pz = (int64_t) calloc(1, pColFilter->len); + pColFilter->pz = (int64_t) calloc(1, pColFilter->len + 1 * TSDB_NCHAR_SIZE); // note: null-terminator memcpy((void *)pColFilter->pz, pMsg, pColFilter->len); pMsg += (pColFilter->len + 1); } else { From 6390536449ff7d3a42ae5e48a98150a5c19c0693 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Wed, 27 May 2020 04:01:34 +0000 Subject: [PATCH 29/35] [TD-90] add insert and modify tag schema --- src/common/inc/tdataformat.h | 2 +- src/common/src/tdataformat.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h index 497279fb27..528e9b2825 100644 --- a/src/common/inc/tdataformat.h +++ b/src/common/inc/tdataformat.h @@ -259,7 +259,7 @@ typedef struct { #define tagColSize(r) (sizeof(STagCol) + r.colLen) -int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId); //insert tag value and update all the information +int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId); //insert tag value and update all the information int tdDeleteTagCol(SDataRow row, int16_t colId); // delete tag value and update all the information void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type); //if find tag, 0, else return -1; int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId); diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index 6a567c6e6c..8c6e26d5e1 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -152,8 +152,10 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) { return row; } -int tdInsertTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId){ //insert tag value and update all the information - //todo +int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId){ //insert/update tag value and update all the information + ASSERT(((STagRow *)row)->pData != NULL); + //STagCol * stCol = tdQueryTagColByID() + return 0; }; @@ -172,7 +174,22 @@ static int compTagId(const void *key1, const void *key2) { } } -void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) { //if find tag, 0, else return -1; +/** + * Find tag structure by colId, if find, return tag structure, else return NULL; + */ +STagCol * tdQueryTagColByID(SDataRow row, int16_t colId, int flags) { //if find tag, 0, else return -1; + ASSERT(((STagRow *)row)->pData != NULL); + STagCol *pBase = ((STagRow *)row)->tagCols; + int16_t nCols = ((STagRow *)row)->ncols; + STagCol key = {colId,0,0}; + STagCol * stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, flags); + return stCol; +}; + +/** +* Find tag value by colId, if find, return tag value, else return NULL; +*/ +void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) { ASSERT(((STagRow *)row)->pData != NULL); STagCol *pBase = ((STagRow *)row)->tagCols; int16_t nCols = ((STagRow *)row)->ncols; From 056b24c724690bd4b1a50bf8aaf83aa108f98d65 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Wed, 27 May 2020 09:06:13 +0000 Subject: [PATCH 30/35] [TD-90] fix invalid read --- src/common/src/tdataformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c index 8c6e26d5e1..922c8bdea0 100644 --- a/src/common/src/tdataformat.c +++ b/src/common/src/tdataformat.c @@ -237,7 +237,7 @@ void * tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags) { STagRow *row = malloc(size); if (row == NULL) return NULL; - int32_t datasize = pSchema->tlen - pSchema->flen; + int32_t datasize = pSchema->tlen; row->pData = malloc(datasize); if (NULL == row->pData) { free(row); From 83c75d875ef9b198f8ed62c3b1afe58da3744241 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 27 May 2020 09:11:28 +0000 Subject: [PATCH 31/35] TD-354 --- src/inc/tsdb.h | 2 + src/tsdb/inc/tsdbMain.h | 5 +- src/tsdb/src/tsdbMain.c | 17 +++- src/tsdb/src/tsdbMeta.c | 183 ++++++++++++++++++++----------------- src/util/inc/tcoding.h | 22 +++++ src/vnode/src/vnodeWrite.c | 6 ++ 6 files changed, 146 insertions(+), 89 deletions(-) diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index bee68b81f5..341dee1476 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -92,6 +92,7 @@ typedef struct { STSchema * schema; STSchema * tagSchema; SDataRow tagValues; + char * sql; } STableCfg; int tsdbInitTableCfg(STableCfg *config, ETableType type, uint64_t uid, int32_t tid); @@ -101,6 +102,7 @@ int tsdbTableSetTagSchema(STableCfg *config, STSchema *pSchema, bool dup); int tsdbTableSetTagValue(STableCfg *config, SDataRow row, bool dup); int tsdbTableSetName(STableCfg *config, char *name, bool dup); int tsdbTableSetSName(STableCfg *config, char *sname, bool dup); +int tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup); void tsdbClearTableCfg(STableCfg *config); int32_t tsdbGetTableTagVal(TsdbRepoT *repo, STableId* id, int32_t colId, int16_t *type, int16_t *bytes, char **val); diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index 63d3eb349b..0839e0f8ff 100644 --- a/src/tsdb/inc/tsdbMain.h +++ b/src/tsdb/inc/tsdbMain.h @@ -85,12 +85,13 @@ typedef struct STable { TSKEY lastKey; // lastkey inserted in this table, initialized as 0, TODO: make a structure struct STable *next; // TODO: remove the next struct STable *prev; - tstr * name; // NOTE: there a flexible string here + tstr * name; // NOTE: there a flexible string here + char * sql; } STable; #define TSDB_GET_TABLE_LAST_KEY(tb) ((tb)->lastKey) -void * tsdbEncodeTable(STable *pTable, int *contLen); +void tsdbEncodeTable(STable *pTable, char *buf, int *contLen); STable *tsdbDecodeTable(void *cont, int contLen); void tsdbFreeEncode(void *cont); diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index 27473e805c..bddb3fcaff 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -446,7 +446,7 @@ int32_t tsdbInsertData(TsdbRepoT *repo, SSubmitMsg *pMsg, SShellSubmitRspMsg * p */ int tsdbInitTableCfg(STableCfg *config, ETableType type, uint64_t uid, int32_t tid) { if (config == NULL) return -1; - if (type != TSDB_NORMAL_TABLE && type != TSDB_CHILD_TABLE) return -1; + if (type != TSDB_CHILD_TABLE && type != TSDB_NORMAL_TABLE && type != TSDB_STREAM_TABLE) return -1; memset((void *)config, 0, sizeof(STableCfg)); @@ -455,6 +455,7 @@ int tsdbInitTableCfg(STableCfg *config, ETableType type, uint64_t uid, int32_t t config->tableId.uid = uid; config->tableId.tid = tid; config->name = NULL; + config->sql = NULL; return 0; } @@ -540,12 +541,26 @@ int tsdbTableSetSName(STableCfg *config, char *sname, bool dup) { return 0; } +int tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup) { + if (config->type != TSDB_STREAM_TABLE) return -1; + + if (dup) { + config->sql = strdup(sql); + if (config->sql == NULL) return -1; + } else { + config->sql = sql; + } + + return 0; +} + void tsdbClearTableCfg(STableCfg *config) { if (config->schema) tdFreeSchema(config->schema); if (config->tagSchema) tdFreeSchema(config->tagSchema); if (config->tagValues) tdFreeDataRow(config->tagValues); tfree(config->name); tfree(config->sname); + tfree(config->sql); } int tsdbInitSubmitBlkIter(SSubmitBlk *pBlock, SSubmitBlkIter *pIter) { diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 95680f95c4..427e15de37 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -15,7 +15,6 @@ static int32_t tsdbCheckTableCfg(STableCfg *pCfg); static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx); static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable); static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable); -static int tsdbEstimateTableEncodeSize(STable *pTable); static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable, bool rmFromIdx); /** @@ -28,16 +27,10 @@ static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable, bool rm * @return binary content for success * NULL fro failure */ -void *tsdbEncodeTable(STable *pTable, int *contLen) { - if (pTable == NULL) return NULL; +void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) { + if (pTable == NULL) return; - *contLen = tsdbEstimateTableEncodeSize(pTable); - if (*contLen < 0) return NULL; - - void *ret = calloc(1, *contLen); - if (ret == NULL) return NULL; - - void *ptr = ret; + void *ptr = buf; T_APPEND_MEMBER(ptr, pTable, STable, type); // Encode name, todo refactor *(int *)ptr = varDataLen(pTable->name); @@ -59,7 +52,11 @@ void *tsdbEncodeTable(STable *pTable, int *contLen) { ptr = tdEncodeSchema(ptr, pTable->schema); } - return ret; + if (pTable->type == TSDB_STREAM_TABLE) { + ptr = taosEncodeString(ptr, pTable->sql); + } + + *contLen = (char *)ptr - buf; } /** @@ -97,10 +94,15 @@ STable *tsdbDecodeTable(void *cont, int contLen) { pTable->tagSchema = tdDecodeSchema(&ptr); } else if (pTable->type == TSDB_CHILD_TABLE) { pTable->tagVal = tdDataRowDup(ptr); + ptr = POINTER_SHIFT(ptr, dataRowLen(pTable->tagVal)); } else { pTable->schema = tdDecodeSchema(&ptr); } + if (pTable->type == TSDB_STREAM_TABLE) { + ptr = taosDecodeString(ptr, &(pTable->sql)); + } + return pTable; } @@ -211,7 +213,7 @@ int32_t tsdbFreeMeta(STsdbMeta *pMeta) { } STSchema *tsdbGetTableSchema(STsdbMeta *pMeta, STable *pTable) { - if (pTable->type == TSDB_NORMAL_TABLE || pTable->type == TSDB_SUPER_TABLE) { + if (pTable->type == TSDB_NORMAL_TABLE || pTable->type == TSDB_SUPER_TABLE || pTable->type == TSDB_STREAM_TABLE) { return pTable->schema; } else if (pTable->type == TSDB_CHILD_TABLE) { STable *pSuper = tsdbGetTableByUid(pMeta, pTable->superUid); @@ -283,6 +285,67 @@ char* tsdbGetTableName(TsdbRepoT *repo, const STableId* id, int16_t* bytes) { } } +static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) { + STable *pTable = NULL; + size_t tsize = 0; + + pTable = (STable *)calloc(1, sizeof(STable)); + if (pTable == NULL) { + terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; + goto _err; + } + + pTable->type = pCfg->type; + tsize = strnlen(pCfg->sname, TSDB_TABLE_NAME_LEN); + pTable->name = calloc(1, tsize + VARSTR_HEADER_SIZE + 1); + if (pTable->name == NULL) { + terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; + goto _err; + } + STR_WITH_SIZE_TO_VARSTR(pTable->name, pCfg->sname, tsize); + + if (isSuper) { + pTable->type = TSDB_SUPER_TABLE; + pTable->tableId.uid = pCfg->superUid; + pTable->tableId.tid = -1; + pTable->superUid = TSDB_INVALID_SUPER_TABLE_ID; + pTable->schema = tdDupSchema(pCfg->schema); + pTable->tagSchema = tdDupSchema(pCfg->tagSchema); + + STColumn *pColSchema = schemaColAt(pTable->tagSchema, 0); + pTable->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, pColSchema->type, pColSchema->bytes, 1, 0, 1, + getTagIndexKey); // Allow duplicate key, no lock + if (pTable->pIndex == NULL) { + terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; + goto _err; + } + } else { + pTable->type = pCfg->type; + pTable->tableId.uid = pCfg->tableId.uid; + pTable->tableId.tid = pCfg->tableId.tid; + pTable->lastKey = TSKEY_INITIAL_VAL; + + if (pCfg->type == TSDB_CHILD_TABLE) { + pTable->superUid = pCfg->superUid; + pTable->tagVal = tdDataRowDup(pCfg->tagValues); + } else if (pCfg->type == TSDB_NORMAL_TABLE) { + pTable->superUid = -1; + pTable->schema = tdDupSchema(pCfg->schema); + } else { + ASSERT(pCfg->type == TSDB_STREAM_TABLE); + pTable->superUid = -1; + pTable->schema = tdDupSchema(pCfg->schema); + pTable->sql = strdup(pCfg->sql); + } + } + + return pTable; + +_err: + tsdbFreeTable(pTable); + return NULL; +} + int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) { STsdbRepo *pRepo = (STsdbRepo *)repo; STsdbMeta *pMeta = pRepo->tsdbMeta; @@ -303,61 +366,19 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) { super = tsdbGetTableByUid(pMeta, pCfg->superUid); if (super == NULL) { // super table not exists, try to create it newSuper = 1; - // TODO: use function to implement create table object - super = (STable *)calloc(1, sizeof(STable)); + super = tsdbNewTable(pCfg, true); if (super == NULL) return -1; - - super->type = TSDB_SUPER_TABLE; - super->tableId.uid = pCfg->superUid; - super->tableId.tid = -1; - super->superUid = TSDB_INVALID_SUPER_TABLE_ID; - super->schema = tdDupSchema(pCfg->schema); - super->tagSchema = tdDupSchema(pCfg->tagSchema); - super->tagVal = NULL; - - // todo refactor extract method - size_t size = strnlen(pCfg->sname, TSDB_TABLE_NAME_LEN); - super->name = calloc(1, size + VARSTR_HEADER_SIZE + 1); - STR_WITH_SIZE_TO_VARSTR(super->name, pCfg->sname, size); - - // index the first tag column - STColumn* pColSchema = schemaColAt(super->tagSchema, 0); - super->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, pColSchema->type, pColSchema->bytes, - 1, 0, 1, getTagIndexKey); // Allow duplicate key, no lock - - if (super->pIndex == NULL) { - tdFreeSchema(super->schema); - tdFreeSchema(super->tagSchema); - tdFreeDataRow(super->tagVal); - free(super); - return -1; - } } else { if (super->type != TSDB_SUPER_TABLE) return -1; } } - STable *table = (STable *)calloc(1, sizeof(STable)); + STable *table = tsdbNewTable(pCfg, false); if (table == NULL) { - if (newSuper) tsdbFreeTable(super); - return -1; - } - - table->tableId = pCfg->tableId; - - size_t size = strnlen(pCfg->name, TSDB_TABLE_NAME_LEN); - table->name = calloc(1, size + VARSTR_HEADER_SIZE + 1); - STR_WITH_SIZE_TO_VARSTR(table->name, pCfg->name, size); - - table->lastKey = 0; - if (IS_CREATE_STABLE(pCfg)) { // TSDB_CHILD_TABLE - table->type = TSDB_CHILD_TABLE; - table->superUid = pCfg->superUid; - table->tagVal = tdDataRowDup(pCfg->tagValues); - } else { // TSDB_NORMAL_TABLE - table->type = TSDB_NORMAL_TABLE; - table->superUid = -1; - table->schema = tdDupSchema(pCfg->schema); + if (newSuper) { + tsdbFreeTable(super); + return -1; + } } // Register to meta @@ -372,15 +393,15 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) { // Write to meta file int bufLen = 0; + char *buf = malloc(4096); if (newSuper) { - void *buf = tsdbEncodeTable(super, &bufLen); + tsdbEncodeTable(super, buf, &bufLen); tsdbInsertMetaRecord(pMeta->mfh, super->tableId.uid, buf, bufLen); - tsdbFreeEncode(buf); } - void *buf = tsdbEncodeTable(table, &bufLen); + tsdbEncodeTable(table, buf, &bufLen); tsdbInsertMetaRecord(pMeta->mfh, table->tableId.uid, buf, bufLen); - tsdbFreeEncode(buf); + tfree(buf); return 0; } @@ -438,13 +459,18 @@ static void tsdbFreeMemTable(SMemTable *pMemTable) { } static int tsdbFreeTable(STable *pTable) { - // TODO: finish this function + if (pTable == NULL) return 0; + if (pTable->type == TSDB_CHILD_TABLE) { tdFreeDataRow(pTable->tagVal); } else { tdFreeSchema(pTable->schema); } + if (pTable->type == TSDB_STREAM_TABLE) { + tfree(pTable->sql); + } + // Free content if (TSDB_TABLE_IS_SUPER_TABLE(pTable)) { tdFreeSchema(pTable->tagSchema); @@ -491,6 +517,9 @@ static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx) { if (pTable->type == TSDB_CHILD_TABLE && addIdx) { // add STABLE to the index tsdbAddTableIntoIndex(pMeta, pTable); } + if (pTable->type == TSDB_STREAM_TABLE && addIdx) { + // TODO + } pMeta->nTables++; } @@ -522,7 +551,6 @@ static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable, bool rmFrom tSkipListDestroyIter(pIter); - // TODO: Remove the table from the list if (pTable->prev != NULL) { pTable->prev->next = pTable->next; if (pTable->next != NULL) { @@ -536,6 +564,9 @@ static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable, bool rmFrom if (pTable->type == TSDB_CHILD_TABLE && rmFromIdx) { tsdbRemoveTableFromIndex(pMeta, pTable); } + if (pTable->type == TSDB_STREAM_TABLE && rmFromIdx) { + // TODO + } pMeta->nTables--; } @@ -598,26 +629,6 @@ static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) { return 0; } -static int tsdbEstimateTableEncodeSize(STable *pTable) { - int size = 0; - size += T_MEMBER_SIZE(STable, type); - size += sizeof(int) + varDataLen(pTable->name); - size += T_MEMBER_SIZE(STable, tableId); - size += T_MEMBER_SIZE(STable, superUid); - size += T_MEMBER_SIZE(STable, sversion); - - if (pTable->type == TSDB_SUPER_TABLE) { - size += tdGetSchemaEncodeSize(pTable->schema); - size += tdGetSchemaEncodeSize(pTable->tagSchema); - } else if (pTable->type == TSDB_CHILD_TABLE) { - size += dataRowLen(pTable->tagVal); - } else { - size += tdGetSchemaEncodeSize(pTable->schema); - } - - return size; -} - char *getTSTupleKey(const void * data) { SDataRow row = (SDataRow)data; return POINTER_SHIFT(row, TD_DATA_ROW_HEAD_SIZE); diff --git a/src/util/inc/tcoding.h b/src/util/inc/tcoding.h index b4f7f596c5..cc9caf71d0 100644 --- a/src/util/inc/tcoding.h +++ b/src/util/inc/tcoding.h @@ -217,6 +217,28 @@ static FORCE_INLINE void *taosDecodeVariant64(void *buf, uint64_t *value) { return NULL; // error happened } +static FORCE_INLINE void *taosEncodeString(void *buf, char *value) { + size_t size = strlen(value); + + buf = taosEncodeVariant64(buf, size); + memcpy(buf, value, size); + + return POINTER_SHIFT(buf, size); +} + +static FORCE_INLINE void *taosDecodeString(void *buf, char **value) { + uint64_t size = 0; + + buf = taosDecodeVariant64(buf, &size); + *value = (char *)malloc(size + 1); + if (*value == NULL) return NULL; + memcpy(*value, buf, size); + + (*value)[size] = '\0'; + + return POINTER_SHIFT(buf, size); +} + #ifdef __cplusplus } #endif diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c index 9c415d6af7..25cd0983e5 100644 --- a/src/vnode/src/vnodeWrite.c +++ b/src/vnode/src/vnodeWrite.c @@ -106,6 +106,7 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) { SMDCreateTableMsg *pTable = pCont; int32_t code = 0; + char sql[1024] = "\0"; vTrace("vgId:%d, table:%s, start to create", pVnode->vgId, pTable->tableId); int16_t numOfColumns = htons(pTable->numOfColumns); @@ -149,6 +150,11 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe tsdbTableSetTagValue(&tCfg, dataRow, false); } + if (pTable->tableType == TSDB_STREAM_TABLE) { + // TODO: set sql value + tsdbTableSetStreamSql(&tCfg, sql, false); + } + code = tsdbCreateTable(pVnode->tsdb, &tCfg); tdFreeDataRow(dataRow); tfree(pDestTagSchema); From 160725945f5bdb8d5582ade19d9eafba78a7c5ef Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 27 May 2020 10:40:08 +0000 Subject: [PATCH 32/35] fix name bug --- src/tsdb/src/tsdbMeta.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 427e15de37..8345dc5f8b 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -296,13 +296,6 @@ static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) { } pTable->type = pCfg->type; - tsize = strnlen(pCfg->sname, TSDB_TABLE_NAME_LEN); - pTable->name = calloc(1, tsize + VARSTR_HEADER_SIZE + 1); - if (pTable->name == NULL) { - terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; - goto _err; - } - STR_WITH_SIZE_TO_VARSTR(pTable->name, pCfg->sname, tsize); if (isSuper) { pTable->type = TSDB_SUPER_TABLE; @@ -312,8 +305,16 @@ static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) { pTable->schema = tdDupSchema(pCfg->schema); pTable->tagSchema = tdDupSchema(pCfg->tagSchema); + tsize = strnlen(pCfg->sname, TSDB_TABLE_NAME_LEN); + pTable->name = calloc(1, tsize + VARSTR_HEADER_SIZE + 1); + if (pTable->name == NULL) { + terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; + goto _err; + } + STR_WITH_SIZE_TO_VARSTR(pTable->name, pCfg->sname, tsize); + STColumn *pColSchema = schemaColAt(pTable->tagSchema, 0); - pTable->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, pColSchema->type, pColSchema->bytes, 1, 0, 1, + pTable->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, pColSchema->type, pColSchema->bytes, 1, 0, 0, getTagIndexKey); // Allow duplicate key, no lock if (pTable->pIndex == NULL) { terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; @@ -325,6 +326,14 @@ static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) { pTable->tableId.tid = pCfg->tableId.tid; pTable->lastKey = TSKEY_INITIAL_VAL; + tsize = strnlen(pCfg->name, TSDB_TABLE_NAME_LEN); + pTable->name = calloc(1, tsize + VARSTR_HEADER_SIZE + 1); + if (pTable->name == NULL) { + terrno = TSDB_CODE_SERV_OUT_OF_MEMORY; + goto _err; + } + STR_WITH_SIZE_TO_VARSTR(pTable->name, pCfg->name, tsize); + if (pCfg->type == TSDB_CHILD_TABLE) { pTable->superUid = pCfg->superUid; pTable->tagVal = tdDataRowDup(pCfg->tagValues); From 82a3dcab888f29736427b78e688a2745df4c0ecd Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 28 May 2020 01:33:38 +0800 Subject: [PATCH 33/35] [td-430] fix bug while client does not retrieve or paritally retrieve result from vnode. --- src/client/src/tscServer.c | 8 +++++--- src/client/src/tscSql.c | 26 +++++++++++--------------- src/client/src/tscUtil.c | 2 ++ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 7d0ac09e66..a1c50b1518 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -217,10 +217,12 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) { STscObj *pObj = pSql->pTscObj; // tscTrace("%p msg:%s is received from server", pSql, taosMsg[rpcMsg->msgType]); - if (pSql->freed || pObj->signature != pObj) { + if (pObj->signature != pObj) { tscTrace("%p sql is already released or DB connection is closed, freed:%d pObj:%p signature:%p", pSql, pSql->freed, pObj, pObj->signature); - tscFreeSqlObj(pSql); + if (pSql != pObj->pSql) { + tscFreeSqlObj(pSql); + } rpcFreeCont(rpcMsg->pCont); return; } @@ -1867,8 +1869,8 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) { return TSDB_CODE_CLI_OUT_OF_MEMORY; } - free(pTableMeta); tscTrace("%p recv table meta: %"PRId64 ", tid:%d, name:%s", pSql, pTableMeta->uid, pTableMeta->sid, pTableMetaInfo->name); + free(pTableMeta); return TSDB_CODE_SUCCESS; } diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 14605a571d..7a6cce4d7f 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -576,26 +576,22 @@ void taos_free_result_imp(TAOS_RES *res, int keepCmd) { * for each subquery. Because the failure of execution tsProcessSql may trigger the callback function * be executed, and the retry efforts may result in double free the resources, e.g.,SRetrieveSupport */ - if ((pCmd->command == TSDB_SQL_SELECT || pCmd->command == TSDB_SQL_SHOW || pCmd->command == TSDB_SQL_RETRIEVE || - pCmd->command == TSDB_SQL_FETCH) && - (pRes->code != TSDB_CODE_QUERY_CANCELLED && ((pRes->numOfRows > 0 && pCmd->command < TSDB_SQL_LOCAL && pRes->completed == false) || - (pRes->code == TSDB_CODE_SUCCESS && pRes->numOfRows == 0 && pCmd->command == TSDB_SQL_SELECT && - pSql->pStream == NULL && pTableMetaInfo->pTableMeta != NULL)))) { + if ((pCmd->command == TSDB_SQL_SELECT || + pCmd->command == TSDB_SQL_SHOW || + pCmd->command == TSDB_SQL_RETRIEVE || + pCmd->command == TSDB_SQL_FETCH) && + (pRes->code != TSDB_CODE_QUERY_CANCELLED && ((pCmd->command < TSDB_SQL_LOCAL && pRes->completed == false) || + (pRes->code == TSDB_CODE_SUCCESS && pCmd->command == TSDB_SQL_SELECT && pSql->pStream == NULL && pTableMetaInfo->pTableMeta != NULL)))) { pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH; - tscTrace("%p code:%d, numOfRows:%d, command:%d", pSql, pRes->code, pRes->numOfRows, pCmd->command); + tscTrace("%p send msg to free qhandle in vnode, code:%d, numOfRows:%d, command:%s", pSql, pRes->code, pRes->numOfRows, + sqlCmd[pCmd->command]); pSql->freed = 1; tscProcessSql(pSql); - - /* - * If release connection msg is sent to vnode, the corresponding SqlObj for async query can not be freed instantly, - * since its free operation is delegated to callback function, which is tscProcessMsgFromServer. - */ - STscObj* pObj = pSql->pTscObj; - if (pObj->pSql == pSql) { - pObj->pSql = NULL; - } + + // waits for response and then goes on + sem_wait(&pSql->rspSem); } else { // if no free resource msg is sent to vnode, we free this object immediately. STscObj* pTscObj = pSql->pTscObj; diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index ec9908ae96..4c8722ecea 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -423,6 +423,8 @@ void tscFreeSqlObj(SSqlObj* pSql) { tfree(pCmd->payload); pCmd->allocSize = 0; + + tfree(pSql->sqlstr); free(pSql); } From 1da4fa6aefb765f3219605dea5c799e48eca6306 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 28 May 2020 01:36:35 +0000 Subject: [PATCH 34/35] fix table encode and decode bug --- src/tsdb/src/tsdbMeta.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 8345dc5f8b..15de4df3fd 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -48,6 +48,7 @@ void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) { ptr = tdEncodeSchema(ptr, pTable->tagSchema); } else if (pTable->type == TSDB_CHILD_TABLE) { dataRowCpy(ptr, pTable->tagVal); + ptr = POINTER_SHIFT(ptr, dataRowLen(pTable->tagVal)); } else { ptr = tdEncodeSchema(ptr, pTable->schema); } From 85c9508fb7dd606e628f062c429de8aef8412f20 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 28 May 2020 03:39:31 +0000 Subject: [PATCH 35/35] fix table/column_num.py coredump --- src/tsdb/src/tsdbMeta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c index 5d2123a1d4..e320de9827 100644 --- a/src/tsdb/src/tsdbMeta.c +++ b/src/tsdb/src/tsdbMeta.c @@ -406,7 +406,7 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) { // Write to meta file int bufLen = 0; - char *buf = malloc(4096); + char *buf = malloc(1024*1024); if (newSuper) { tsdbEncodeTable(super, buf, &bufLen); tsdbInsertMetaRecord(pMeta->mfh, super->tableId.uid, buf, bufLen);