xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #15978 from taosdata/feature/3.0_wxy 

enh: show command optimize
This commit is contained in:
Xiaoyu Wang 2022-08-12 00:40:35 +08:00 committed by GitHub
parent 2040ab7872 03a39381c0
commit 6b9699aaa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
495 changed files with 3612 additions and 3329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
include/common/ttokendef.h
View File

@ -154,7 +154,7 @@
#define TK_ACCOUNTS 136 #define TK_ACCOUNTS 136
#define TK_APPS 137 #define TK_APPS 137
#define TK_CONNECTIONS 138 #define TK_CONNECTIONS 138
#define TK_LICENCE 139 #define TK_LICENCES 139
#define TK_GRANTS 140 #define TK_GRANTS 140
#define TK_QUERIES 141 #define TK_QUERIES 141
#define TK_SCORES 142 #define TK_SCORES 142
@ -266,12 +266,60 @@
#define TK_OFFSET 248 #define TK_OFFSET 248
#define TK_ASC 249 #define TK_ASC 249
#define TK_NULLS 250 #define TK_NULLS 250
#define TK_ID 251 #define TK_ABORT 251
#define TK_NK_BITNOT 252 #define TK_AFTER 252
#define TK_VALUES 253 #define TK_ATTACH 253
#define TK_IMPORT 254 #define TK_BEFORE 254
#define TK_NK_SEMI 255 #define TK_BEGIN 255
#define TK_FILE 256 #define TK_BITAND 256
#define TK_BITNOT 257
#define TK_BITOR 258
#define TK_BLOCKS 259
#define TK_CHANGE 260
#define TK_COMMA 261
#define TK_COMPACT 262
#define TK_CONCAT 263
#define TK_CONFLICT 264
#define TK_COPY 265
#define TK_DEFERRED 266
#define TK_DELIMITERS 267
#define TK_DETACH 268
#define TK_DIVIDE 269
#define TK_DOT 270
#define TK_EACH 271
#define TK_END 272
#define TK_FAIL 273
#define TK_FILE 274
#define TK_FOR 275
#define TK_GLOB 276
#define TK_ID 277
#define TK_IMMEDIATE 278
#define TK_IMPORT 279
#define TK_INITIALLY 280
#define TK_INSTEAD 281
#define TK_ISNULL 282
#define TK_KEY 283
#define TK_NK_BITNOT 284
#define TK_NK_SEMI 285
#define TK_NOTNULL 286
#define TK_OF 287
#define TK_PLUS 288
#define TK_PRIVILEGE 289
#define TK_RAISE 290
#define TK_REPLACE 291
#define TK_RESTRICT 292
#define TK_ROW 293
#define TK_SEMI 294
#define TK_STAR 295
#define TK_STATEMENT 296
#define TK_STRING 297
#define TK_TIMES 298
#define TK_UPDATE 299
#define TK_VALUES 300
#define TK_VARIABLE 301
#define TK_VIEW 302
#define TK_VNODES 303
#define TK_WAL 304
#define TK_NK_SPACE 300 #define TK_NK_SPACE 300
#define TK_NK_COMMENT 301 #define TK_NK_COMMENT 301

15
include/libs/nodes/nodes.h
View File

@ -172,27 +172,24 @@ typedef enum ENodeType {
QUERY_NODE_SHOW_TABLES_STMT, QUERY_NODE_SHOW_TABLES_STMT,
QUERY_NODE_SHOW_TAGS_STMT, QUERY_NODE_SHOW_TAGS_STMT,
QUERY_NODE_SHOW_USERS_STMT, QUERY_NODE_SHOW_USERS_STMT,
QUERY_NODE_SHOW_LICENCE_STMT, QUERY_NODE_SHOW_LICENCES_STMT,
QUERY_NODE_SHOW_VGROUPS_STMT, QUERY_NODE_SHOW_VGROUPS_STMT,
QUERY_NODE_SHOW_TOPICS_STMT, QUERY_NODE_SHOW_TOPICS_STMT,
QUERY_NODE_SHOW_CONSUMERS_STMT, QUERY_NODE_SHOW_CONSUMERS_STMT,
QUERY_NODE_SHOW_SUBSCRIBES_STMT,
QUERY_NODE_SHOW_SMAS_STMT,
QUERY_NODE_SHOW_CONFIGS_STMT,
QUERY_NODE_SHOW_CONNECTIONS_STMT, QUERY_NODE_SHOW_CONNECTIONS_STMT,
QUERY_NODE_SHOW_QUERIES_STMT, QUERY_NODE_SHOW_QUERIES_STMT,
QUERY_NODE_SHOW_VNODES_STMT,
QUERY_NODE_SHOW_APPS_STMT, QUERY_NODE_SHOW_APPS_STMT,
QUERY_NODE_SHOW_SCORES_STMT,
QUERY_NODE_SHOW_VARIABLES_STMT, QUERY_NODE_SHOW_VARIABLES_STMT,
QUERY_NODE_SHOW_LOCAL_VARIABLES_STMT,
QUERY_NODE_SHOW_DNODE_VARIABLES_STMT, QUERY_NODE_SHOW_DNODE_VARIABLES_STMT,
QUERY_NODE_SHOW_TRANSACTIONS_STMT,
QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT,
QUERY_NODE_SHOW_CREATE_DATABASE_STMT, QUERY_NODE_SHOW_CREATE_DATABASE_STMT,
QUERY_NODE_SHOW_CREATE_TABLE_STMT, QUERY_NODE_SHOW_CREATE_TABLE_STMT,
QUERY_NODE_SHOW_CREATE_STABLE_STMT, QUERY_NODE_SHOW_CREATE_STABLE_STMT,
QUERY_NODE_SHOW_TRANSACTIONS_STMT,
QUERY_NODE_SHOW_TABLE_DISTRIBUTED_STMT, QUERY_NODE_SHOW_TABLE_DISTRIBUTED_STMT,
QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT, QUERY_NODE_SHOW_LOCAL_VARIABLES_STMT,
QUERY_NODE_SHOW_VNODES_STMT,
QUERY_NODE_SHOW_SCORES_STMT,
QUERY_NODE_KILL_CONNECTION_STMT, QUERY_NODE_KILL_CONNECTION_STMT,
QUERY_NODE_KILL_QUERY_STMT, QUERY_NODE_KILL_QUERY_STMT,
QUERY_NODE_KILL_TRANSACTION_STMT, QUERY_NODE_KILL_TRANSACTION_STMT,

2
source/libs/function/inc/builtins.h
View File

@ -49,7 +49,7 @@ typedef struct SBuiltinFuncDefinition {
} SBuiltinFuncDefinition; } SBuiltinFuncDefinition;
extern const SBuiltinFuncDefinition funcMgtBuiltins[]; extern const SBuiltinFuncDefinition funcMgtBuiltins[];
extern const int funcMgtBuiltinsNum; extern const int32_t funcMgtBuiltinsNum;
#ifdef __cplusplus #ifdef __cplusplus
} }

6
source/libs/nodes/src/nodesCodeFuncs.c
View File

