Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
6d23ea93
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看板
提交
6d23ea93
编写于
6月 14, 2023
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cache/update: fix memory leak
上级
d04a33f3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
8 deletion
+43
-8
source/dnode/vnode/src/tsdb/tsdbCache.c
source/dnode/vnode/src/tsdb/tsdbCache.c
+43
-8
未找到文件。
source/dnode/vnode/src/tsdb/tsdbCache.c
浏览文件 @
6d23ea93
...
@@ -378,10 +378,8 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
...
@@ -378,10 +378,8 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
int
num_keys
=
TARRAY_SIZE
(
aColVal
);
int
num_keys
=
TARRAY_SIZE
(
aColVal
);
TSKEY
keyTs
=
TSDBROW_TS
(
pRow
);
TSKEY
keyTs
=
TSDBROW_TS
(
pRow
);
rocksdb_writebatch_t
*
wb
=
pTsdb
->
rCache
.
writebatch
;
rocksdb_writebatch_t
*
wb
=
pTsdb
->
rCache
.
writebatch
;
SArray
*
remainCols
=
NULL
;
SArray
*
oColVal
=
taosArrayInit
(
num_keys
,
sizeof
(
SColVal
));
SLRUCache
*
pCache
=
pTsdb
->
lruCache
;
SArray
*
remainCols
=
NULL
;
SLRUCache
*
pCache
=
pTsdb
->
lruCache
;
taosThreadMutexLock
(
&
pTsdb
->
lruMutex
);
taosThreadMutexLock
(
&
pTsdb
->
lruMutex
);
for
(
int
i
=
0
;
i
<
num_keys
;
++
i
)
{
for
(
int
i
=
0
;
i
<
num_keys
;
++
i
)
{
...
@@ -473,7 +471,9 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
...
@@ -473,7 +471,9 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
}
}
}
}
num_keys
=
TARRAY_SIZE
(
remainCols
);
if
(
remainCols
)
{
num_keys
=
TARRAY_SIZE
(
remainCols
);
}
if
(
remainCols
&&
num_keys
>
0
)
{
if
(
remainCols
&&
num_keys
>
0
)
{
char
**
keys_list
=
taosMemoryCalloc
(
num_keys
,
sizeof
(
char
*
));
char
**
keys_list
=
taosMemoryCalloc
(
num_keys
,
sizeof
(
char
*
));
size_t
*
keys_list_sizes
=
taosMemoryCalloc
(
num_keys
,
sizeof
(
size_t
));
size_t
*
keys_list_sizes
=
taosMemoryCalloc
(
num_keys
,
sizeof
(
size_t
));
...
@@ -498,7 +498,8 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
...
@@ -498,7 +498,8 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
for
(
int
i
=
0
;
i
<
num_keys
;
++
i
)
{
for
(
int
i
=
0
;
i
<
num_keys
;
++
i
)
{
SIdxKey
*
idxKey
=
&
((
SIdxKey
*
)
TARRAY_DATA
(
remainCols
))[
i
];
SIdxKey
*
idxKey
=
&
((
SIdxKey
*
)
TARRAY_DATA
(
remainCols
))[
i
];
SColVal
*
pColVal
=
(
SColVal
*
)
taosArrayGet
(
aColVal
,
idxKey
->
idx
);
SColVal
*
pColVal
=
(
SColVal
*
)
TARRAY_DATA
(
aColVal
)
+
idxKey
->
idx
;
// SColVal *pColVal = (SColVal *)taosArrayGet(aColVal, idxKey->idx);
SLastCol
*
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
]);
SLastCol
*
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
]);
...
@@ -509,18 +510,52 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
...
@@ -509,18 +510,52 @@ int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSDBROW *pRow
tsdbCacheSerialize
(
&
(
SLastCol
){.
ts
=
keyTs
,
.
colVal
=
*
pColVal
},
&
value
,
&
vlen
);
tsdbCacheSerialize
(
&
(
SLastCol
){.
ts
=
keyTs
,
.
colVal
=
*
pColVal
},
&
value
,
&
vlen
);
// SLastKey key = (SLastKey){.ltype = 0, .uid = uid, .cid = pColVal->cid};
// SLastKey key = (SLastKey){.ltype = 0, .uid = uid, .cid = pColVal->cid};
rocksdb_writebatch_put
(
wb
,
(
char
*
)
&
idxKey
->
key
,
ROCKS_KEY_LEN
,
value
,
vlen
);
rocksdb_writebatch_put
(
wb
,
(
char
*
)
&
idxKey
->
key
,
ROCKS_KEY_LEN
,
value
,
vlen
);
pLastCol
=
(
SLastCol
*
)
value
;
SLastCol
*
pTmpLastCol
=
taosMemoryCalloc
(
1
,
sizeof
(
SLastCol
));
*
pTmpLastCol
=
*
pLastCol
;
pLastCol
=
pTmpLastCol
;
reallocVarData
(
&
pLastCol
->
colVal
);
size_t
charge
=
sizeof
(
*
pLastCol
);
if
(
IS_VAR_DATA_TYPE
(
pLastCol
->
colVal
.
type
))
{
charge
+=
pLastCol
->
colVal
.
value
.
nData
;
}
LRUStatus
status
=
taosLRUCacheInsert
(
pTsdb
->
lruCache
,
&
idxKey
->
key
,
ROCKS_KEY_LEN
,
pLastCol
,
charge
,
tsdbCacheDeleter
,
NULL
,
TAOS_LRU_PRIORITY_LOW
);
if
(
status
!=
TAOS_LRU_STATUS_OK
)
{
code
=
-
1
;
}
taosMemoryFree
(
value
);
taosMemoryFree
(
value
);
}
}
}
else
{
}
else
{
if
(
COL_VAL_IS_VALUE
(
pColVal
))
{
if
(
COL_VAL_IS_VALUE
(
pColVal
))
{
SLastCol
*
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
]);
if
(
NULL
==
pLastCol
||
pLastCol
->
ts
<=
keyTs
)
{
if
(
NULL
==
pLastCol
||
pLastCol
->
ts
<=
keyTs
)
{
char
*
value
=
NULL
;
char
*
value
=
NULL
;
size_t
vlen
=
0
;
size_t
vlen
=
0
;
tsdbCacheSerialize
(
&
(
SLastCol
){.
ts
=
keyTs
,
.
colVal
=
*
pColVal
},
&
value
,
&
vlen
);
tsdbCacheSerialize
(
&
(
SLastCol
){.
ts
=
keyTs
,
.
colVal
=
*
pColVal
},
&
value
,
&
vlen
);
// SLastKey key = (SLastKey){.ltype = 1, .uid = uid, .cid = pColVal->cid};
// SLastKey key = (SLastKey){.ltype = 1, .uid = uid, .cid = pColVal->cid};
rocksdb_writebatch_put
(
wb
,
(
char
*
)
&
idxKey
->
key
,
ROCKS_KEY_LEN
,
value
,
vlen
);
rocksdb_writebatch_put
(
wb
,
(
char
*
)
&
idxKey
->
key
,
ROCKS_KEY_LEN
,
value
,
vlen
);
pLastCol
=
(
SLastCol
*
)
value
;
SLastCol
*
pTmpLastCol
=
taosMemoryCalloc
(
1
,
sizeof
(
SLastCol
));
*
pTmpLastCol
=
*
pLastCol
;
pLastCol
=
pTmpLastCol
;
reallocVarData
(
&
pLastCol
->
colVal
);
size_t
charge
=
sizeof
(
*
pLastCol
);
if
(
IS_VAR_DATA_TYPE
(
pLastCol
->
colVal
.
type
))
{
charge
+=
pLastCol
->
colVal
.
value
.
nData
;
}
LRUStatus
status
=
taosLRUCacheInsert
(
pTsdb
->
lruCache
,
&
idxKey
->
key
,
ROCKS_KEY_LEN
,
pLastCol
,
charge
,
tsdbCacheDeleter
,
NULL
,
TAOS_LRU_PRIORITY_LOW
);
if
(
status
!=
TAOS_LRU_STATUS_OK
)
{
code
=
-
1
;
}
taosMemoryFree
(
value
);
taosMemoryFree
(
value
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录