Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
771c2636
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
771c2636
编写于
8月 03, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-5729]<feature>: add subquery states and obj_ids to show queries output
上级
b0b18b51
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
67 addition
and
13 deletion
+67
-13
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+1
-1
src/client/src/tscProfile.c
src/client/src/tscProfile.c
+6
-4
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
src/inc/taosdef.h
src/inc/taosdef.h
+1
-0
src/inc/taosmsg.h
src/inc/taosmsg.h
+3
-0
src/mnode/src/mnodeProfile.c
src/mnode/src/mnodeProfile.c
+55
-7
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
771c2636
...
...
@@ -294,7 +294,7 @@ typedef struct SSqlObj {
SSqlCmd
cmd
;
SSqlRes
res
;
bool
isBind
;
SSubqueryState
subState
;
struct
SSqlObj
**
pSubs
;
...
...
src/client/src/tscProfile.c
浏览文件 @
771c2636
...
...
@@ -255,10 +255,12 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
pQdesc
->
qId
=
htobe64
(
pSql
->
res
.
qId
);
pQdesc
->
sqlObjId
=
htobe64
(
pSql
->
self
);
pQdesc
->
pid
=
pHeartbeat
->
pid
;
if
(
pSql
->
cmd
.
pQueryInfo
->
stableQuery
==
true
)
{
pQdesc
->
numOfSub
=
pSql
->
subState
.
numOfSub
;
}
else
{
pQdesc
->
numOfSub
=
1
;
pQdesc
->
stableQuery
=
pSql
->
cmd
.
pQueryInfo
->
stableQuery
;
pQdesc
->
numOfSub
=
(
pSql
->
subState
.
numOfSub
<=
TSDB_MAX_SUBQUERY_NUM
)
?
pSql
->
subState
.
numOfSub
:
TSDB_MAX_SUBQUERY_NUM
;
for
(
int
i
=
0
;
i
<
pQdesc
->
numOfSub
;
++
i
)
{
pQdesc
->
subSqlStates
[
i
]
=
pSql
->
subState
.
states
[
i
];
pQdesc
->
subSqlObjIds
[
i
]
=
htobe64
(
pSql
->
pSubs
[
i
]
->
self
);
}
pQdesc
->
numOfSub
=
htonl
(
pQdesc
->
numOfSub
);
...
...
src/client/src/tscUtil.c
浏览文件 @
771c2636
...
...
@@ -2141,7 +2141,7 @@ int tscAllocPayload(SSqlCmd* pCmd, int size) {
pCmd
->
payload
=
b
;
pCmd
->
allocSize
=
size
;
}
memset
(
pCmd
->
payload
,
0
,
pCmd
->
allocSize
);
}
...
...
src/inc/taosdef.h
浏览文件 @
771c2636
...
...
@@ -339,6 +339,7 @@ do { \
#define PRIMARYKEY_TIMESTAMP_COL_INDEX 0
#define TSDB_MAX_RPC_THREADS 5
#define TSDB_MAX_SUBQUERY_NUM 10
#define TSDB_QUERY_TYPE_NON_TYPE 0x00u // none type
#define TSDB_QUERY_TYPE_FREE_RESOURCE 0x01u // free qhandle at vnode
...
...
src/inc/taosmsg.h
浏览文件 @
771c2636
...
...
@@ -877,7 +877,10 @@ typedef struct {
uint64_t
sqlObjId
;
int32_t
pid
;
char
fqdn
[
TSDB_FQDN_LEN
];
bool
stableQuery
;
int32_t
numOfSub
;
int8_t
subSqlStates
[
TSDB_MAX_SUBQUERY_NUM
];
int64_t
subSqlObjIds
[
TSDB_MAX_SUBQUERY_NUM
];
}
SQueryDesc
;
typedef
struct
{
...
...
src/mnode/src/mnodeProfile.c
浏览文件 @
771c2636
...
...
@@ -32,7 +32,8 @@
#define CONN_KEEP_TIME (tsShellActivityTimer * 3)
#define CONN_CHECK_TIME (tsShellActivityTimer * 2)
#define QUERY_ID_SIZE 20
#define QUERY_OBJ_ID_SIZE 10
#define QUERY_OBJ_ID_SIZE 18
#define SUBQUERY_INFO_SIZE 6
#define QUERY_STREAM_SAVE_SIZE 20
static
SCacheObj
*
tsMnodeConnCache
=
NULL
;
...
...
@@ -380,12 +381,30 @@ static int32_t mnodeGetQueryMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
1
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_BOOL
;
strcpy
(
pSchema
[
cols
].
name
,
"stable_query"
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
4
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_INT
;
strcpy
(
pSchema
[
cols
].
name
,
"sub_queries"
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
SUBQUERY_INFO_SIZE
*
TSDB_MAX_SUBQUERY_NUM
+
VARSTR_HEADER_SIZE
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_BINARY
;
strcpy
(
pSchema
[
cols
].
name
,
"sub_query_states"
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
(
SUBQUERY_INFO_SIZE
+
QUERY_OBJ_ID_SIZE
)
*
TSDB_MAX_SUBQUERY_NUM
+
VARSTR_HEADER_SIZE
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_BINARY
;
strcpy
(
pSchema
[
cols
].
name
,
"sub_query_obj_ids "
);
pSchema
[
cols
].
bytes
=
htons
(
pShow
->
bytes
[
cols
]);
cols
++
;
pShow
->
bytes
[
cols
]
=
TSDB_SHOW_SQL_LEN
+
VARSTR_HEADER_SIZE
;
pSchema
[
cols
].
type
=
TSDB_DATA_TYPE_BINARY
;
strcpy
(
pSchema
[
cols
].
name
,
"sql"
);
...
...
@@ -459,12 +478,8 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
int64_t
*
)
pWrite
=
htobe64
(
pDesc
->
useconds
);
cols
++
;
/*
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int64_t *)pWrite = htobe64(pDesc->sqlObjId);
cols++;
*/
snprintf
(
str
,
tListLen
(
str
),
"0x%08"
PRIx64
,
htobe64
(
pDesc
->
sqlObjId
));
snprintf
(
str
,
tListLen
(
str
),
"0x%"
PRIx64
,
htobe64
(
pDesc
->
sqlObjId
));
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
STR_WITH_MAXSIZE_TO_VARSTR
(
pWrite
,
str
,
pShow
->
bytes
[
cols
]);
cols
++
;
...
...
@@ -479,10 +494,43 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v
STR_WITH_MAXSIZE_TO_VARSTR
(
pWrite
,
epBuf
,
pShow
->
bytes
[
cols
]);
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
bool
*
)
pWrite
=
pDesc
->
stableQuery
;
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
*
(
int32_t
*
)
pWrite
=
htonl
(
pDesc
->
numOfSub
);
cols
++
;
char
subQInfo
[(
SUBQUERY_INFO_SIZE
+
QUERY_OBJ_ID_SIZE
)
*
TSDB_MAX_SUBQUERY_NUM
]
=
{
0
};
char
*
p
;
int32_t
idx
,
len
;
p
=
subQInfo
;
for
(
idx
=
0
;
idx
<
htonl
(
pDesc
->
numOfSub
);
++
idx
)
{
len
=
snprintf
(
p
,
SUBQUERY_INFO_SIZE
,
"[%d]%d "
,
idx
,
pDesc
->
subSqlStates
[
idx
]);
p
+=
MIN
(
len
,
SUBQUERY_INFO_SIZE
);
}
if
(
idx
==
0
)
{
snprintf
(
p
,
sizeof
(
subQInfo
),
"N/A"
);
}
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
STR_WITH_MAXSIZE_TO_VARSTR
(
pWrite
,
subQInfo
,
pShow
->
bytes
[
cols
]);
cols
++
;
p
=
subQInfo
;
for
(
idx
=
0
;
idx
<
htonl
(
pDesc
->
numOfSub
);
++
idx
)
{
len
=
snprintf
(
p
,
SUBQUERY_INFO_SIZE
+
QUERY_OBJ_ID_SIZE
,
"[%d]0x%"
PRIx64
" "
,
idx
,
htobe64
(
pDesc
->
subSqlObjIds
[
idx
]));
p
+=
MIN
(
len
,
SUBQUERY_INFO_SIZE
+
QUERY_OBJ_ID_SIZE
);
}
if
(
idx
==
0
)
{
snprintf
(
p
,
sizeof
(
subQInfo
),
"N/A"
);
}
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
STR_WITH_MAXSIZE_TO_VARSTR
(
pWrite
,
subQInfo
,
pShow
->
bytes
[
cols
]);
cols
++
;
pWrite
=
data
+
pShow
->
offset
[
cols
]
*
rows
+
pShow
->
bytes
[
cols
]
*
numOfRows
;
STR_WITH_MAXSIZE_TO_VARSTR
(
pWrite
,
pDesc
->
sql
,
pShow
->
bytes
[
cols
]);
cols
++
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录