@ -163,7 +163,7 @@ const char* nodesNodeName(ENodeType type) {
return "ShowTagsStmt"; return "ShowTagsStmt";
case QUERY_NODE_SHOW_USERS_STMT: case QUERY_NODE_SHOW_USERS_STMT:
return "ShowUsersStmt"; return "ShowUsersStmt";
case QUERY_NODE_SHOW_LICENCE_STMT: case QUERY_NODE_SHOW_LICENCES_STMT:
return "ShowGrantsStmt"; return "ShowGrantsStmt";
case QUERY_NODE_SHOW_VGROUPS_STMT: case QUERY_NODE_SHOW_VGROUPS_STMT:
return "ShowVgroupsStmt"; return "ShowVgroupsStmt";
@ -171,10 +171,6 @@ const char* nodesNodeName(ENodeType type) {
return "ShowTopicsStmt"; return "ShowTopicsStmt";
case QUERY_NODE_SHOW_CONSUMERS_STMT: case QUERY_NODE_SHOW_CONSUMERS_STMT:
return "ShowConsumersStmt"; return "ShowConsumersStmt";
case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
return "ShowSubscribesStmt";
case QUERY_NODE_SHOW_SMAS_STMT:
return "ShowSmasStmt";
case QUERY_NODE_SHOW_QUERIES_STMT: case QUERY_NODE_SHOW_QUERIES_STMT:
return "ShowQueriesStmt"; return "ShowQueriesStmt";
case QUERY_NODE_SHOW_VNODES_STMT: case QUERY_NODE_SHOW_VNODES_STMT:

8
source/libs/nodes/src/nodesUtilFuncs.c
View File

@ -201,12 +201,10 @@ SNode* nodesMakeNode(ENodeType type) {
case QUERY_NODE_SHOW_STREAMS_STMT: case QUERY_NODE_SHOW_STREAMS_STMT:
case QUERY_NODE_SHOW_TABLES_STMT: case QUERY_NODE_SHOW_TABLES_STMT:
case QUERY_NODE_SHOW_USERS_STMT: case QUERY_NODE_SHOW_USERS_STMT:
case QUERY_NODE_SHOW_LICENCE_STMT: case QUERY_NODE_SHOW_LICENCES_STMT:
case QUERY_NODE_SHOW_VGROUPS_STMT: case QUERY_NODE_SHOW_VGROUPS_STMT:
case QUERY_NODE_SHOW_TOPICS_STMT: case QUERY_NODE_SHOW_TOPICS_STMT:
case QUERY_NODE_SHOW_CONSUMERS_STMT: case QUERY_NODE_SHOW_CONSUMERS_STMT:
case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
case QUERY_NODE_SHOW_SMAS_STMT:
case QUERY_NODE_SHOW_CONNECTIONS_STMT: case QUERY_NODE_SHOW_CONNECTIONS_STMT:
case QUERY_NODE_SHOW_QUERIES_STMT: case QUERY_NODE_SHOW_QUERIES_STMT:
case QUERY_NODE_SHOW_VNODES_STMT: case QUERY_NODE_SHOW_VNODES_STMT:
@ -687,12 +685,10 @@ void nodesDestroyNode(SNode* pNode) {
case QUERY_NODE_SHOW_STREAMS_STMT: case QUERY_NODE_SHOW_STREAMS_STMT:
case QUERY_NODE_SHOW_TABLES_STMT: case QUERY_NODE_SHOW_TABLES_STMT:
case QUERY_NODE_SHOW_USERS_STMT: case QUERY_NODE_SHOW_USERS_STMT:
case QUERY_NODE_SHOW_LICENCE_STMT: case QUERY_NODE_SHOW_LICENCES_STMT:
case QUERY_NODE_SHOW_VGROUPS_STMT: case QUERY_NODE_SHOW_VGROUPS_STMT:
case QUERY_NODE_SHOW_TOPICS_STMT: case QUERY_NODE_SHOW_TOPICS_STMT:
case QUERY_NODE_SHOW_CONSUMERS_STMT: case QUERY_NODE_SHOW_CONSUMERS_STMT:
case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
case QUERY_NODE_SHOW_SMAS_STMT:
case QUERY_NODE_SHOW_CONNECTIONS_STMT: case QUERY_NODE_SHOW_CONNECTIONS_STMT:
case QUERY_NODE_SHOW_QUERIES_STMT: case QUERY_NODE_SHOW_QUERIES_STMT:
case QUERY_NODE_SHOW_VNODES_STMT: case QUERY_NODE_SHOW_VNODES_STMT:

8
source/libs/parser/inc/sql.y
View File

@ -391,8 +391,8 @@ cmd ::= SHOW STREAMS.
cmd ::= SHOW ACCOUNTS. { pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } cmd ::= SHOW ACCOUNTS. { pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
cmd ::= SHOW APPS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT); } cmd ::= SHOW APPS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT); }
cmd ::= SHOW CONNECTIONS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT); } cmd ::= SHOW CONNECTIONS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT); }
cmd ::= SHOW LICENCE. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT); } cmd ::= SHOW LICENCES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCES_STMT); }
cmd ::= SHOW GRANTS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT); } cmd ::= SHOW GRANTS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCES_STMT); }
cmd ::= SHOW CREATE DATABASE db_name(A). { pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &A); } cmd ::= SHOW CREATE DATABASE db_name(A). { pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &A); }
cmd ::= SHOW CREATE TABLE full_table_name(A). { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, A); } cmd ::= SHOW CREATE TABLE full_table_name(A). { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, A); }
cmd ::= SHOW CREATE STABLE full_table_name(A). { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, A); } cmd ::= SHOW CREATE STABLE full_table_name(A). { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, A); }
@ -998,4 +998,6 @@ null_ordering_opt(A) ::= .
null_ordering_opt(A) ::= NULLS FIRST. { A = NULL_ORDER_FIRST; } null_ordering_opt(A) ::= NULLS FIRST. { A = NULL_ORDER_FIRST; }
null_ordering_opt(A) ::= NULLS LAST. { A = NULL_ORDER_LAST; } null_ordering_opt(A) ::= NULLS LAST. { A = NULL_ORDER_LAST; }
%fallback ID NK_BITNOT VALUES IMPORT NK_SEMI FILE. %fallback ABORT AFTER ATTACH BEFORE BEGIN BITAND BITNOT BITOR BLOCKS CHANGE COMMA COMPACT CONCAT CONFLICT COPY DEFERRED DELIMITERS DETACH DIVIDE DOT EACH END FAIL
FILE FOR GLOB ID IMMEDIATE IMPORT INITIALLY INSTEAD ISNULL KEY NK_BITNOT NK_SEMI NOTNULL OF PLUS PRIVILEGE RAISE REPLACE RESTRICT ROW SEMI STAR STATEMENT STRING
TIMES UPDATE VALUES VARIABLE VIEW VNODES WAL.

2
source/libs/parser/src/parAstParser.c
View File

