Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4ebf4326
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
4ebf4326
编写于
11月 25, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
11月 25, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18438 from taosdata/fix/TD-20644
fix: fix mem leak
上级
5035e5e9
1fc8f273
变更
5
展开全部
隐藏空白更改
内联
并排
Showing
5 changed file
with
124 addition
and
114 deletion
+124
-114
source/libs/index/src/indexFilter.c
source/libs/index/src/indexFilter.c
+9
-3
source/libs/scalar/src/scalar.c
source/libs/scalar/src/scalar.c
+6
-4
source/libs/scalar/src/sclvector.c
source/libs/scalar/src/sclvector.c
+105
-101
source/libs/transport/src/transSvr.c
source/libs/transport/src/transSvr.c
+1
-3
tests/parallel_test/cases.task
tests/parallel_test/cases.task
+3
-3
未找到文件。
source/libs/index/src/indexFilter.c
浏览文件 @
4ebf4326
...
...
@@ -699,8 +699,8 @@ static int32_t sifExecLogic(SLogicConditionNode *node, SIFCtx *ctx, SIFParam *ou
}
else
{
for
(
int32_t
m
=
0
;
m
<
node
->
pParameterList
->
length
;
m
++
)
{
output
->
status
=
sifMergeCond
(
node
->
condType
,
output
->
status
,
params
[
m
].
status
);
taosArrayDestroy
(
params
[
m
].
result
);
params
[
m
].
result
=
NULL
;
//
taosArrayDestroy(params[m].result);
//
params[m].result = NULL;
}
}
_return:
...
...
@@ -857,9 +857,15 @@ static int32_t sifGetFltHint(SNode *pNode, SIdxFltStatus *status) {
SIF_ERR_RET
(
TSDB_CODE_QRY_APP_ERROR
);
}
*
status
=
res
->
status
;
sifFreeParam
(
res
);
taosHashRemove
(
ctx
.
pRes
,
(
void
*
)
&
pNode
,
POINTER_BYTES
);
void
*
iter
=
taosHashIterate
(
ctx
.
pRes
,
NULL
);
while
(
iter
!=
NULL
)
{
SIFParam
*
data
=
(
SIFParam
*
)
iter
;
sifFreeParam
(
data
);
iter
=
taosHashIterate
(
ctx
.
pRes
,
iter
);
}
taosHashCleanup
(
ctx
.
pRes
);
return
code
;
}
...
...
source/libs/scalar/src/scalar.c
浏览文件 @
4ebf4326
...
...
@@ -603,7 +603,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell
bool
*
equal
=
(
bool
*
)
colDataGetData
(
pComp
->
columnData
,
rowIdx
);
if
(
*
equal
)
{
bool
isNull
=
colDataIsNull_s
(
pThen
->
columnData
,
(
pThen
->
numOfRows
>
1
?
rowIdx
:
0
));
bool
isNull
=
colDataIsNull_s
(
pThen
->
columnData
,
(
pThen
->
numOfRows
>
1
?
rowIdx
:
0
));
char
*
pData
=
isNull
?
NULL
:
colDataGetData
(
pThen
->
columnData
,
(
pThen
->
numOfRows
>
1
?
rowIdx
:
0
));
colDataAppend
(
output
->
columnData
,
rowIdx
,
pData
,
isNull
);
...
...
@@ -617,7 +617,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell
}
if
(
pElse
)
{
bool
isNull
=
colDataIsNull_s
(
pElse
->
columnData
,
(
pElse
->
numOfRows
>
1
?
rowIdx
:
0
));
bool
isNull
=
colDataIsNull_s
(
pElse
->
columnData
,
(
pElse
->
numOfRows
>
1
?
rowIdx
:
0
));
char
*
pData
=
isNull
?
NULL
:
colDataGetData
(
pElse
->
columnData
,
(
pElse
->
numOfRows
>
1
?
rowIdx
:
0
));
colDataAppend
(
output
->
columnData
,
rowIdx
,
pData
,
isNull
);
...
...
@@ -666,7 +666,7 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCe
bool
*
whenValue
=
(
bool
*
)
colDataGetData
(
pWhen
->
columnData
,
(
pWhen
->
numOfRows
>
1
?
rowIdx
:
0
));
if
(
*
whenValue
)
{
bool
isNull
=
colDataIsNull_s
(
pThen
->
columnData
,
(
pThen
->
numOfRows
>
1
?
rowIdx
:
0
));
bool
isNull
=
colDataIsNull_s
(
pThen
->
columnData
,
(
pThen
->
numOfRows
>
1
?
rowIdx
:
0
));
char
*
pData
=
isNull
?
NULL
:
colDataGetData
(
pThen
->
columnData
,
(
pThen
->
numOfRows
>
1
?
rowIdx
:
0
));
colDataAppend
(
output
->
columnData
,
rowIdx
,
pData
,
isNull
);
...
...
@@ -685,7 +685,7 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCe
}
if
(
pElse
)
{
bool
isNull
=
colDataIsNull_s
(
pElse
->
columnData
,
(
pElse
->
numOfRows
>
1
?
rowIdx
:
0
));
bool
isNull
=
colDataIsNull_s
(
pElse
->
columnData
,
(
pElse
->
numOfRows
>
1
?
rowIdx
:
0
));
char
*
pData
=
isNull
?
NULL
:
colDataGetData
(
pElse
->
columnData
,
(
pElse
->
numOfRows
>
1
?
rowIdx
:
0
));
colDataAppend
(
output
->
columnData
,
rowIdx
,
pData
,
isNull
);
...
...
@@ -1210,6 +1210,7 @@ EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) {
SScalarParam
output
=
{
0
};
ctx
->
code
=
sclExecOperator
(
node
,
ctx
,
&
output
);
if
(
ctx
->
code
)
{
sclFreeParam
(
&
output
);
return
DEAL_RES_ERROR
;
}
...
...
@@ -1358,6 +1359,7 @@ EDealRes sclWalkOperator(SNode *pNode, SScalarCtx *ctx) {
ctx
->
code
=
sclExecOperator
(
node
,
ctx
,
&
output
);
if
(
ctx
->
code
)
{
sclFreeParam
(
&
output
);
return
DEAL_RES_ERROR
;
}
...
...
source/libs/scalar/src/sclvector.c
浏览文件 @
4ebf4326
此差异已折叠。
点击以展开。
source/libs/transport/src/transSvr.c
浏览文件 @
4ebf4326
...
...
@@ -195,7 +195,7 @@ static bool uvHandleReq(SSvrConn* pConn) {
}
if
(
transDecompressMsg
((
char
**
)
&
pHead
,
msgLen
)
<
0
)
{
t
Debug
(
"%s conn %p recv invalid packet, failed to decompress"
,
transLabel
(
pTransInst
),
pConn
);
t
Error
(
"%s conn %p recv invalid packet, failed to decompress"
,
transLabel
(
pTransInst
),
pConn
);
return
false
;
}
...
...
@@ -277,10 +277,8 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
SConnBuffer
*
pBuf
=
&
conn
->
readBuf
;
if
(
nread
>
0
)
{
pBuf
->
len
+=
nread
;
tTrace
(
"%s conn %p total read:%d, current read:%d"
,
transLabel
(
pTransInst
),
conn
,
pBuf
->
len
,
(
int
)
nread
);
if
(
pBuf
->
len
<=
TRANS_PACKET_LIMIT
)
{
while
(
transReadComplete
(
pBuf
))
{
tTrace
(
"%s conn %p alread read complete packet"
,
transLabel
(
pTransInst
),
conn
);
if
(
true
==
pBuf
->
invalid
||
false
==
uvHandleReq
(
conn
))
{
tError
(
"%s conn %p read invalid packet, received from %s, local info:%s"
,
transLabel
(
pTransInst
),
conn
,
conn
->
dst
,
conn
->
src
);
...
...
tests/parallel_test/cases.task
浏览文件 @
4ebf4326
...
...
@@ -622,7 +622,7 @@
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/join2.py
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/union1.py
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/concat2.py
,,
,system-test,
python3 ./test.py -f 2-query/json_tag.py
,,
y,system-test,./pytest.sh
python3 ./test.py -f 2-query/json_tag.py
,,,system-test,python3 ./test.py -f 2-query/nestedQuery.py
,,,system-test,python3 ./test.py -f 2-query/nestedQuery_str.py
,,,system-test,python3 ./test.py -f 2-query/nestedQuery_math.py
...
...
@@ -768,7 +768,7 @@
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/timetruncate.py -Q 2
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/diff.py -Q 2
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/Timediff.py -Q 2
,,
,system-test,
python3 ./test.py -f 2-query/json_tag.py -Q 2
,,
y,system-test,./pytest.sh
python3 ./test.py -f 2-query/json_tag.py -Q 2
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/top.py -Q 2
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/bottom.py -Q 2
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/percentile.py -Q 2
...
...
@@ -862,7 +862,7 @@
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/timetruncate.py -Q 3
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/diff.py -Q 3
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/Timediff.py -Q 3
,,
,system-test,
python3 ./test.py -f 2-query/json_tag.py -Q 3
,,
y,system-test,./pytest.sh
python3 ./test.py -f 2-query/json_tag.py -Q 3
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/top.py -Q 3
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/bottom.py -Q 3
,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/percentile.py -Q 3
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录