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

Merge branch '3.0' of https://github.com/taosdata/TDengine into test/3.0/TD-26290

This commit is contained in:
chenhaoran 2023-09-14 14:34:29 +08:00
parent 686c821e45 8654012d9a
commit 43354b0107
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/12-taos-sql/24-show.md
View File

@ -384,7 +384,7 @@ Shows information about all vgroups in the current database.
## SHOW VNODES ## SHOW VNODES
```sql ```sql
SHOW VNODES {dnode_id | dnode_endpoint}; SHOW VNODES [ON DNODE dnode_id];
``` ```
Shows information about all vnodes in the system or about the vnodes for a specified dnode. Shows information about all vnodes in the system or about the vnodes for a specified dnode.

2
docs/zh/12-taos-sql/24-show.md
View File

@ -327,7 +327,7 @@ SHOW [db_name.]VGROUPS;
## SHOW VNODES ## SHOW VNODES
```sql ```sql
SHOW VNODES {dnode_id | dnode_endpoint}; SHOW VNODES [ON DNODE dnode_id];
``` ```
显示当前系统中所有 VNODE 或某个 DNODE 的 VNODE 的信息。 显示当前系统中所有 VNODE 或某个 DNODE 的 VNODE 的信息。

4
source/common/src/systable.c
View File

@ -326,7 +326,7 @@ static const SSysTableMeta infosMeta[] = {
{TSDB_INS_TABLE_TAGS, userTagsSchema, tListLen(userTagsSchema), false}, {TSDB_INS_TABLE_TAGS, userTagsSchema, tListLen(userTagsSchema), false},
{TSDB_INS_TABLE_COLS, userColsSchema, tListLen(userColsSchema), false}, {TSDB_INS_TABLE_COLS, userColsSchema, tListLen(userColsSchema), false},
// {TSDB_INS_TABLE_TABLE_DISTRIBUTED, userTblDistSchema, tListLen(userTblDistSchema)}, // {TSDB_INS_TABLE_TABLE_DISTRIBUTED, userTblDistSchema, tListLen(userTblDistSchema)},
{TSDB_INS_TABLE_USERS, userUsersSchema, tListLen(userUsersSchema), false}, {TSDB_INS_TABLE_USERS, userUsersSchema, tListLen(userUsersSchema), true},
{TSDB_INS_TABLE_LICENCES, grantsSchema, tListLen(grantsSchema), true}, {TSDB_INS_TABLE_LICENCES, grantsSchema, tListLen(grantsSchema), true},
{TSDB_INS_TABLE_VGROUPS, vgroupsSchema, tListLen(vgroupsSchema), true}, {TSDB_INS_TABLE_VGROUPS, vgroupsSchema, tListLen(vgroupsSchema), true},
{TSDB_INS_TABLE_CONFIGS, configSchema, tListLen(configSchema), false}, {TSDB_INS_TABLE_CONFIGS, configSchema, tListLen(configSchema), false},
@ -336,7 +336,7 @@ static const SSysTableMeta infosMeta[] = {
{TSDB_INS_TABLE_STREAMS, streamSchema, tListLen(streamSchema), false}, {TSDB_INS_TABLE_STREAMS, streamSchema, tListLen(streamSchema), false},
{TSDB_INS_TABLE_STREAM_TASKS, streamTaskSchema, tListLen(streamTaskSchema), false}, {TSDB_INS_TABLE_STREAM_TASKS, streamTaskSchema, tListLen(streamTaskSchema), false},
{TSDB_INS_TABLE_VNODES, vnodesSchema, tListLen(vnodesSchema), true}, {TSDB_INS_TABLE_VNODES, vnodesSchema, tListLen(vnodesSchema), true},
{TSDB_INS_TABLE_USER_PRIVILEGES, userUserPrivilegesSchema, tListLen(userUserPrivilegesSchema), false}, {TSDB_INS_TABLE_USER_PRIVILEGES, userUserPrivilegesSchema, tListLen(userUserPrivilegesSchema), true},
}; };
static const SSysDbTableSchema connectionsSchema[] = { static const SSysDbTableSchema connectionsSchema[] = {

9
source/dnode/mnode/impl/src/mndInfoSchema.c
View File

@ -76,12 +76,19 @@ int32_t mndBuildInsTableSchema(SMnode *pMnode, const char *dbFName, const char *
} }
STableMetaRsp *pMeta = taosHashGet(pMnode->infosMeta, tbName, strlen(tbName)); STableMetaRsp *pMeta = taosHashGet(pMnode->infosMeta, tbName, strlen(tbName));
if (NULL == pMeta || (!sysinfo && pMeta->sysInfo)) { if (NULL == pMeta) {
mError("invalid information schema table name:%s", tbName); mError("invalid information schema table name:%s", tbName);
terrno = TSDB_CODE_MND_INVALID_SYS_TABLENAME; terrno = TSDB_CODE_MND_INVALID_SYS_TABLENAME;
return -1; return -1;
} }
if (!sysinfo && pMeta->sysInfo) {
mError("no permission to get schema of table name:%s", tbName);
terrno = TSDB_CODE_PAR_PERMISSION_DENIED;
return -1;
}
*pRsp = *pMeta; *pRsp = *pMeta;
pRsp->pSchemas = taosMemoryCalloc(pMeta->numOfColumns, sizeof(SSchema)); pRsp->pSchemas = taosMemoryCalloc(pMeta->numOfColumns, sizeof(SSchema));

3
tests/script/tsim/user/privilege_sysinfo.sim
View File

@ -154,13 +154,14 @@ sql_error select * from information_schema.ins_mnodes
sql_error select * from information_schema.ins_modules sql_error select * from information_schema.ins_modules
sql_error select * from information_schema.ins_qnodes sql_error select * from information_schema.ins_qnodes
sql_error select * from information_schema.ins_cluster sql_error select * from information_schema.ins_cluster
sql_error select * from information_schema.ins_users
sql_error select * from information_schema.ins_user_privilege
sql select * from information_schema.ins_databases sql select * from information_schema.ins_databases
sql select * from information_schema.ins_functions sql select * from information_schema.ins_functions
sql select * from information_schema.ins_indexes sql select * from information_schema.ins_indexes
sql select * from information_schema.ins_stables sql select * from information_schema.ins_stables
sql select * from information_schema.ins_tables sql select * from information_schema.ins_tables
sql select * from information_schema.ins_tags sql select * from information_schema.ins_tags
sql select * from information_schema.ins_users
sql select * from information_schema.ins_topics sql select * from information_schema.ins_topics
sql select * from information_schema.ins_subscriptions sql select * from information_schema.ins_subscriptions
sql select * from information_schema.ins_streams sql select * from information_schema.ins_streams