@ -570,7 +570,7 @@ static int32_t collectMetaKeyFromQuery(SCollectMetaKeyCxt* pCxt, SNode* pStmt) {
return collectMetaKeyFromShowTags(pCxt, (SShowStmt*)pStmt); return collectMetaKeyFromShowTags(pCxt, (SShowStmt*)pStmt);
case QUERY_NODE_SHOW_USERS_STMT: case QUERY_NODE_SHOW_USERS_STMT:
return collectMetaKeyFromShowUsers(pCxt, (SShowStmt*)pStmt); return collectMetaKeyFromShowUsers(pCxt, (SShowStmt*)pStmt);
case QUERY_NODE_SHOW_LICENCE_STMT: case QUERY_NODE_SHOW_LICENCES_STMT:
return collectMetaKeyFromShowLicence(pCxt, (SShowStmt*)pStmt); return collectMetaKeyFromShowLicence(pCxt, (SShowStmt*)pStmt);
case QUERY_NODE_SHOW_VGROUPS_STMT: case QUERY_NODE_SHOW_VGROUPS_STMT:
return collectMetaKeyFromShowVgroups(pCxt, (SShowStmt*)pStmt); return collectMetaKeyFromShowVgroups(pCxt, (SShowStmt*)pStmt);

12
source/libs/parser/src/parTokenizer.c
View File

@ -43,8 +43,8 @@ static SKeyword keywordTable[] = {
{"AT_ONCE", TK_AT_ONCE}, {"AT_ONCE", TK_AT_ONCE},
{"BALANCE", TK_BALANCE}, {"BALANCE", TK_BALANCE},
{"BETWEEN", TK_BETWEEN}, {"BETWEEN", TK_BETWEEN},
{"BINARY", TK_BINARY},
{"BIGINT", TK_BIGINT}, {"BIGINT", TK_BIGINT},
{"BINARY", TK_BINARY},
{"BNODE", TK_BNODE}, {"BNODE", TK_BNODE},
{"BNODES", TK_BNODES}, {"BNODES", TK_BNODES},
{"BOOL", TK_BOOL}, {"BOOL", TK_BOOL},
@ -60,9 +60,9 @@ static SKeyword keywordTable[] = {
{"COLUMN", TK_COLUMN}, {"COLUMN", TK_COLUMN},
{"COMMENT", TK_COMMENT}, {"COMMENT", TK_COMMENT},
{"COMP", TK_COMP}, {"COMP", TK_COMP},
{"CONNS", TK_CONNS},
{"CONNECTION", TK_CONNECTION}, {"CONNECTION", TK_CONNECTION},
{"CONNECTIONS", TK_CONNECTIONS}, {"CONNECTIONS", TK_CONNECTIONS},
{"CONNS", TK_CONNS},
{"CONSUMER", TK_CONSUMER}, {"CONSUMER", TK_CONSUMER},
{"CONSUMERS", TK_CONSUMERS}, {"CONSUMERS", TK_CONSUMERS},
{"CONTAINS", TK_CONTAINS}, {"CONTAINS", TK_CONTAINS},
@ -106,8 +106,8 @@ static SKeyword keywordTable[] = {
{"INDEX", TK_INDEX}, {"INDEX", TK_INDEX},
{"INDEXES", TK_INDEXES}, {"INDEXES", TK_INDEXES},
{"INNER", TK_INNER}, {"INNER", TK_INNER},
{"INT", TK_INT},
{"INSERT", TK_INSERT}, {"INSERT", TK_INSERT},
{"INT", TK_INT},
{"INTEGER", TK_INTEGER}, {"INTEGER", TK_INTEGER},
{"INTERVAL", TK_INTERVAL}, {"INTERVAL", TK_INTERVAL},
{"INTO", TK_INTO}, {"INTO", TK_INTO},
@ -118,7 +118,7 @@ static SKeyword keywordTable[] = {
{"KILL", TK_KILL}, {"KILL", TK_KILL},
{"LAST", TK_LAST}, {"LAST", TK_LAST},
{"LAST_ROW", TK_LAST_ROW}, {"LAST_ROW", TK_LAST_ROW},
{"LICENCE", TK_LICENCE}, {"LICENCES", TK_LICENCES},
{"LIKE", TK_LIKE}, {"LIKE", TK_LIKE},
{"LIMIT", TK_LIMIT}, {"LIMIT", TK_LIMIT},
{"LINEAR", TK_LINEAR}, {"LINEAR", TK_LINEAR},
@ -147,10 +147,10 @@ static SKeyword keywordTable[] = {
{"OR", TK_OR}, {"OR", TK_OR},
{"ORDER", TK_ORDER}, {"ORDER", TK_ORDER},
{"OUTPUTTYPE", TK_OUTPUTTYPE}, {"OUTPUTTYPE", TK_OUTPUTTYPE},
{"PARTITION", TK_PARTITION},
{"PASS", TK_PASS},
{"PAGES", TK_PAGES}, {"PAGES", TK_PAGES},
{"PAGESIZE", TK_PAGESIZE}, {"PAGESIZE", TK_PAGESIZE},
{"PARTITION", TK_PARTITION},
{"PASS", TK_PASS},
{"PORT", TK_PORT}, {"PORT", TK_PORT},
{"PPS", TK_PPS}, {"PPS", TK_PPS},
{"PRECISION", TK_PRECISION}, {"PRECISION", TK_PRECISION},

331
source/libs/parser/src/parTranslater.c
View File

@ -28,6 +28,8 @@
#define generateDealNodeErrMsg(pCxt, code, ...) \ #define generateDealNodeErrMsg(pCxt, code, ...) \
(pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, code, ##__VA_ARGS__), DEAL_RES_ERROR) (pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, code, ##__VA_ARGS__), DEAL_RES_ERROR)
#define SYSTABLE_SHOW_TYPE_OFFSET QUERY_NODE_SHOW_DNODES_STMT
typedef struct STranslateContext { typedef struct STranslateContext {
SParseContext* pParseCxt; SParseContext* pParseCxt;
int32_t errCode; int32_t errCode;
@ -51,6 +53,201 @@ typedef struct SFullDatabaseName {
char fullDbName[TSDB_DB_FNAME_LEN]; char fullDbName[TSDB_DB_FNAME_LEN];
} SFullDatabaseName; } SFullDatabaseName;
typedef struct SSysTableShowAdapter {
ENodeType showType;
const char* pDbName;
const char* pTableName;
int32_t numOfShowCols;
const char* pShowCols[2];
} SSysTableShowAdapter;
// clang-format off
static const SSysTableShowAdapter sysTableShowAdapter[] = {
{
.showType = QUERY_NODE_SHOW_DNODES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_DNODES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_MNODES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_MNODES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_MODULES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_MODULES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_QNODES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_QNODES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_SNODES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_SNODES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_BNODES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_BNODES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_CLUSTER_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_CLUSTER,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_DATABASES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_DATABASES,
.numOfShowCols = 1,
.pShowCols = {"name"}
},
{
.showType = QUERY_NODE_SHOW_FUNCTIONS_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_FUNCTIONS,
.numOfShowCols = 1,
.pShowCols = {"name"}
},
{
.showType = QUERY_NODE_SHOW_INDEXES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_INDEXES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_STABLES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_STABLES,
.numOfShowCols = 1,
.pShowCols = {"stable_name"}
},
{
.showType = QUERY_NODE_SHOW_STREAMS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_STREAMS,
.numOfShowCols = 1,
.pShowCols = {"stream_name"}
},
{
.showType = QUERY_NODE_SHOW_TABLES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_TABLES,
.numOfShowCols = 1,
.pShowCols = {"table_name"}
},
{
.showType = QUERY_NODE_SHOW_TAGS_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_TAGS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_USERS_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_USERS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_LICENCES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_LICENCES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_VGROUPS_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_VGROUPS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_TOPICS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_TOPICS,
.numOfShowCols = 1,
.pShowCols = {"topic_name"}
},
{
.showType = QUERY_NODE_SHOW_CONSUMERS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_CONSUMERS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_CONNECTIONS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_CONNECTIONS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_QUERIES_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_QUERIES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_APPS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_APPS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_VARIABLES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_CONFIGS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_DNODE_VARIABLES_STMT,
.pDbName = TSDB_INFORMATION_SCHEMA_DB,
.pTableName = TSDB_INS_TABLE_DNODE_VARIABLES,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_TRANSACTIONS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_TRANS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
{
.showType = QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT,
.pDbName = TSDB_PERFORMANCE_SCHEMA_DB,
.pTableName = TSDB_PERFS_TABLE_SUBSCRIPTIONS,
.numOfShowCols = 1,
.pShowCols = {"*"}
},
};
// clang-format on
static int32_t translateSubquery(STranslateContext* pCxt, SNode* pNode); static int32_t translateSubquery(STranslateContext* pCxt, SNode* pNode);
static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode); static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode);
static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal); static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal);
@ -5362,102 +5559,6 @@ int32_t extractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** pS
return TSDB_CODE_FAILED; return TSDB_CODE_FAILED;
} }
static const char* getSysDbName(ENodeType type) {
switch (type) {
case QUERY_NODE_SHOW_DATABASES_STMT:
case QUERY_NODE_SHOW_TABLES_STMT:
case QUERY_NODE_SHOW_STABLES_STMT:
case QUERY_NODE_SHOW_USERS_STMT:
case QUERY_NODE_SHOW_DNODES_STMT:
case QUERY_NODE_SHOW_VGROUPS_STMT:
case QUERY_NODE_SHOW_MNODES_STMT:
case QUERY_NODE_SHOW_MODULES_STMT:
case QUERY_NODE_SHOW_QNODES_STMT:
case QUERY_NODE_SHOW_FUNCTIONS_STMT:
case QUERY_NODE_SHOW_INDEXES_STMT:
case QUERY_NODE_SHOW_BNODES_STMT:
case QUERY_NODE_SHOW_SNODES_STMT:
case QUERY_NODE_SHOW_LICENCE_STMT:
case QUERY_NODE_SHOW_CLUSTER_STMT:
case QUERY_NODE_SHOW_VARIABLES_STMT:
case QUERY_NODE_SHOW_DNODE_VARIABLES_STMT:
case QUERY_NODE_SHOW_TAGS_STMT:
return TSDB_INFORMATION_SCHEMA_DB;
case QUERY_NODE_SHOW_CONNECTIONS_STMT:
case QUERY_NODE_SHOW_QUERIES_STMT:
case QUERY_NODE_SHOW_TOPICS_STMT:
case QUERY_NODE_SHOW_STREAMS_STMT:
case QUERY_NODE_SHOW_TRANSACTIONS_STMT:
case QUERY_NODE_SHOW_APPS_STMT:
case QUERY_NODE_SHOW_CONSUMERS_STMT:
case QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT:
return TSDB_PERFORMANCE_SCHEMA_DB;
default:
break;
}
return NULL;
}
static const char* getSysTableName(ENodeType type) {
switch (type) {
case QUERY_NODE_SHOW_DATABASES_STMT:
return TSDB_INS_TABLE_DATABASES;
case QUERY_NODE_SHOW_TABLES_STMT:
return TSDB_INS_TABLE_TABLES;
case QUERY_NODE_SHOW_TAGS_STMT:
return TSDB_INS_TABLE_TAGS;
case QUERY_NODE_SHOW_STABLES_STMT:
return TSDB_INS_TABLE_STABLES;
case QUERY_NODE_SHOW_USERS_STMT:
return TSDB_INS_TABLE_USERS;
case QUERY_NODE_SHOW_DNODES_STMT:
return TSDB_INS_TABLE_DNODES;
case QUERY_NODE_SHOW_VGROUPS_STMT:
return TSDB_INS_TABLE_VGROUPS;
case QUERY_NODE_SHOW_MNODES_STMT:
return TSDB_INS_TABLE_MNODES;
case QUERY_NODE_SHOW_MODULES_STMT:
return TSDB_INS_TABLE_MODULES;
case QUERY_NODE_SHOW_QNODES_STMT:
return TSDB_INS_TABLE_QNODES;
case QUERY_NODE_SHOW_FUNCTIONS_STMT:
return TSDB_INS_TABLE_FUNCTIONS;
case QUERY_NODE_SHOW_INDEXES_STMT:
return TSDB_INS_TABLE_INDEXES;
case QUERY_NODE_SHOW_STREAMS_STMT:
return TSDB_PERFS_TABLE_STREAMS;
case QUERY_NODE_SHOW_BNODES_STMT:
return TSDB_INS_TABLE_BNODES;
case QUERY_NODE_SHOW_SNODES_STMT:
return TSDB_INS_TABLE_SNODES;
case QUERY_NODE_SHOW_LICENCE_STMT:
return TSDB_INS_TABLE_LICENCES;
case QUERY_NODE_SHOW_CLUSTER_STMT:
return TSDB_INS_TABLE_CLUSTER;
case QUERY_NODE_SHOW_CONNECTIONS_STMT:
return TSDB_PERFS_TABLE_CONNECTIONS;
case QUERY_NODE_SHOW_QUERIES_STMT:
return TSDB_PERFS_TABLE_QUERIES;
case QUERY_NODE_SHOW_TOPICS_STMT:
return TSDB_PERFS_TABLE_TOPICS;
case QUERY_NODE_SHOW_TRANSACTIONS_STMT:
return TSDB_PERFS_TABLE_TRANS;
case QUERY_NODE_SHOW_VARIABLES_STMT:
return TSDB_INS_TABLE_CONFIGS;
case QUERY_NODE_SHOW_APPS_STMT:
return TSDB_PERFS_TABLE_APPS;
case QUERY_NODE_SHOW_DNODE_VARIABLES_STMT:
return TSDB_INS_TABLE_DNODE_VARIABLES;
case QUERY_NODE_SHOW_CONSUMERS_STMT:
return TSDB_PERFS_TABLE_CONSUMERS;
case QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT:
return TSDB_PERFS_TABLE_SUBSCRIPTIONS;
default:
break;
}
return NULL;
}
static SNode* createStarCol() { static SNode* createStarCol() {
SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN); SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
if (NULL == pCol) { if (NULL == pCol) {
@ -5467,7 +5568,33 @@ static SNode* createStarCol() {
return (SNode*)pCol; return (SNode*)pCol;
} }
static int32_t createSimpleSelectStmt(const char* pDb, const char* pTable, SSelectStmt** pStmt) { static SNode* createProjectCol(const char* pProjCol) {
SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
if (NULL == pCol) {
return NULL;
}
strcpy(pCol->colName, pProjCol);
return (SNode*)pCol;
}
static SNodeList* createProjectCols(int32_t ncols, const char* const pCols[]) {
SNodeList* pProjections = NULL;
if (ncols <= 0) {
nodesListMakeStrictAppend(&pProjections, createStarCol());
return pProjections;
}
for (int32_t i = 0; i < ncols; ++i) {
int32_t code = nodesListMakeStrictAppend(&pProjections, createProjectCol(pCols[i]));
if (TSDB_CODE_SUCCESS != code) {
nodesDestroyList(pProjections);
return NULL;
}
}
return pProjections;
}
static int32_t createSimpleSelectStmt(const char* pDb, const char* pTable, int32_t numOfProjs,
const char* const pProjCol[], SSelectStmt** pStmt) {
SSelectStmt* pSelect = (SSelectStmt*)nodesMakeNode(QUERY_NODE_SELECT_STMT); SSelectStmt* pSelect = (SSelectStmt*)nodesMakeNode(QUERY_NODE_SELECT_STMT);
if (NULL == pSelect) { if (NULL == pSelect) {
return TSDB_CODE_OUT_OF_MEMORY; return TSDB_CODE_OUT_OF_MEMORY;
@ -5484,7 +5611,8 @@ static int32_t createSimpleSelectStmt(const char* pDb, const char* pTable, SSele
strcpy(pRealTable->table.tableAlias, pTable); strcpy(pRealTable->table.tableAlias, pTable);
pSelect->pFromTable = (SNode*)pRealTable; pSelect->pFromTable = (SNode*)pRealTable;
if (TSDB_CODE_SUCCESS != nodesListMakeStrictAppend(&pSelect->pProjectionList, createStarCol())) { pSelect->pProjectionList = createProjectCols(numOfProjs, pProjCol);
if (NULL == pSelect->pProjectionList) {
nodesDestroyNode((SNode*)pSelect); nodesDestroyNode((SNode*)pSelect);
return TSDB_CODE_OUT_OF_MEMORY; return TSDB_CODE_OUT_OF_MEMORY;
} }
@ -5495,11 +5623,12 @@ static int32_t createSimpleSelectStmt(const char* pDb, const char* pTable, SSele
} }
static int32_t createSelectStmtForShow(ENodeType showType, SSelectStmt** pStmt) { static int32_t createSelectStmtForShow(ENodeType showType, SSelectStmt** pStmt) {
return createSimpleSelectStmt(getSysDbName(showType), getSysTableName(showType), pStmt); const SSysTableShowAdapter* pShow = &sysTableShowAdapter[showType - SYSTABLE_SHOW_TYPE_OFFSET];
return createSimpleSelectStmt(pShow->pDbName, pShow->pTableName, pShow->numOfShowCols, pShow->pShowCols, pStmt);
} }
static int32_t createSelectStmtForShowTableDist(SShowTableDistributedStmt* pStmt, SSelectStmt** pOutput) { static int32_t createSelectStmtForShowTableDist(SShowTableDistributedStmt* pStmt, SSelectStmt** pOutput) {
return createSimpleSelectStmt(pStmt->dbName, pStmt->tableName, pOutput); return createSimpleSelectStmt(pStmt->dbName, pStmt->tableName, 0, NULL, pOutput);
} }
static int32_t createOperatorNode(EOperatorType opType, const char* pColName, SNode* pRight, SNode** pOp) { static int32_t createOperatorNode(EOperatorType opType, const char* pColName, SNode* pRight, SNode** pOp) {
@ -6687,7 +6816,7 @@ static int32_t rewriteFlushDatabase(STranslateContext* pCxt, SQuery* pQuery) {
static int32_t rewriteQuery(STranslateContext* pCxt, SQuery* pQuery) { static int32_t rewriteQuery(STranslateContext* pCxt, SQuery* pQuery) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
switch (nodeType(pQuery->pRoot)) { switch (nodeType(pQuery->pRoot)) {
case QUERY_NODE_SHOW_LICENCE_STMT: case QUERY_NODE_SHOW_LICENCES_STMT:
case QUERY_NODE_SHOW_DATABASES_STMT: case QUERY_NODE_SHOW_DATABASES_STMT:
case QUERY_NODE_SHOW_TABLES_STMT: case QUERY_NODE_SHOW_TABLES_STMT:
case QUERY_NODE_SHOW_STABLES_STMT: case QUERY_NODE_SHOW_STABLES_STMT:

3742
source/libs/parser/src/sql.c
View File

File diff suppressed because it is too large Load Diff

15
source/libs/parser/test/mockCatalog.cpp
View File

@ -35,25 +35,25 @@ void generateInformationSchema(MockCatalogService* mcs) {
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_DNODES, TSDB_SYSTEM_TABLE, 1) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_DNODES, TSDB_SYSTEM_TABLE, 1)
.addColumn("id", TSDB_DATA_TYPE_INT); .addColumn("endpoint", TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN);
builder.done(); builder.done();
} }
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_MNODES, TSDB_SYSTEM_TABLE, 1) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_MNODES, TSDB_SYSTEM_TABLE, 1)
.addColumn("id", TSDB_DATA_TYPE_INT); .addColumn("endpoint", TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN);
builder.done(); builder.done();
} }
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_MODULES, TSDB_SYSTEM_TABLE, 1) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_MODULES, TSDB_SYSTEM_TABLE, 1)
.addColumn("id", TSDB_DATA_TYPE_INT); .addColumn("endpoint", TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN);
builder.done(); builder.done();
} }
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_QNODES, TSDB_SYSTEM_TABLE, 1) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_QNODES, TSDB_SYSTEM_TABLE, 1)
.addColumn("id", TSDB_DATA_TYPE_INT); .addColumn("endpoint", TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN);
builder.done(); builder.done();
} }
{ {
@ -70,7 +70,8 @@ void generateInformationSchema(MockCatalogService* mcs) {
} }
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_INDEXES, TSDB_SYSTEM_TABLE, 2) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_INDEXES, TSDB_SYSTEM_TABLE, 3)
.addColumn("index_name", TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN)
.addColumn("db_name", TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN) .addColumn("db_name", TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN)
.addColumn("table_name", TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN); .addColumn("table_name", TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN);
builder.done(); builder.done();
@ -98,7 +99,7 @@ void generateInformationSchema(MockCatalogService* mcs) {
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USERS, TSDB_SYSTEM_TABLE, 1) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USERS, TSDB_SYSTEM_TABLE, 1)
.addColumn("user_name", TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN); .addColumn("name", TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN);
builder.done(); builder.done();
} }
{ {
@ -122,7 +123,7 @@ void generateInformationSchema(MockCatalogService* mcs) {
{ {
ITableBuilder& builder = ITableBuilder& builder =
mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_CLUSTER, TSDB_SYSTEM_TABLE, 1) mcs->createTableBuilder(TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_CLUSTER, TSDB_SYSTEM_TABLE, 1)
.addColumn("id", TSDB_DATA_TYPE_BIGINT); .addColumn("name", TSDB_DATA_TYPE_BINARY, TSDB_CLUSTER_ID_LEN);
builder.done(); builder.done();
} }
} }

