Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
adminstrot
TDengine
提交
335d41f3
TDengine
项目概览
adminstrot
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
335d41f3
编写于
4月 03, 2020
作者:
P
plum-lihui
提交者:
GitHub
4月 03, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1499 from sangshuduo/fix-memory-leak-pMemBuffer
Fix memory leak p mem buffer
上级
26fa2ee1
72ce4b57
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
9 deletion
+29
-9
src/client/src/tscSecondaryMerge.c
src/client/src/tscSecondaryMerge.c
+23
-3
src/inc/textbuffer.h
src/inc/textbuffer.h
+1
-1
src/util/src/textbuffer.c
src/util/src/textbuffer.c
+1
-1
src/util/src/tpercentile.c
src/util/src/tpercentile.c
+4
-4
未找到文件。
src/client/src/tscSecondaryMerge.c
浏览文件 @
335d41f3
...
...
@@ -614,6 +614,7 @@ int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOr
pSchema
=
(
SSchema
*
)
calloc
(
1
,
sizeof
(
SSchema
)
*
pQueryInfo
->
exprsInfo
.
numOfExprs
);
if
(
pSchema
==
NULL
)
{
tfree
(
*
pMemBuffer
);
tscError
(
"%p failed to allocate memory"
,
pSql
);
pRes
->
code
=
TSDB_CODE_CLI_OUT_OF_MEMORY
;
return
pRes
->
code
;
...
...
@@ -635,15 +636,27 @@ int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOr
}
pModel
=
createColumnModel
(
pSchema
,
pQueryInfo
->
exprsInfo
.
numOfExprs
,
capacity
);
if
(
pModel
==
NULL
)
{
goto
_error_memory
;
}
for
(
int32_t
i
=
0
;
i
<
pMeterMetaInfo
->
pMetricMeta
->
numOfVnodes
;
++
i
)
{
(
*
pMemBuffer
)[
i
]
=
createExtMemBuffer
(
nBufferSizes
,
rlen
,
pModel
);
if
((
*
pMemBuffer
)[
i
]
==
NULL
)
{
for
(
int32_t
j
=
0
;
j
<
i
;
++
j
)
{
destroyExtMemBuffer
((
*
pMemBuffer
)[
j
]);
}
goto
_error_memory
;
}
(
*
pMemBuffer
)[
i
]
->
flushModel
=
MULTIPLE_APPEND_MODEL
;
}
if
(
createOrderDescriptor
(
pOrderDesc
,
pCmd
,
pModel
)
!=
TSDB_CODE_SUCCESS
)
{
pRes
->
code
=
TSDB_CODE_CLI_OUT_OF_MEMORY
;
return
pRes
->
code
;
for
(
int32_t
i
=
0
;
i
<
pMeterMetaInfo
->
pMetricMeta
->
numOfVnodes
;
++
i
)
{
destroyExtMemBuffer
((
*
pMemBuffer
)[
i
]);
}
goto
_error_memory
;
}
// final result depends on the fields number
...
...
@@ -686,6 +699,13 @@ int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOr
tfree
(
pSchema
);
return
TSDB_CODE_SUCCESS
;
_error_memory:
tfree
(
pSchema
);
tfree
(
*
pMemBuffer
);
tscError
(
"%p failed to allocate memory"
,
pSql
);
pRes
->
code
=
TSDB_CODE_CLI_OUT_OF_MEMORY
;
return
pRes
->
code
;
}
/**
...
...
@@ -699,7 +719,7 @@ void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDe
destroyColumnModel
(
pFinalModel
);
tOrderDescDestroy
(
pDesc
);
for
(
int32_t
i
=
0
;
i
<
numOfVnodes
;
++
i
)
{
pMemBuffer
[
i
]
=
dest
or
yExtMemBuffer
(
pMemBuffer
[
i
]);
pMemBuffer
[
i
]
=
dest
ro
yExtMemBuffer
(
pMemBuffer
[
i
]);
}
tfree
(
pMemBuffer
);
...
...
src/inc/textbuffer.h
浏览文件 @
335d41f3
...
...
@@ -136,7 +136,7 @@ tExtMemBuffer *createExtMemBuffer(int32_t inMemSize, int32_t elemSize, SColumnMo
* @param pMemBuffer
* @return
*/
void
*
dest
or
yExtMemBuffer
(
tExtMemBuffer
*
pMemBuffer
);
void
*
dest
ro
yExtMemBuffer
(
tExtMemBuffer
*
pMemBuffer
);
/**
* @param pMemBuffer
...
...
src/util/src/textbuffer.c
浏览文件 @
335d41f3
...
...
@@ -80,7 +80,7 @@ tExtMemBuffer* createExtMemBuffer(int32_t inMemSize, int32_t elemSize, SColumnMo
return
pMemBuffer
;
}
void
*
dest
or
yExtMemBuffer
(
tExtMemBuffer
*
pMemBuffer
)
{
void
*
dest
ro
yExtMemBuffer
(
tExtMemBuffer
*
pMemBuffer
)
{
if
(
pMemBuffer
==
NULL
)
{
return
NULL
;
}
...
...
src/util/src/tpercentile.c
浏览文件 @
335d41f3
...
...
@@ -32,7 +32,7 @@ tExtMemBuffer *releaseBucketsExceptFor(tMemBucket *pMemBucket, int16_t segIdx, i
pBuffer
=
pSeg
->
pBuffer
[
j
];
}
else
{
if
(
pSeg
->
pBuffer
&&
pSeg
->
pBuffer
[
j
])
{
pSeg
->
pBuffer
[
j
]
=
dest
or
yExtMemBuffer
(
pSeg
->
pBuffer
[
j
]);
pSeg
->
pBuffer
[
j
]
=
dest
ro
yExtMemBuffer
(
pSeg
->
pBuffer
[
j
]);
}
}
}
...
...
@@ -338,7 +338,7 @@ void tMemBucketDestroy(tMemBucket *pBucket) {
for
(
int32_t
j
=
0
;
j
<
pSeg
->
numOfSlots
;
++
j
)
{
if
(
pSeg
->
pBuffer
[
j
]
!=
NULL
)
{
pSeg
->
pBuffer
[
j
]
=
dest
or
yExtMemBuffer
(
pSeg
->
pBuffer
[
j
]);
pSeg
->
pBuffer
[
j
]
=
dest
ro
yExtMemBuffer
(
pSeg
->
pBuffer
[
j
]);
}
}
tfree
(
pSeg
->
pBuffer
);
...
...
@@ -588,7 +588,7 @@ void releaseBucket(tMemBucket *pMemBucket, int32_t segIdx, int32_t slotIdx) {
return
;
}
pSeg
->
pBuffer
[
slotIdx
]
=
dest
or
yExtMemBuffer
(
pSeg
->
pBuffer
[
slotIdx
]);
pSeg
->
pBuffer
[
slotIdx
]
=
dest
ro
yExtMemBuffer
(
pSeg
->
pBuffer
[
slotIdx
]);
}
////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -853,7 +853,7 @@ double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction)
tMemBucketSegment
*
pSeg
=
&
pMemBucket
->
pSegs
[
tt
];
for
(
int32_t
ttx
=
0
;
ttx
<
pSeg
->
numOfSlots
;
++
ttx
)
{
if
(
pSeg
->
pBuffer
&&
pSeg
->
pBuffer
[
ttx
])
{
pSeg
->
pBuffer
[
ttx
]
=
dest
or
yExtMemBuffer
(
pSeg
->
pBuffer
[
ttx
]);
pSeg
->
pBuffer
[
ttx
]
=
dest
ro
yExtMemBuffer
(
pSeg
->
pBuffer
[
ttx
]);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录