Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
abfa964f
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
未验证
提交
abfa964f
编写于
8月 25, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
8月 25, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16391 from taosdata/fix/TD-17394
fix: fix json tag err msg
上级
4a3f4850
f8ecbdc8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
5 deletion
+15
-5
source/libs/index/src/indexFilter.c
source/libs/index/src/indexFilter.c
+7
-0
source/libs/transport/src/thttp.c
source/libs/transport/src/thttp.c
+3
-2
source/libs/transport/src/transSvr.c
source/libs/transport/src/transSvr.c
+5
-3
未找到文件。
source/libs/index/src/indexFilter.c
浏览文件 @
abfa964f
...
@@ -255,6 +255,13 @@ static int32_t sifInitOperParams(SIFParam **params, SOperatorNode *node, SIFCtx
...
@@ -255,6 +255,13 @@ static int32_t sifInitOperParams(SIFParam **params, SOperatorNode *node, SIFCtx
if
(
node
->
opType
==
OP_TYPE_JSON_GET_VALUE
)
{
if
(
node
->
opType
==
OP_TYPE_JSON_GET_VALUE
)
{
return
code
;
return
code
;
}
}
if
((
node
->
pLeft
!=
NULL
&&
nodeType
(
node
->
pLeft
)
==
QUERY_NODE_COLUMN
)
&&
(
node
->
pRight
!=
NULL
&&
nodeType
(
node
->
pRight
)
==
QUERY_NODE_VALUE
))
{
SColumnNode
*
cn
=
(
SColumnNode
*
)(
node
->
pLeft
);
if
(
cn
->
node
.
resType
.
type
==
TSDB_DATA_TYPE_JSON
)
{
SIF_ERR_RET
(
TSDB_CODE_QRY_INVALID_INPUT
);
}
}
SIFParam
*
paramList
=
taosMemoryCalloc
(
nParam
,
sizeof
(
SIFParam
));
SIFParam
*
paramList
=
taosMemoryCalloc
(
nParam
,
sizeof
(
SIFParam
));
if
(
NULL
==
paramList
)
{
if
(
NULL
==
paramList
)
{
...
...
source/libs/transport/src/thttp.c
浏览文件 @
abfa964f
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#define HTTP_RECV_BUF_SIZE 1024
#define HTTP_RECV_BUF_SIZE 1024
typedef
struct
SHttpClient
{
typedef
struct
SHttpClient
{
uv_connect_t
conn
;
uv_connect_t
conn
;
uv_tcp_t
tcp
;
uv_tcp_t
tcp
;
...
@@ -143,9 +144,9 @@ static void clientAllocBuffCb(uv_handle_t *handle, size_t suggested_size, uv_buf
...
@@ -143,9 +144,9 @@ static void clientAllocBuffCb(uv_handle_t *handle, size_t suggested_size, uv_buf
static
void
clientRecvCb
(
uv_stream_t
*
handle
,
ssize_t
nread
,
const
uv_buf_t
*
buf
)
{
static
void
clientRecvCb
(
uv_stream_t
*
handle
,
ssize_t
nread
,
const
uv_buf_t
*
buf
)
{
SHttpClient
*
cli
=
handle
->
data
;
SHttpClient
*
cli
=
handle
->
data
;
if
(
nread
<
0
)
{
if
(
nread
<
0
)
{
uError
(
"http-report re
ad
error:%s"
,
uv_err_name
(
nread
));
uError
(
"http-report re
cv
error:%s"
,
uv_err_name
(
nread
));
}
else
{
}
else
{
uTrace
(
"http-report succ to re
ad
%d bytes, just ignore it"
,
nread
);
uTrace
(
"http-report succ to re
cv
%d bytes, just ignore it"
,
nread
);
}
}
uv_close
((
uv_handle_t
*
)
&
cli
->
tcp
,
clientCloseCb
);
uv_close
((
uv_handle_t
*
)
&
cli
->
tcp
,
clientCloseCb
);
}
}
...
...
source/libs/transport/src/transSvr.c
浏览文件 @
abfa964f
...
@@ -276,14 +276,16 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
...
@@ -276,14 +276,16 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
while
(
transReadComplete
(
pBuf
))
{
while
(
transReadComplete
(
pBuf
))
{
tTrace
(
"%s conn %p alread read complete packet"
,
transLabel
(
pTransInst
),
conn
);
tTrace
(
"%s conn %p alread read complete packet"
,
transLabel
(
pTransInst
),
conn
);
if
(
true
==
pBuf
->
invalid
||
false
==
uvHandleReq
(
conn
))
{
if
(
true
==
pBuf
->
invalid
||
false
==
uvHandleReq
(
conn
))
{
tError
(
"%s conn %p read invalid packet, dst: %s, srv: %s"
,
transLabel
(
pTransInst
),
conn
,
conn
->
dst
,
conn
->
src
);
tError
(
"%s conn %p read invalid packet, received from %s, local info:%s"
,
transLabel
(
pTransInst
),
conn
,
conn
->
dst
,
conn
->
src
);
destroyConn
(
conn
,
true
);
destroyConn
(
conn
,
true
);
return
;
return
;
}
}
}
}
return
;
return
;
}
else
{
}
else
{
tError
(
"%s conn %p read invalid packet, exceed limit"
,
transLabel
(
pTransInst
),
conn
);
tError
(
"%s conn %p read invalid packet, exceed limit, received from %s, local info:"
,
transLabel
(
pTransInst
),
conn
,
conn
->
dst
,
conn
->
src
);
destroyConn
(
conn
,
true
);
destroyConn
(
conn
,
true
);
return
;
return
;
}
}
...
@@ -649,7 +651,7 @@ void uvOnAcceptCb(uv_stream_t* stream, int status) {
...
@@ -649,7 +651,7 @@ void uvOnAcceptCb(uv_stream_t* stream, int status) {
pObj
->
workerIdx
=
(
pObj
->
workerIdx
+
1
)
%
pObj
->
numOfThreads
;
pObj
->
workerIdx
=
(
pObj
->
workerIdx
+
1
)
%
pObj
->
numOfThreads
;
tTrace
(
"new conntion accepted by main server, dispatch to %dth worker-thread"
,
pObj
->
workerIdx
);
tTrace
(
"new conn
ec
tion accepted by main server, dispatch to %dth worker-thread"
,
pObj
->
workerIdx
);
uv_write2
(
wr
,
(
uv_stream_t
*
)
&
(
pObj
->
pipe
[
pObj
->
workerIdx
][
0
]),
&
buf
,
1
,
(
uv_stream_t
*
)
cli
,
uvOnPipeWriteCb
);
uv_write2
(
wr
,
(
uv_stream_t
*
)
&
(
pObj
->
pipe
[
pObj
->
workerIdx
][
0
]),
&
buf
,
1
,
(
uv_stream_t
*
)
cli
,
uvOnPipeWriteCb
);
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录