4
tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
View File

@ -111,7 +111,7 @@ class TDTestCase:
tdSql.checkData(0, 0, 8) tdSql.checkData(0, 0, 8)
tdSql.query("select count(*) from db.stb2") tdSql.query("select count(*) from db.stb2")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 160)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(2, 14, "us") tdSql.checkData(2, 14, "us")
tdSql.execute("reset query cache") tdSql.execute("reset query cache")
@ -128,7 +128,7 @@ class TDTestCase:
tdSql.checkData(0, 0, 8) tdSql.checkData(0, 0, 8)
tdSql.query("select count(*) from db.stb3") tdSql.query("select count(*) from db.stb3")
tdSql.checkData(0, 0, 160) tdSql.checkData(0, 0, 160)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(2, 14, "ns") tdSql.checkData(2, 14, "ns")
tdSql.execute("reset query cache") tdSql.execute("reset query cache")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBigInt.py
View File

@ -97,7 +97,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBinary.py
View File

@ -85,7 +85,7 @@ class TDTestCase:
os.system("%staosdump -i %s" % (binPath, self.tmpdir)) os.system("%staosdump -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBool.py
View File

@ -86,7 +86,7 @@ class TDTestCase:
os.system("%staosdump -i %s" % (binPath, self.tmpdir)) os.system("%staosdump -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeDouble.py
View File

@ -96,7 +96,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeFloat.py
View File

@ -96,7 +96,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeInt.py
View File

@ -92,7 +92,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py
View File

@ -92,7 +92,7 @@ class TDTestCase:
os.system("%staosdump -i %s -g" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -g" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeSmallInt.py
View File

@ -94,7 +94,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeTinyInt.py
View File

@ -94,7 +94,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedBigInt.py
View File

@ -90,7 +90,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedInt.py
View File

@ -90,7 +90,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedSmallInt.py
View File

@ -90,7 +90,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

2
tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedTinyInt.py
View File

@ -90,7 +90,7 @@ class TDTestCase:
os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir)) os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.execute("use db") tdSql.execute("use db")

4
tests/pytest/account/account_create.py
View File

@ -24,11 +24,11 @@ class TDTestCase:
tdSql.init(conn.cursor(), logSql) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.query("show users") tdSql.query("select * from information_schema.ins_users")
rows = tdSql.queryRows rows = tdSql.queryRows
tdSql.execute("create user test PASS 'test' ") tdSql.execute("create user test PASS 'test' ")
tdSql.query("show users") tdSql.query("select * from information_schema.ins_users")
tdSql.checkRows(rows + 1) tdSql.checkRows(rows + 1)
tdSql.error("create user tdenginetdenginetdengine PASS 'test' ") tdSql.error("create user tdenginetdenginetdengine PASS 'test' ")

6
tests/pytest/alter/alter_cacheLastRow.py
View File

@ -41,7 +41,7 @@ class TDTestCase:
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,15,0) tdSql.checkData(0,15,0)
buildPath = self.getBuildPath() buildPath = self.getBuildPath()
if (buildPath == ""): if (buildPath == ""):
@ -68,7 +68,7 @@ class TDTestCase:
for i in range(5): for i in range(5):
#switch lastRow to off and check #switch lastRow to off and check
tdSql.execute('alter database db cachemodel 'none'') tdSql.execute('alter database db cachemodel 'none'')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,15,0) tdSql.checkData(0,15,0)
#run last_row(*) query 500 times #run last_row(*) query 500 times
@ -80,7 +80,7 @@ class TDTestCase:
#switch lastRow to on and check #switch lastRow to on and check
tdSql.execute('alter database db cachemodel 'last_row'') tdSql.execute('alter database db cachemodel 'last_row'')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,15,1) tdSql.checkData(0,15,1)
#run last_row(*) query 500 times #run last_row(*) query 500 times

4
tests/pytest/alter/alter_create_exception.py
View File

@ -49,7 +49,7 @@ class TDTestCase:
tdSql.error('create database db keep "3650"') tdSql.error('create database db keep "3650"')
tdSql.error('create database db wal_fsync_period "3650"') tdSql.error('create database db wal_fsync_period "3650"')
tdSql.execute('create database db precision "us"') tdSql.execute('create database db precision "us"')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,16,'us') tdSql.checkData(0,16,'us')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
@ -79,7 +79,7 @@ class TDTestCase:
tdSql.error('alter database db keep ,,60,') tdSql.error('alter database db keep ,,60,')
tdSql.error('alter database db keep \t') tdSql.error('alter database db keep \t')
tdSql.execute('alter database db keep \t50') tdSql.execute('alter database db keep \t50')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'50,50,50') tdSql.checkData(0,7,'50,50,50')
def stop(self): def stop(self):

2
tests/pytest/alter/alter_debugFlag.py
View File

@ -37,7 +37,7 @@ class TDTestCase:
if randomFlag != 131 and randomFlag != 135 and randomFlag != 143: if randomFlag != 131 and randomFlag != 135 and randomFlag != 143:
tdSql.error("alter local %s %d" % (flag, randomFlag)) tdSql.error("alter local %s %d" % (flag, randomFlag))
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
dnodeId = tdSql.getData(0, 0) dnodeId = tdSql.getData(0, 0)
for flag in flagList: for flag in flagList:

30
tests/pytest/alter/alter_keep.py
View File

