Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
cfeb5f2b
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1185
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
cfeb5f2b
编写于
6月 02, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update restful interface while taosc interface changed
上级
1a5138b3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
11 deletion
+18
-11
src/plugins/http/src/httpSql.c
src/plugins/http/src/httpSql.c
+18
-11
未找到文件。
src/plugins/http/src/httpSql.c
浏览文件 @
cfeb5f2b
...
...
@@ -58,10 +58,10 @@ void httpProcessMultiSqlRetrieveCallBack(void *param, TAOS_RES *result, int numO
if
(
numOfRows
<
0
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, retrieve failed code:%s, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
tstrerror
(
numOfRows
),
sql
);
}
else
{
taos_free_result
(
result
);
}
}
taos_free_result
(
result
);
if
(
singleCmd
->
cmdReturnType
==
HTTP_CMD_RETURN_TYPE_WITH_RETURN
&&
encode
->
stopJsonFp
)
{
(
encode
->
stopJsonFp
)(
pContext
,
singleCmd
);
}
...
...
@@ -103,12 +103,15 @@ void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
}
multiCmds
->
pos
++
;
httpProcessMultiSql
(
pContext
);
taos_free_result
(
result
);
return
;
}
if
(
result
==
NULL
)
{
int
num_fields
=
taos_field_count
(
result
);
if
(
num_fields
==
0
)
{
// not select or show commands
int
affectRows
=
code
;
int
affectRows
=
taos_affected_rows
(
result
)
;
httpTrace
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, affect rows:%d, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
multiCmds
->
pos
,
affectRows
,
sql
);
...
...
@@ -132,6 +135,7 @@ void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
multiCmds
->
pos
++
;
}
taos_free_result
(
result
);
httpProcessMultiSql
(
pContext
);
}
else
{
httpTrace
(
"context:%p, fd:%d, ip:%s, user:%s, process pos:%d, start retrieve, sql:%s"
,
...
...
@@ -212,9 +216,9 @@ void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int num
if
(
numOfRows
<
0
)
{
httpError
(
"context:%p, fd:%d, ip:%s, user:%s, retrieve failed, code:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
tstrerror
(
numOfRows
));
}
else
{
taos_free_result
(
result
);
}
}
taos_free_result
(
result
);
if
(
encode
->
stopJsonFp
)
{
(
encode
->
stopJsonFp
)(
pContext
,
&
pContext
->
singleCmd
);
...
...
@@ -247,12 +251,14 @@ void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
pContext
->
session
->
taos
,
tstrerror
(
code
),
pObj
);
httpSendTaosdErrorResp
(
pContext
,
code
);
}
taos_free_result
(
result
);
return
;
}
if
(
result
==
NULL
)
{
int
num_fields
=
taos_field_count
(
result
);
if
(
num_fields
==
0
)
{
// not select or show commands
int
affectRows
=
code
;
int
affectRows
=
taos_affected_rows
(
result
)
;
httpTrace
(
"context:%p, fd:%d, ip:%s, user:%s, affect rows:%d, stop query, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
user
,
affectRows
,
result
);
...
...
@@ -269,6 +275,7 @@ void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
(
encode
->
stopJsonFp
)(
pContext
,
&
pContext
->
singleCmd
);
}
taos_free_result
(
result
);
httpCloseContextByApp
(
pContext
);
}
else
{
httpTrace
(
"context:%p, fd:%d, ip:%s, user:%s, start retrieve"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录