Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
86d78a29
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
86d78a29
编写于
11月 10, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-2044
上级
a5fdb787
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
44 addition
and
33 deletion
+44
-33
src/plugins/http/inc/httpQueue.h
src/plugins/http/inc/httpQueue.h
+3
-1
src/plugins/http/src/httpQueue.c
src/plugins/http/src/httpQueue.c
+13
-9
src/plugins/http/src/httpSql.c
src/plugins/http/src/httpSql.c
+28
-23
未找到文件。
src/plugins/http/inc/httpQueue.h
浏览文件 @
86d78a29
...
...
@@ -22,9 +22,11 @@ extern "C" {
#include <stdint.h>
typedef
void
(
*
FHttpResultFp
)(
void
*
param
,
void
*
result
,
int32_t
code
,
int32_t
rows
);
bool
httpInitResultQueue
();
void
httpCleanupResultQueue
();
void
httpDispatchToResultQueue
();
void
httpDispatchToResultQueue
(
void
*
param
,
TAOS_RES
*
result
,
int32_t
code
,
int32_t
rows
,
FHttpResultFp
fp
);
#ifdef __cplusplus
}
...
...
src/plugins/http/src/httpQueue.c
浏览文件 @
86d78a29
...
...
@@ -25,6 +25,7 @@
#include "httpResp.h"
#include "httpAuth.h"
#include "httpSession.h"
#include "httpQueue.h"
typedef
struct
{
pthread_t
thread
;
...
...
@@ -37,26 +38,28 @@ typedef struct {
}
SHttpWorkerPool
;
typedef
struct
{
void
*
param
;
void
*
result
;
int32_t
numOfRows
;
void
(
*
fp
)(
void
*
param
,
void
*
result
,
int32_t
numOfRows
);
void
*
param
;
void
*
result
;
int32_t
code
;
int32_t
rows
;
FHttpResultFp
fp
;
}
SHttpResult
;
static
SHttpWorkerPool
tsHttpPool
;
static
taos_qset
tsHttpQset
;
static
taos_queue
tsHttpQueue
;
void
httpDispatchToResultQueue
(
void
*
param
,
TAOS_RES
*
result
,
int32_t
numOfRows
,
void
(
*
fp
)(
void
*
param
,
void
*
result
,
int32_t
numOfRows
)
)
{
void
httpDispatchToResultQueue
(
void
*
param
,
TAOS_RES
*
result
,
int32_t
code
,
int32_t
rows
,
FHttpResultFp
fp
)
{
if
(
tsHttpQueue
!=
NULL
)
{
SHttpResult
*
pMsg
=
taosAllocateQitem
(
sizeof
(
SHttpResult
));
pMsg
->
param
=
param
;
pMsg
->
result
=
result
;
pMsg
->
numOfRows
=
numOfRows
;
pMsg
->
code
=
code
;
pMsg
->
rows
=
rows
;
pMsg
->
fp
=
fp
;
taosWriteQitem
(
tsHttpQueue
,
TAOS_QTYPE_RPC
,
pMsg
);
}
else
{
(
*
fp
)(
param
,
result
,
numOfR
ows
);
(
*
fp
)(
param
,
result
,
code
,
r
ows
);
}
}
...
...
@@ -71,8 +74,9 @@ static void *httpProcessResultQueue(void *param) {
break
;
}
httpTrace
(
"context:%p, res:%p will be processed in result queue"
,
pMsg
->
param
,
pMsg
->
result
);
(
*
pMsg
->
fp
)(
pMsg
->
param
,
pMsg
->
result
,
pMsg
->
numOfRows
);
httpTrace
(
"context:%p, res:%p will be processed in result queue, code:%d rows:%d"
,
pMsg
->
param
,
pMsg
->
result
,
pMsg
->
code
,
pMsg
->
rows
);
(
*
pMsg
->
fp
)(
pMsg
->
param
,
pMsg
->
result
,
pMsg
->
code
,
pMsg
->
rows
);
taosFreeQitem
(
pMsg
);
}
...
...
src/plugins/http/src/httpSql.c
浏览文件 @
86d78a29
...
...
@@ -31,7 +31,7 @@ void httpProcessMultiSql(HttpContext *pContext);
void
httpProcessMultiSqlRetrieveCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
numOfRows
);
void
httpProcessMultiSqlRetrieveCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
numOfRows
)
{
void
httpProcessMultiSqlRetrieveCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
code
,
int
numOfRows
)
{
HttpContext
*
pContext
=
(
HttpContext
*
)
param
;
if
(
pContext
==
NULL
)
return
;
...
...
@@ -43,7 +43,7 @@ void httpProcessMultiSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int n
bool
isContinue
=
false
;
if
(
numOfRows
>
0
)
{
if
(
code
==
TSDB_CODE_SUCCESS
&&
numOfRows
>
0
)
{
if
(
singleCmd
->
cmdReturnType
==
HTTP_CMD_RETURN_TYPE_WITH_RETURN
&&
encode
->
buildQueryJsonFp
)
{
isContinue
=
(
encode
->
buildQueryJsonFp
)(
pContext
,
singleCmd
,
result
,
numOfRows
);
}
...
...
@@ -58,9 +58,9 @@ void httpProcessMultiSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int n
httpDebug
(
"context:%p, fd:%d, user:%s, process pos:%d, stop retrieve, numOfRows:%d, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
multiCmds
->
pos
,
numOfRows
,
sql
);
if
(
numOfRows
<
0
)
{
if
(
code
<
0
)
{
httpError
(
"context:%p, fd:%d, user:%s, process pos:%d, retrieve failed code:%s, sql:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
multiCmds
->
pos
,
tstrerror
(
numOfRows
),
sql
);
pContext
->
user
,
multiCmds
->
pos
,
tstrerror
(
code
),
sql
);
}
taos_free_result
(
result
);
...
...
@@ -74,14 +74,14 @@ void httpProcessMultiSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int n
}
void
httpProcessMultiSqlRetrieveCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
numOfRows
)
{
httpDispatchToResultQueue
(
param
,
result
,
numOfRows
,
httpProcessMultiSqlRetrieveCallBackImp
);
int32_t
code
=
taos_errno
(
result
);
httpDispatchToResultQueue
(
param
,
result
,
code
,
numOfRows
,
httpProcessMultiSqlRetrieveCallBackImp
);
}
void
httpProcessMultiSqlCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
code
)
{
void
httpProcessMultiSqlCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
code
,
int
affectRowsInput
)
{
HttpContext
*
pContext
=
(
HttpContext
*
)
param
;
if
(
pContext
==
NULL
)
return
;
code
=
taos_errno
(
result
);
HttpSqlCmds
*
multiCmds
=
pContext
->
multiCmds
;
HttpEncodeMethod
*
encode
=
pContext
->
encodeMethod
;
...
...
@@ -94,7 +94,7 @@ void httpProcessMultiSqlCallBackImp(void *param, TAOS_RES *result, int code) {
return
;
}
if
(
code
<
0
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
encode
->
checkFinishedFp
!=
NULL
&&
!
encode
->
checkFinishedFp
(
pContext
,
singleCmd
,
code
))
{
singleCmd
->
code
=
code
;
httpDebug
(
"context:%p, fd:%d, user:%s, process pos jump to:%d, last code:%s, last sql:%s"
,
pContext
,
pContext
->
fd
,
...
...
@@ -157,7 +157,9 @@ void httpProcessMultiSqlCallBackImp(void *param, TAOS_RES *result, int code) {
}
void
httpProcessMultiSqlCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
unUsedCode
)
{
httpDispatchToResultQueue
(
param
,
result
,
unUsedCode
,
httpProcessMultiSqlCallBackImp
);
int32_t
code
=
taos_errno
(
result
);
int32_t
affectRows
=
taos_affected_rows
(
result
);
httpDispatchToResultQueue
(
param
,
result
,
code
,
affectRows
,
httpProcessMultiSqlCallBackImp
);
}
void
httpProcessMultiSql
(
HttpContext
*
pContext
)
{
...
...
@@ -204,7 +206,7 @@ void httpProcessMultiSqlCmd(HttpContext *pContext) {
void
httpProcessSingleSqlRetrieveCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
numOfRows
);
void
httpProcessSingleSqlRetrieveCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
numOfRows
)
{
void
httpProcessSingleSqlRetrieveCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
code
,
int
numOfRows
)
{
HttpContext
*
pContext
=
(
HttpContext
*
)
param
;
if
(
pContext
==
NULL
)
return
;
...
...
@@ -212,7 +214,7 @@ void httpProcessSingleSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int
bool
isContinue
=
false
;
if
(
numOfRows
>
0
)
{
if
(
code
==
TSDB_CODE_SUCCESS
&&
numOfRows
>
0
)
{
if
(
encode
->
buildQueryJsonFp
)
{
isContinue
=
(
encode
->
buildQueryJsonFp
)(
pContext
,
&
pContext
->
singleCmd
,
result
,
numOfRows
);
}
...
...
@@ -227,9 +229,9 @@ void httpProcessSingleSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int
httpDebug
(
"context:%p, fd:%d, user:%s, stop retrieve, numOfRows:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
numOfRows
);
if
(
numOfRows
<
0
)
{
if
(
code
<
0
)
{
httpError
(
"context:%p, fd:%d, user:%s, retrieve failed, code:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
tstrerror
(
numOfRows
));
tstrerror
(
code
));
}
taos_free_result
(
result
);
...
...
@@ -243,29 +245,29 @@ void httpProcessSingleSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int
}
void
httpProcessSingleSqlRetrieveCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
numOfRows
)
{
httpDispatchToResultQueue
(
param
,
result
,
numOfRows
,
httpProcessSingleSqlRetrieveCallBackImp
);
int32_t
code
=
taos_errno
(
result
);
httpDispatchToResultQueue
(
param
,
result
,
code
,
numOfRows
,
httpProcessSingleSqlRetrieveCallBackImp
);
}
void
httpProcessSingleSqlCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
unUsedCode
)
{
void
httpProcessSingleSqlCallBackImp
(
void
*
param
,
TAOS_RES
*
result
,
int
code
,
int
affectRowsInput
)
{
HttpContext
*
pContext
=
(
HttpContext
*
)
param
;
if
(
pContext
==
NULL
)
return
;
int32_t
code
=
taos_errno
(
result
);
HttpEncodeMethod
*
encode
=
pContext
->
encodeMethod
;
if
(
code
==
TSDB_CODE_TSC_ACTION_IN_PROGRESS
)
{
httpError
(
"context:%p, fd:%d, user:%s, query error, code:%s:inprogress, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
tstrerror
(
code
),
(
SSqlObj
*
)
result
);
pContext
->
user
,
tstrerror
(
code
),
result
);
return
;
}
if
(
code
<
0
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
SSqlObj
*
pObj
=
(
SSqlObj
*
)
result
;
if
(
code
==
TSDB_CODE_TSC_INVALID_SQL
)
{
httpError
(
"context:%p, fd:%d, user:%s, query error, code:%s, sqlObj:%p, error:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
tstrerror
(
code
),
pObj
,
pObj
->
cmd
.
payload
);
httpSendTaosdInvalidSqlErrorResp
(
pContext
,
pObj
->
cmd
.
payload
);
terrno
=
code
;
httpError
(
"context:%p, fd:%d, user:%s, query error, code:%s, sqlObj:%p, error:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
tstrerror
(
code
),
pObj
,
taos_errstr
(
pObj
));
httpSendTaosdInvalidSqlErrorResp
(
pContext
,
taos_errstr
(
pObj
));
}
else
{
httpError
(
"context:%p, fd:%d, user:%s, query error, code:%s, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
tstrerror
(
code
),
pObj
);
...
...
@@ -279,6 +281,7 @@ void httpProcessSingleSqlCallBackImp(void *param, TAOS_RES *result, int unUsedCo
if
(
isUpdate
)
{
// not select or show commands
int
affectRows
=
taos_affected_rows
(
result
);
assert
(
affectRows
==
affectRowsInput
);
httpDebug
(
"context:%p, fd:%d, user:%s, affect rows:%d, stop query, sqlObj:%p"
,
pContext
,
pContext
->
fd
,
pContext
->
user
,
affectRows
,
result
);
...
...
@@ -309,7 +312,9 @@ void httpProcessSingleSqlCallBackImp(void *param, TAOS_RES *result, int unUsedCo
}
void
httpProcessSingleSqlCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
unUsedCode
)
{
httpDispatchToResultQueue
(
param
,
result
,
unUsedCode
,
httpProcessSingleSqlCallBackImp
);
int32_t
code
=
taos_errno
(
result
);
int32_t
affectRows
=
taos_affected_rows
(
result
);
httpDispatchToResultQueue
(
param
,
result
,
code
,
affectRows
,
httpProcessSingleSqlCallBackImp
);
}
void
httpProcessSingleSqlCmd
(
HttpContext
*
pContext
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录