@ -27,12 +27,12 @@ class TDTestCase:
tdLog.notice('running Keep Test, Community Version') tdLog.notice('running Keep Test, Community Version')
tdLog.notice('running parameter test for keep during create') tdLog.notice('running parameter test for keep during create')
#testing keep parameter during create #testing keep parameter during create
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'3650') tdSql.checkData(0,7,'3650')
tdSql.execute('drop database db') tdSql.execute('drop database db')
tdSql.execute('create database db keep 100') tdSql.execute('create database db keep 100')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'100') tdSql.checkData(0,7,'100')
tdSql.execute('drop database db') tdSql.execute('drop database db')
@ -47,7 +47,7 @@ class TDTestCase:
tdLog.notice('running parameter test for keep during alter') tdLog.notice('running parameter test for keep during alter')
tdSql.execute('alter database db keep 100') tdSql.execute('alter database db keep 100')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'100') tdSql.checkData(0,7,'100')
tdSql.error('alter database db keep ') tdSql.error('alter database db keep ')
@ -55,7 +55,7 @@ class TDTestCase:
tdSql.error('alter database db keep 10,20') tdSql.error('alter database db keep 10,20')
tdSql.error('alter database db keep 10,20,30') tdSql.error('alter database db keep 10,20,30')
tdSql.error('alter database db keep 20,30,40,50') tdSql.error('alter database db keep 20,30,40,50')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'100') tdSql.checkData(0,7,'100')
def alterKeepEnterprise(self): def alterKeepEnterprise(self):
@ -63,22 +63,22 @@ class TDTestCase:
#testing keep parameter during create #testing keep parameter during create
tdLog.notice('running parameter test for keep during create') tdLog.notice('running parameter test for keep during create')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'3650,3650,3650') tdSql.checkData(0,7,'3650,3650,3650')
tdSql.execute('drop database db') tdSql.execute('drop database db')
tdSql.execute('create database db keep 100') tdSql.execute('create database db keep 100')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'100,100,100') tdSql.checkData(0,7,'100,100,100')
tdSql.execute('drop database db') tdSql.execute('drop database db')
tdSql.execute('create database db keep 20, 30') tdSql.execute('create database db keep 20, 30')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'20,30,30') tdSql.checkData(0,7,'20,30,30')
tdSql.execute('drop database db') tdSql.execute('drop database db')
tdSql.execute('create database db keep 30,40,50') tdSql.execute('create database db keep 30,40,50')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'30,40,50') tdSql.checkData(0,7,'30,40,50')
tdSql.execute('drop database db') tdSql.execute('drop database db')
@ -95,15 +95,15 @@ class TDTestCase:
tdLog.notice('running parameter test for keep during alter') tdLog.notice('running parameter test for keep during alter')
tdSql.execute('alter database db keep 10') tdSql.execute('alter database db keep 10')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'10,10,10') tdSql.checkData(0,7,'10,10,10')
tdSql.execute('alter database db keep 20,30') tdSql.execute('alter database db keep 20,30')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'20,30,30') tdSql.checkData(0,7,'20,30,30')
tdSql.execute('alter database db keep 100,200,300') tdSql.execute('alter database db keep 100,200,300')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'100,200,300') tdSql.checkData(0,7,'100,200,300')
tdSql.error('alter database db keep ') tdSql.error('alter database db keep ')
@ -113,7 +113,7 @@ class TDTestCase:
tdSql.error('alter database db keep 100,40,50') tdSql.error('alter database db keep 100,40,50')
tdSql.error('alter database db keep 20,100,50') tdSql.error('alter database db keep 20,100,50')
tdSql.error('alter database db keep 50,60,20') tdSql.error('alter database db keep 50,60,20')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'100,200,300') tdSql.checkData(0,7,'100,200,300')
@ -148,7 +148,7 @@ class TDTestCase:
#test case for TD-4459 and TD-4445 #test case for TD-4459 and TD-4445
tdLog.notice('testing keep will be altered changing from small to big') tdLog.notice('testing keep will be altered changing from small to big')
tdSql.execute('alter database db keep 40,40,40') tdSql.execute('alter database db keep 40,40,40')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'40,40,40') tdSql.checkData(0,7,'40,40,40')
tdSql.error('insert into tb values (now-60d, 10)') tdSql.error('insert into tb values (now-60d, 10)')
tdSql.execute('insert into tb values (now-30d, 10)') tdSql.execute('insert into tb values (now-30d, 10)')
@ -160,7 +160,7 @@ class TDTestCase:
rowNum += 1 rowNum += 1
tdSql.execute('alter database db keep 20,20,20') tdSql.execute('alter database db keep 20,20,20')
tdSql.execute('alter database db keep 40,40,40') tdSql.execute('alter database db keep 40,40,40')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'40,40,40') tdSql.checkData(0,7,'40,40,40')
tdSql.error('insert into tb values (now-60d, 10)') tdSql.error('insert into tb values (now-60d, 10)')
tdSql.execute('insert into tb values (now-30d, 10)') tdSql.execute('insert into tb values (now-30d, 10)')
@ -169,7 +169,7 @@ class TDTestCase:
tdLog.notice('testing keep will be altered changing from big to small') tdLog.notice('testing keep will be altered changing from big to small')
tdSql.execute('alter database db keep 10,10,10') tdSql.execute('alter database db keep 10,10,10')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,7,'10,10,10') tdSql.checkData(0,7,'10,10,10')
tdSql.error('insert into tb values (now-15d, 10)') tdSql.error('insert into tb values (now-15d, 10)')
tdSql.query('select * from tb') tdSql.query('select * from tb')

10
tests/pytest/alter/db_update_options.py
View File

@ -21,7 +21,7 @@ class TDTestCase:
# check default update value # check default update value
sql = "create database if not exists db" sql = "create database if not exists db"
tdSql.execute(sql) tdSql.execute(sql)
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0,16,0) tdSql.checkData(0,16,0)
@ -29,14 +29,14 @@ class TDTestCase:
# check update value # check update value
tdSql.execute(sql) tdSql.execute(sql)
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0,16,1) tdSql.checkData(0,16,1)
sql = "alter database db update 0" sql = "alter database db update 0"
tdSql.execute(sql) tdSql.execute(sql)
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0,16,0) tdSql.checkData(0,16,0)
@ -46,7 +46,7 @@ class TDTestCase:
sql = "alter database db update 100" sql = "alter database db update 100"
tdSql.error(sql) tdSql.error(sql)
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0,16,0) tdSql.checkData(0,16,0)
@ -56,7 +56,7 @@ class TDTestCase:
tdSql.execute('create database db update 1') tdSql.execute('create database db update 1')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0,16,1) tdSql.checkData(0,16,1)

6
tests/pytest/client/alterDatabase.py
View File

@ -29,18 +29,18 @@ class TDTestCase:
tdSql.checkData(0, 0, "db") tdSql.checkData(0, 0, "db")
tdSql.execute("alter database db comp 2") tdSql.execute("alter database db comp 2")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0, 14, 2) tdSql.checkData(0, 14, 2)
tdSql.execute("alter database db keep 365,365,365") tdSql.execute("alter database db keep 365,365,365")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0, 7, "365,365,365") tdSql.checkData(0, 7, "365,365,365")
tdSql.error("alter database db quorum 2") tdSql.error("alter database db quorum 2")
tdSql.execute("alter database db blocks 100") tdSql.execute("alter database db blocks 100")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0, 9, 100) tdSql.checkData(0, 9, 100)

4
tests/pytest/client/client.py
View File

@ -37,7 +37,7 @@ class TDTestCase:
time.sleep(1) time.sleep(1)
ret = tdSql.query('show dnodes') ret = tdSql.query('select * from information_schema.ins_dnodes')
dnodeId = tdSql.getData(0, 0); dnodeId = tdSql.getData(0, 0);
dnodeEndpoint = tdSql.getData(0, 1); dnodeEndpoint = tdSql.getData(0, 1);
@ -47,7 +47,7 @@ class TDTestCase:
time.sleep(1) time.sleep(1)
ret = tdSql.query('show mnodes') ret = tdSql.query('select * from information_schema.ins_mnodes')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0, 2, "master") tdSql.checkData(0, 2, "master")

6
tests/pytest/cluster/killAndRestartDnodesTest.py
View File

@ -30,7 +30,7 @@ class ClusterTestcase:
tdSql.init(ctest.conn.cursor(), False) tdSql.init(ctest.conn.cursor(), False)
nodes.node1.stopTaosd() nodes.node1.stopTaosd()
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.checkData(0, 4, "offline") tdSql.checkData(0, 4, "offline")
tdSql.checkData(1, 4, "ready") tdSql.checkData(1, 4, "ready")
@ -43,7 +43,7 @@ class ClusterTestcase:
tdSql.checkData(2, 4, "ready") tdSql.checkData(2, 4, "ready")
nodes.node2.stopTaosd() nodes.node2.stopTaosd()
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.checkData(0, 4, "ready") tdSql.checkData(0, 4, "ready")
tdSql.checkData(1, 4, "offline") tdSql.checkData(1, 4, "offline")
@ -56,7 +56,7 @@ class ClusterTestcase:
tdSql.checkData(2, 4, "ready") tdSql.checkData(2, 4, "ready")
nodes.node3.stopTaosd() nodes.node3.stopTaosd()
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.checkData(0, 4, "ready") tdSql.checkData(0, 4, "ready")
tdSql.checkData(1, 4, "ready") tdSql.checkData(1, 4, "ready")

2
tests/pytest/cluster/offlineThresholdTest.py
View File

@ -33,7 +33,7 @@ class ClusterTestcase:
nodes.node3.stopTaosd() nodes.node3.stopTaosd()
tdLog.sleep(10) tdLog.sleep(10)
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.checkData(2, 4, "offline") tdSql.checkData(2, 4, "offline")

2
tests/pytest/cluster/oneReplicaOfflineTest.py
View File

@ -55,7 +55,7 @@ class ClusterTestcase:
tdSql.execute("drop database %s" % ctest.dbName) tdSql.execute("drop database %s" % ctest.dbName)
nodes.node2.startTaosd() nodes.node2.startTaosd()
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(0) tdSql.checkRows(0)
tdSql.close() tdSql.close()

8
tests/pytest/cluster/stopAllDnodesTest.py
View File

