Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
cf1ae56e
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,发现更多精彩内容 >>
提交
cf1ae56e
编写于
11月 13, 2019
作者:
H
hjxilinx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TBASE-1112], and refactor some code.
上级
ce863c00
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
8 deletion
+9
-8
src/client/src/tscServer.c
src/client/src/tscServer.c
+5
-4
src/inc/taosmsg.h
src/inc/taosmsg.h
+1
-1
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+1
-1
src/system/detail/src/mgmtShell.c
src/system/detail/src/mgmtShell.c
+2
-2
未找到文件。
src/client/src/tscServer.c
浏览文件 @
cf1ae56e
...
...
@@ -2460,10 +2460,10 @@ int tscBuildRetrieveFromMgmtMsg(SSqlObj *pSql) {
pMsg
+=
sizeof
(
SMgmtHead
);
*
((
uint64_t
*
)
pMsg
)
=
pSql
->
res
.
qhandle
;
*
((
uint64_t
*
)
pMsg
)
=
pSql
->
res
.
qhandle
;
pMsg
+=
sizeof
(
pSql
->
res
.
qhandle
);
*
pMsg
=
htons
(
pCmd
->
type
);
*
((
uint16_t
*
)
pMsg
)
=
htons
(
pCmd
->
type
);
pMsg
+=
sizeof
(
pCmd
->
type
);
msgLen
=
pMsg
-
pStart
;
...
...
@@ -3451,11 +3451,12 @@ int tscProcessRetrieveRspFromVnode(SSqlObj *pSql) {
pRes
->
row
=
0
;
/**
* If the query result is exhausted,
the connection will be recycled.
*
If current query is to free resource at server side, the connection will be recycle
.
* If the query result is exhausted,
or current query is to free resource at server side,
*
the connection will be recycled
.
*/
if
((
pRes
->
numOfRows
==
0
&&
!
(
tscProjectionQueryOnMetric
(
pCmd
)
&&
pRes
->
offset
>
0
))
||
((
pCmd
->
type
&
TSDB_QUERY_TYPE_FREE_RESOURCE
)
==
TSDB_QUERY_TYPE_FREE_RESOURCE
))
{
tscTrace
(
"%p no result or free resource, recycle connection"
,
pSql
);
taosAddConnIntoCache
(
tscConnCache
,
pSql
->
thandle
,
pSql
->
ip
,
pSql
->
vnode
,
pObj
->
user
);
pSql
->
thandle
=
NULL
;
}
else
{
...
...
src/inc/taosmsg.h
浏览文件 @
cf1ae56e
...
...
@@ -673,7 +673,7 @@ typedef struct {
typedef
struct
{
uint64_t
qhandle
;
int16_t
free
;
uint16_t
free
;
}
SRetrieveMeterMsg
;
typedef
struct
{
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
cf1ae56e
...
...
@@ -846,7 +846,7 @@ void shellGetGrantInfo(void *con) {
TAOS_FIELD
*
fields
=
taos_fetch_fields
(
result
);
TAOS_ROW
row
=
taos_fetch_row
(
result
);
if
(
row
==
NULL
)
{
fprintf
(
stderr
,
"
\n
Grant information is empty
.
\n
"
);
fprintf
(
stderr
,
"
\n
Failed to grant information from server. Abort
.
\n
"
);
exit
(
0
);
}
...
...
src/system/detail/src/mgmtShell.c
浏览文件 @
cf1ae56e
...
...
@@ -873,7 +873,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
taosSendSimpleRsp
(
pConn
->
thandle
,
TSDB_MSG_TYPE_RETRIEVE_RSP
,
TSDB_CODE_MEMORY_CORRUPTED
);
return
-
1
;
}
else
{
if
((
pRetrieve
->
free
&
TSDB_QUERY_TYPE_FREE_RESOURCE
)
==
0
)
{
if
((
pRetrieve
->
free
&
TSDB_QUERY_TYPE_FREE_RESOURCE
)
!=
TSDB_QUERY_TYPE_FREE_RESOURCE
)
{
rowsToRead
=
pShow
->
numOfRows
-
pShow
->
numOfReads
;
}
...
...
@@ -905,7 +905,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
pMsg
=
pRsp
->
data
;
// if free flag is set, client wants to clean the resources
if
((
pRetrieve
->
free
&
TSDB_QUERY_TYPE_FREE_RESOURCE
)
==
0
)
if
((
pRetrieve
->
free
&
TSDB_QUERY_TYPE_FREE_RESOURCE
)
!=
TSDB_QUERY_TYPE_FREE_RESOURCE
)
rowsRead
=
(
*
mgmtRetrieveFp
[
pShow
->
type
])(
pShow
,
pRsp
->
data
,
rowsToRead
,
pConn
);
if
(
rowsRead
<
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录