@ -26,19 +26,19 @@ class ClusterTestcase:
ctest = ClusterTest(nodes.node1.hostName) ctest = ClusterTest(nodes.node1.hostName)
tdSql.init(ctest.conn.cursor(), False) tdSql.init(ctest.conn.cursor(), False)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
count = tdSql.queryRows; count = tdSql.queryRows;
nodes.stopAllTaosd() nodes.stopAllTaosd()
nodes.node1.startTaosd() nodes.node1.startTaosd()
tdSql.error("show databases") tdSql.error("select * from information_schema.ins_databases")
nodes.node2.startTaosd() nodes.node2.startTaosd()
tdSql.error("show databases") tdSql.error("select * from information_schema.ins_databases")
nodes.node3.startTaosd() nodes.node3.startTaosd()
tdLog.sleep(10) tdLog.sleep(10)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(count) tdSql.checkRows(count)
ct = ClusterTestcase() ct = ClusterTestcase()

8
tests/pytest/cluster/stopTwoDnodesTest.py
View File

@ -29,19 +29,19 @@ class ClusterTestcase:
ctest.run() ctest.run()
tdSql.init(ctest.conn.cursor(), False) tdSql.init(ctest.conn.cursor(), False)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
count = tdSql.queryRows; count = tdSql.queryRows;
tdSql.execute("use %s" % ctest.dbName) tdSql.execute("use %s" % ctest.dbName)
tdSql.execute("alter database %s replica 3" % ctest.dbName) tdSql.execute("alter database %s replica 3" % ctest.dbName)
nodes.node2.stopTaosd() nodes.node2.stopTaosd()
nodes.node3.stopTaosd() nodes.node3.stopTaosd()
tdSql.error("show databases") tdSql.error("select * from information_schema.ins_databases")
nodes.node2.startTaosd() nodes.node2.startTaosd()
tdSql.error("show databases") tdSql.error("select * from information_schema.ins_databases")
nodes.node3.startTaosd() nodes.node3.startTaosd()
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(count) tdSql.checkRows(count)
ct = ClusterTestcase() ct = ClusterTestcase()

6
tests/pytest/crash_gen/crash_gen_main.py
View File

@ -996,7 +996,7 @@ class StateMechine:
return # do nothing return # do nothing
# this should show up in the server log, separating steps # this should show up in the server log, separating steps
dbc.execute("show dnodes") dbc.execute("select * from information_schema.ins_dnodes")
# Generic Checks, first based on the start state # Generic Checks, first based on the start state
if not Config.getConfig().ignore_errors: # verify state, only if we are asked not to ignore certain errors. if not Config.getConfig().ignore_errors: # verify state, only if we are asked not to ignore certain errors.
@ -2042,7 +2042,7 @@ class TaskRestartService(StateTransitionTask):
if Dice.throw(self.CHANCE_TO_RESTART_SERVICE) == 0: # 1 in N chance if Dice.throw(self.CHANCE_TO_RESTART_SERVICE) == 0: # 1 in N chance
dbc = wt.getDbConn() dbc = wt.getDbConn()
dbc.execute("show databases") # simple delay, align timing with other workers dbc.execute("select * from information_schema.ins_databases") # simple delay, align timing with other workers
gSvcMgr.restart() gSvcMgr.restart()
self._isRunning = False self._isRunning = False
@ -2335,7 +2335,7 @@ class ClientManager:
# def _printLastNumbers(self): # to verify data durability # def _printLastNumbers(self): # to verify data durability
# dbManager = DbManager() # dbManager = DbManager()
# dbc = dbManager.getDbConn() # dbc = dbManager.getDbConn()
# if dbc.query("show databases") <= 1: # no database (we have a default called "log") # if dbc.query("select * from information_schema.ins_databases") <= 1: # no database (we have a default called "log")
# return # return
# dbc.execute("use db") # dbc.execute("use db")
# if dbc.query("show tables") == 0: # no tables # if dbc.query("show tables") == 0: # no tables

4
tests/pytest/crash_gen/service_manager.py
View File

@ -185,7 +185,7 @@ quorum 2
return ["exec " + self.getExecFile(), '-c', self.getCfgDir()] # used in subproce.Popen() return ["exec " + self.getExecFile(), '-c', self.getCfgDir()] # used in subproce.Popen()
def _getDnodes(self, dbc): def _getDnodes(self, dbc):
dbc.query("show dnodes") dbc.query("select * from information_schema.ins_dnodes")
cols = dbc.getQueryResult() # id,end_point,vnodes,cores,status,role,create_time,offline reason cols = dbc.getQueryResult() # id,end_point,vnodes,cores,status,role,create_time,offline reason
return {c[1]:c[4] for c in cols} # {'xxx:6030':'ready', 'xxx:6130':'ready'} return {c[1]:c[4] for c in cols} # {'xxx:6030':'ready', 'xxx:6130':'ready'}
@ -768,7 +768,7 @@ class ServiceManagerThread:
def _verifyDnode(self, tInst: TdeInstance): def _verifyDnode(self, tInst: TdeInstance):
dbc = DbConn.createNative(tInst.getDbTarget()) dbc = DbConn.createNative(tInst.getDbTarget())
dbc.open() dbc.open()
dbc.query("show dnodes") dbc.query("select * from information_schema.ins_dnodes")
# dbc.query("DESCRIBE {}.{}".format(dbName, self._stName)) # dbc.query("DESCRIBE {}.{}".format(dbName, self._stName))
cols = dbc.getQueryResult() # id,end_point,vnodes,cores,status,role,create_time,offline reason cols = dbc.getQueryResult() # id,end_point,vnodes,cores,status,role,create_time,offline reason
# ret = {row[0]:row[1] for row in stCols if row[3]=='TAG'} # name:type # ret = {row[0]:row[1] for row in stCols if row[3]=='TAG'} # name:type

4
tests/pytest/crash_gen/shared/db.py
View File

@ -114,7 +114,7 @@ class DbConn:
def existsDatabase(self, dbName: str): def existsDatabase(self, dbName: str):
''' Check if a certain database exists ''' ''' Check if a certain database exists '''
self.query("show databases") self.query("select * from information_schema.ins_databases")
dbs = [v[0] for v in self.getQueryResult()] # ref: https://stackoverflow.com/questions/643823/python-list-transformation dbs = [v[0] for v in self.getQueryResult()] # ref: https://stackoverflow.com/questions/643823/python-list-transformation
# ret2 = dbName in dbs # ret2 = dbName in dbs
# print("dbs = {}, str = {}, ret2={}, type2={}".format(dbs, dbName,ret2, type(dbName))) # print("dbs = {}, str = {}, ret2={}, type2={}".format(dbs, dbName,ret2, type(dbName)))
@ -157,7 +157,7 @@ class DbConn:
def getResultCols(self): def getResultCols(self):
raise RuntimeError("Unexpected execution, should be overriden") raise RuntimeError("Unexpected execution, should be overriden")
# Sample: curl -u root:taosdata -d "show databases" localhost:6020/rest/sql # Sample: curl -u root:taosdata -d "select * from information_schema.ins_databases" localhost:6020/rest/sql
class DbConnRest(DbConn): class DbConnRest(DbConn):

4
tests/pytest/dbmgmt/database-name-boundary.py
View File

@ -47,7 +47,7 @@ class TDTestCase:
tdLog.info('create database %s' % db_name) tdLog.info('create database %s' % db_name)
tdSql.execute('create database %s' % db_name) tdSql.execute('create database %s' % db_name)
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0, 0, db_name.lower()) tdSql.checkData(0, 0, db_name.lower())
@ -57,7 +57,7 @@ class TDTestCase:
tdLog.info('create database %s' % db_name) tdLog.info('create database %s' % db_name)
tdSql.execute('create database %s' % db_name) tdSql.execute('create database %s' % db_name)
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkRows(2) tdSql.checkRows(2)
tdSql.checkData(0, 0, db_name.lower()) tdSql.checkData(0, 0, db_name.lower())

2
tests/pytest/dbmgmt/nanoSecondCheck.py
View File

@ -32,7 +32,7 @@ class TDTestCase:
tdSql.execute('reset query cache') tdSql.execute('reset query cache')
tdSql.execute('drop database if exists db') tdSql.execute('drop database if exists db')
tdSql.execute('create database db precision "ns";') tdSql.execute('create database db precision "ns";')
tdSql.query('show databases;') tdSql.query('select * from information_schema.ins_databases;')
tdSql.checkData(0,16,'ns') tdSql.checkData(0,16,'ns')
tdSql.execute('use db') tdSql.execute('use db')

14
tests/pytest/functions/queryTestCases.py
View File

@ -68,7 +68,7 @@ class TDTestCase:
tdSql.query("show variables") tdSql.query("show variables")
tdSql.checkData(26, 1, -1) tdSql.checkData(26, 1, -1)
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)
@ -269,7 +269,7 @@ class TDTestCase:
tdSql.execute("create database if not exists db") tdSql.execute("create database if not exists db")
tdSql.query("show variables") tdSql.query("show variables")
tdSql.checkData(38, 1, 3650) tdSql.checkData(38, 1, 3650)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0,7,"3650,3650,3650") tdSql.checkData(0,7,"3650,3650,3650")
days = tdSql.getData(0, 6) days = tdSql.getData(0, 6)
@ -288,12 +288,12 @@ class TDTestCase:
tdSql.error("alter database db keep0 36500") tdSql.error("alter database db keep0 36500")
tdSql.execute("alter database db keep 36500") tdSql.execute("alter database db keep 36500")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0, 7, "3650,3650,36500") tdSql.checkData(0, 7, "3650,3650,36500")
tdSql.execute("drop database if exists db") tdSql.execute("drop database if exists db")
tdSql.execute("create database if not exists db1") tdSql.execute("create database if not exists db1")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0, 7, "3650,3650,3650") tdSql.checkData(0, 7, "3650,3650,3650")
tdSql.query("show variables") tdSql.query("show variables")
tdSql.checkData(38, 1, 3650) tdSql.checkData(38, 1, 3650)
@ -311,7 +311,7 @@ class TDTestCase:
maxTablesPerVnode = 10 maxTablesPerVnode = 10
maxVgroupsPerDb = 100 maxVgroupsPerDb = 100
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)
@ -334,7 +334,7 @@ class TDTestCase:
for i in range(100): for i in range(100):
tdSql.execute(f"create table db.t1{i} using db.stb1 tags({i})") tdSql.execute(f"create table db.t1{i} using db.stb1 tags({i})")
insert_sql += f" t1{i} values({1604298064000 + i*1000}, {i})" insert_sql += f" t1{i} values({1604298064000 + i*1000}, {i})"
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
vnode_count = tdSql.getData(0, 2) vnode_count = tdSql.getData(0, 2)
if vnode_count <= 1: if vnode_count <= 1:
tdLog.exit("vnode is less than 2") tdLog.exit("vnode is less than 2")
@ -443,7 +443,7 @@ class TDTestCase:
# f50, f51, f52, f53 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4) # f50, f51, f52, f53 = tdSql.getData(0,1), tdSql.getData(0,2), tdSql.getData(0,3), tdSql.getData(0,4)
# 关闭服务并获取未开启压缩情况下的数据容量 # 关闭服务并获取未开启压缩情况下的数据容量
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)

6
tests/pytest/insert/date.py
View File

@ -174,9 +174,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

4
tests/pytest/insert/insert_locking.py
View File

@ -33,7 +33,7 @@ class TDTestCase:
tdLog.info("\n\n----------step1 : drop db and create db----------\n") tdLog.info("\n\n----------step1 : drop db and create db----------\n")
tdSql.execute('''drop database if exists db ;''') tdSql.execute('''drop database if exists db ;''')
tdSql.execute('''create database db ;''') tdSql.execute('''create database db ;''')
sql = '''show databases;''' sql = '''select * from information_schema.ins_databases;'''
tdSql.query(sql) tdSql.query(sql)
tdSql.checkRows(1) tdSql.checkRows(1)
@ -41,7 +41,7 @@ class TDTestCase:
tdSql.execute('''create stable tdSql.execute('''create stable
db.stable_1 (ts timestamp, payload binary(256)) db.stable_1 (ts timestamp, payload binary(256))
tags(t1 binary(16),t2 int);''') tags(t1 binary(16),t2 int);''')
sql = '''show db.stables;''' sql = '''select * from information_schema.ins_stables where db_name = 'db';'''
tdSql.query(sql) tdSql.query(sql)
tdSql.checkRows(1) tdSql.checkRows(1)

4
tests/pytest/manualTest/TD-5114/continueCreateDn.py
View File

@ -46,7 +46,7 @@ class TwoClients:
for i in range(10): for i in range(10):
os.system("taosdemo -f manualTest/TD-5114/insertDataDb3Replica2.json -y ") os.system("taosdemo -f manualTest/TD-5114/insertDataDb3Replica2.json -y ")
# # check data correct # # check data correct
tdSql.execute("show databases") tdSql.execute("select * from information_schema.ins_databases")
tdSql.execute("use db3") tdSql.execute("use db3")
tdSql.query("select count (tbname) from stb0") tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0, 20000) tdSql.checkData(0, 0, 20000)
@ -78,7 +78,7 @@ class TwoClients:
# % (j, self.ts + i*1000, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1)) # % (j, self.ts + i*1000, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
# # check data correct # # check data correct
# tdSql.execute("show databases") # tdSql.execute("select * from information_schema.ins_databases")
# tdSql.execute("use db3") # tdSql.execute("use db3")
# tdSql.query("select count (tbname) from test") # tdSql.query("select count (tbname) from test")
# tdSql.checkData(0, 0, 200) # tdSql.checkData(0, 0, 200)

4
tests/pytest/manualTest/manual_alter_block.py
View File

@ -51,7 +51,7 @@ class TDTestCase:
#alter cache block to 3, then check alter #alter cache block to 3, then check alter
tdSql.execute('alter database db blocks 3') tdSql.execute('alter database db blocks 3')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,9,3) tdSql.checkData(0,9,3)
#run taosdemo to occupy all cache, need to manually check memory consumption #run taosdemo to occupy all cache, need to manually check memory consumption
@ -60,7 +60,7 @@ class TDTestCase:
#alter cache block to 8, then check alter #alter cache block to 8, then check alter
tdSql.execute('alter database db blocks 8') tdSql.execute('alter database db blocks 8')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,9,8) tdSql.checkData(0,9,8)
#run taosdemo to occupy all cache, need to manually check memory consumption #run taosdemo to occupy all cache, need to manually check memory consumption

10
tests/pytest/manualTest/manual_alter_comp.py
View File

@ -71,7 +71,7 @@ class TDTestCase:
#comp is at 14 #comp is at 14
#check disk usage when comp=2 #check disk usage when comp=2
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.execute('alter database db blocks 3') # minimize the data in cache tdSql.execute('alter database db blocks 3') # minimize the data in cache
tdSql.checkData(0,14,2) tdSql.checkData(0,14,2)
os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath) os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
@ -86,10 +86,10 @@ class TDTestCase:
#check disk usage when comp=0 #check disk usage when comp=0
tdSql.prepare() tdSql.prepare()
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,14,2) tdSql.checkData(0,14,2)
tdSql.execute('alter database db comp 0') tdSql.execute('alter database db comp 0')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,14,0) tdSql.checkData(0,14,0)
os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath) os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data") print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data")
@ -103,10 +103,10 @@ class TDTestCase:
#check disk usage when comp=1 #check disk usage when comp=1
tdSql.prepare() tdSql.prepare()
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,14,2) tdSql.checkData(0,14,2)
tdSql.execute('alter database db comp 1') tdSql.execute('alter database db comp 1')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdSql.checkData(0,14,1) tdSql.checkData(0,14,1)
os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath) os.system("%staosdemo -f tools/taosdemoAllTest/manual_block1_comp.json" % binPath)
print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data") print("default location is at /home/bryan/Documents/Github/TDengine/sim/dnode1/data")

2
tests/pytest/perfbenchmark/bug3433.py
View File

@ -224,7 +224,7 @@ class TDTestCase:
self.inserttable(file_create_table) self.inserttable(file_create_table)
tdLog.printNoPrefix("==========step2:check database and stable records") tdLog.printNoPrefix("==========step2:check database and stable records")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkData(0, 2, 2000) tdSql.checkData(0, 2, 2000)
tdSql.execute("use db") tdSql.execute("use db")
tdSql.query("show stables") tdSql.query("show stables")

2
tests/pytest/query/query1970YearsAf.py
View File

@ -235,7 +235,7 @@ class TDTestCase:
self.sqlsquery() self.sqlsquery()
# after wal and sync, check again # after wal and sync, check again
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)
tdDnodes.start(index) tdDnodes.start(index)

2
tests/pytest/query/queryJoin10tables.py
View File

@ -184,7 +184,7 @@ class TDTestCase:
self.queryjointable() self.queryjointable()
# after wal and sync, check again # after wal and sync, check again
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)
tdDnodes.start(index) tdDnodes.start(index)

2
tests/pytest/query/queryStddevWithGroupby.py
View File

@ -54,7 +54,7 @@ class TDTestCase:
self.querysqls() self.querysqls()
tdLog.printNoPrefix("==========step3:after wal,check again") tdLog.printNoPrefix("==========step3:after wal,check again")
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)
tdDnodes.start(index) tdDnodes.start(index)

2
tests/pytest/query/queryTscomputWithNow.py
View File

@ -155,7 +155,7 @@ class TDTestCase:
self.inertnow() self.inertnow()
self.querynow() self.querynow()
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
index = tdSql.getData(0, 0) index = tdSql.getData(0, 0)
tdDnodes.stop(index) tdDnodes.stop(index)
tdDnodes.start(index) tdDnodes.start(index)

4
tests/pytest/query/removeDBAndSTable.py
View File

@ -50,14 +50,14 @@ class TDTestCase:
tdSql.checkData(0, 0, "st_vplu") tdSql.checkData(0, 0, "st_vplu")
tdSql.execute("drop database db") tdSql.execute("drop database db")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0, 0, "db_vplu") tdSql.checkData(0, 0, "db_vplu")
tdDnodes.stopAll() tdDnodes.stopAll()
tdDnodes.start(1) tdDnodes.start(1)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0, 0, "db_vplu") tdSql.checkData(0, 0, "db_vplu")

4
tests/pytest/restful/restful_bind_db1.py
View File

@ -75,10 +75,10 @@ class TDTestCase():
# test with no bind databases # test with no bind databases
sqls = ["show databases;", sqls = ["select * from information_schema.ins_databases;",
"use test", "use test",
"show tables;", "show tables;",
"show dnodes;", "select * from information_schema.ins_dnodes;",
"show vgroups;", "show vgroups;",
"create database db;", "create database db;",
"drop database db;", "drop database db;",

4
tests/pytest/restful/restful_bind_db2.py
View File

@ -60,10 +60,10 @@ class TDTestCase():
# test with no bind databases # test with no bind databases
sqls = ["show databases;", sqls = ["select * from information_schema.ins_databases;",
"use test", "use test",
"show tables;", "show tables;",
"show dnodes;", "select * from information_schema.ins_dnodes;",
"show vgroups;", "show vgroups;",
"create database db;", "create database db;",
"drop database db;", "drop database db;",

2
tests/pytest/stream/test2.py
View File

@ -14,7 +14,7 @@ class TDTestCase:
#for i in range(100): #for i in range(100):
tdSql.prepare() tdSql.prepare()
dbname = tdCom.getLongName(10, "letters") dbname = tdCom.getLongName(10, "letters")
tdSql.execute('show databases') tdSql.execute('select * from information_schema.ins_databases')
tdSql.execute('drop database if exists ttxkbrzmpo') tdSql.execute('drop database if exists ttxkbrzmpo')
tdSql.execute('create database if not exists ttxkbrzmpo vgroups 1') tdSql.execute('create database if not exists ttxkbrzmpo vgroups 1')
tdSql.execute('use ttxkbrzmpo') tdSql.execute('use ttxkbrzmpo')

6
tests/pytest/table/column_num.py
View File

@ -104,9 +104,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

4
tests/pytest/table/db_table.py
View File

@ -34,8 +34,8 @@ class TDTestCase:
tdLog.info('=============== step6') tdLog.info('=============== step6')
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)
# convert end # convert end

6
tests/pytest/tag_lite/3.py
View File

@ -1311,9 +1311,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/4.py
View File

@ -1855,9 +1855,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/5.py
View File

@ -2283,9 +2283,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/6.py
View File

@ -2731,9 +2731,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/add.py
View File

@ -2055,9 +2055,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('sql drop database db') tdLog.info('sql drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/bigint.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/binary.py
View File

@ -565,9 +565,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/binary_binary.py
View File

@ -776,9 +776,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/bool.py
View File

@ -560,9 +560,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/bool_binary.py
View File

@ -770,9 +770,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/bool_int.py
View File

@ -802,9 +802,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/change.py
View File

@ -924,9 +924,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/column.py
View File

@ -176,9 +176,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/commit.py
View File

@ -2300,9 +2300,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/delete.py
View File

@ -1697,9 +1697,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/double.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/filter.py
View File

@ -351,9 +351,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/float.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/int.py
View File

@ -560,9 +560,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/int_binary.py
View File

@ -768,9 +768,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/int_float.py
View File

@ -804,9 +804,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/set.py
View File

@ -875,9 +875,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/smallint.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/tinyint.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/unsignedBigint.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/unsignedInt.py
View File

@ -562,9 +562,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/unsignedSmallint.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

6
tests/pytest/tag_lite/unsignedTinyint.py
View File

@ -561,9 +561,9 @@ class TDTestCase:
# TSIM: sql drop database $db # TSIM: sql drop database $db
tdLog.info('drop database db') tdLog.info('drop database db')
tdSql.execute('drop database db') tdSql.execute('drop database db')
# TSIM: sql show databases # TSIM: sql select * from information_schema.ins_databases
tdLog.info('show databases') tdLog.info('select * from information_schema.ins_databases')
tdSql.query('show databases') tdSql.query('select * from information_schema.ins_databases')
# TSIM: if $rows != 0 then # TSIM: if $rows != 0 then
tdLog.info('tdSql.checkRow(0)') tdLog.info('tdSql.checkRow(0)')
tdSql.checkRows(0) tdSql.checkRows(0)

2
tests/pytest/tools/taosdemoTestWithoutMetric.py
View File

@ -53,7 +53,7 @@ class TDTestCase:
os.system("%staosdemo -N -y -t %d -n %d" % os.system("%staosdemo -N -y -t %d -n %d" %
(binPath, self.numberOfTables, self.numberOfRecords)) (binPath, self.numberOfTables, self.numberOfRecords))
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
for i in range(18): for i in range(18):
print(tdSql.getData(0, i) ) print(tdSql.getData(0, i) )
tdSql.checkData(0, 2, self.numberOfTables) tdSql.checkData(0, 2, self.numberOfTables)

4
tests/pytest/tools/taosdumpTest.py
View File

@ -99,14 +99,14 @@ class TDTestCase:
tdSql.execute("drop database db") tdSql.execute("drop database db")
tdSql.execute("drop database db1") tdSql.execute("drop database db1")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(2) tdSql.checkRows(2)
os.system("%s -i ./taosdumptest/tmp1" % binPath) os.system("%s -i ./taosdumptest/tmp1" % binPath)
os.system("%s -i ./taosdumptest/tmp2" % binPath) os.system("%s -i ./taosdumptest/tmp2" % binPath)
tdSql.execute("use db") tdSql.execute("use db")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(4) tdSql.checkRows(4)
dbresult = tdSql.queryResult dbresult = tdSql.queryResult
# 6--duration,7--keep0,keep1,keep # 6--duration,7--keep0,keep1,keep

6
tests/pytest/tools/taosdumpTest2.py
View File

@ -81,12 +81,12 @@ class TDTestCase:
binPath) binPath)
tdSql.execute("drop database db") tdSql.execute("drop database db")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(2) tdSql.checkRows(2)
os.system("%s -i ./taosdumptest/tmp" % binPath) os.system("%s -i ./taosdumptest/tmp" % binPath)
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(3) tdSql.checkRows(3)
tdSql.checkData(2, 0, 'db') tdSql.checkData(2, 0, 'db')
@ -115,7 +115,7 @@ class TDTestCase:
os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath) os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath)
tdSql.execute("drop database test") tdSql.execute("drop database test")
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(3) tdSql.checkRows(3)
os.system("%s -i ./taosdumptest/tmp -y" % binPath) os.system("%s -i ./taosdumptest/tmp -y" % binPath)

2
tests/pytest/tsdb/tsdbCompCluster.py
View File

@ -131,7 +131,7 @@ class TwoClients:
# check data correct # check data correct
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.execute("use db2") tdSql.execute("use db2")
tdSql.query("select count (tbname) from stb0") tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0, 1) tdSql.checkData(0, 0, 1)

2
tests/pytest/tsdb/tsdbCompClusterReplica2.py
View File

@ -142,7 +142,7 @@ class TwoClients:
tdSql.init(cur2, True) tdSql.init(cur2, True)
# check data correct # check data correct
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
tdSql.execute("use db2") tdSql.execute("use db2")
tdSql.query("select count (tbname) from stb0") tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0, 1) tdSql.checkData(0, 0, 1)

2
tests/pytest/util/cluster.py
View File

@ -72,7 +72,7 @@ class ConfigureyCluster:
tdSql.init(conn.cursor()) tdSql.init(conn.cursor())
count=0 count=0
while count < 5: while count < 5:
tdSql.query("show dnodes") tdSql.query("select * from information_schema.ins_dnodes")
# tdLog.debug(tdSql.queryResult) # tdLog.debug(tdSql.queryResult)
status=0 status=0
for i in range(self.dnodeNums): for i in range(self.dnodeNums):

2
tests/pytest/wal/sdbCompCluster.py
View File

@ -106,7 +106,7 @@ class TwoClients:
tdSql.init(cur2, True) tdSql.init(cur2, True)
# use new wal file to start up tasod # use new wal file to start up tasod
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
for i in range(tdSql.queryRows): for i in range(tdSql.queryRows):
if tdSql.queryResult[i][0]=="db2": if tdSql.queryResult[i][0]=="db2":
assert tdSql.queryResult[i][4]==1 , "replica is wrong" assert tdSql.queryResult[i][4]==1 , "replica is wrong"

2
tests/pytest/wal/sdbCompClusterReplica2.py
View File

@ -116,7 +116,7 @@ class TwoClients:
tdSql.init(cur2, True) tdSql.init(cur2, True)
# use new wal file to start up tasod # use new wal file to start up tasod
tdSql.query("show databases") tdSql.query("select * from information_schema.ins_databases")
for i in range(tdSql.queryRows): for i in range(tdSql.queryRows):
if tdSql.queryResult[i][0]=="db2": if tdSql.queryResult[i][0]=="db2":
assert tdSql.queryResult[i][4]==2 , "replica is wrong" assert tdSql.queryResult[i][4]==2 , "replica is wrong"

12
tests/script/tmp/data.sim
View File

@ -23,7 +23,7 @@ step1:
print ====> dnode not ready! print ====> dnode not ready!
return -1 return -1
endi endi
sql show dnodes sql select * from information_schema.ins_dnodes
print ===> rows: $rows print ===> rows: $rows
print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data00 $data01 $data02 $data03 $data04 $data05
print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data10 $data11 $data12 $data13 $data14 $data15
@ -49,7 +49,7 @@ return
print =============== step2: create database print =============== step2: create database
sql create database db vgroups 1 replica 3 sql create database db vgroups 1 replica 3
sql show databases sql select * from information_schema.ins_databases
if $rows != 3 then if $rows != 3 then
return -1 return -1
endi endi
@ -57,7 +57,7 @@ if $data(db)[4] != 3 then
return -1 return -1
endi endi
sql show dnodes sql select * from information_schema.ins_dnodes
if $data(2)[2] != 1 then if $data(2)[2] != 1 then
return -1 return -1
endi endi
@ -69,7 +69,7 @@ if $data(4)[2] != 1 then
endi endi
# vnodes # vnodes
sql show dnodes sql select * from information_schema.ins_dnodes
if $data(2)[2] != 1 then if $data(2)[2] != 1 then
return -1 return -1
endi endi
@ -118,8 +118,8 @@ sql use db;
sql create table stb (ts timestamp, c int) tags (t int); sql create table stb (ts timestamp, c int) tags (t int);
sql create table t0 using stb tags (0); sql create table t0 using stb tags (0);
sql insert into t0 values(now, 1); sql insert into t0 values(now, 1);
sql show db.stables; sql select * from information_schema.ins_stables where db_name = 'db';
sql show db.tables; sql select * from information_schema.ins_tables where db_name = 'db';
sql show db.vgroups; sql show db.vgroups;
return return

2
tests/script/tmp/monitor.sim
View File

@ -14,7 +14,7 @@ system sh/cfg.sh -n dnode1 -c monitorComp -v 1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sql connect sql connect
print =============== show dnodes print =============== select * from information_schema.ins_dnodes
sql create database db vgroups 2; sql create database db vgroups 2;
sql use db; sql use db;
sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 binary(16)) comment "abd"; sql create table db.stb (ts timestamp, c1 int, c2 binary(4)) tags(t1 int, t2 binary(16)) comment "abd";

2
tests/script/tmp/prepare.sim
View File

@ -35,5 +35,5 @@ sql use db;
sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned); sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned);
sql create table ct1 using stb tags(1000); sql create table ct1 using stb tags(1000);
sql create table ct2 using stb tags(1000) ; sql create table ct2 using stb tags(1000) ;
sql show db.tables; sql select * from information_schema.ins_tables where db_name = 'db';
sql insert into ct1 values(now+0s, 10, 2.0, 3.0); sql insert into ct1 values(now+0s, 10, 2.0, 3.0);

4
tests/script/tmp/r1.sim
View File

@ -17,7 +17,7 @@ step1:
print ====> dnode not ready! print ====> dnode not ready!
return -1 return -1
endi endi
sql show dnodes sql select * from information_schema.ins_dnodes
print ===> rows: $rows print ===> rows: $rows
print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data00 $data01 $data02 $data03 $data04 $data05
print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data10 $data11 $data12 $data13 $data14 $data15
@ -33,7 +33,7 @@ endi
print =============== step2: create database print =============== step2: create database
sql create database db vgroups 1 replica 1 sql create database db vgroups 1 replica 1
sql show databases sql select * from information_schema.ins_databases
if $rows != 3 then if $rows != 3 then
return -1 return -1
endi endi

Some files were not shown because too many files have changed in this diff Show More