Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
f95867d2
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
f95867d2
编写于
5月 18, 2023
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cache/del: fix lru key length
上级
3b316051
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
4 deletion
+5
-4
source/dnode/vnode/src/tsdb/tsdbCache.c
source/dnode/vnode/src/tsdb/tsdbCache.c
+5
-4
未找到文件。
source/dnode/vnode/src/tsdb/tsdbCache.c
浏览文件 @
f95867d2
...
@@ -932,7 +932,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
...
@@ -932,7 +932,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
((
SLastKey
*
)
keys
)[
1
]
=
(
SLastKey
){.
ltype
=
0
,
.
uid
=
uid
,
.
cid
=
cid
};
((
SLastKey
*
)
keys
)[
1
]
=
(
SLastKey
){.
ltype
=
0
,
.
uid
=
uid
,
.
cid
=
cid
};
keys_list
[
i
]
=
keys
;
keys_list
[
i
]
=
keys
;
keys_list
[
num_keys
+
i
]
=
keys
+
klen
;
keys_list
[
num_keys
+
i
]
=
keys
+
sizeof
(
SLastKey
)
;
keys_list_sizes
[
i
]
=
klen
;
keys_list_sizes
[
i
]
=
klen
;
keys_list_sizes
[
num_keys
+
i
]
=
klen
;
keys_list_sizes
[
num_keys
+
i
]
=
klen
;
}
}
...
@@ -940,6 +940,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
...
@@ -940,6 +940,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
size_t
*
values_list_sizes
=
taosMemoryCalloc
(
num_keys
*
2
,
sizeof
(
size_t
));
size_t
*
values_list_sizes
=
taosMemoryCalloc
(
num_keys
*
2
,
sizeof
(
size_t
));
char
**
errs
=
taosMemoryCalloc
(
num_keys
*
2
,
sizeof
(
char
*
));
char
**
errs
=
taosMemoryCalloc
(
num_keys
*
2
,
sizeof
(
char
*
));
taosThreadMutexLock
(
&
pTsdb
->
rCache
.
rMutex
);
taosThreadMutexLock
(
&
pTsdb
->
rCache
.
rMutex
);
rocksMayWrite
(
pTsdb
,
true
);
rocksdb_multi_get
(
pTsdb
->
rCache
.
db
,
pTsdb
->
rCache
.
readoptions
,
num_keys
*
2
,
(
const
char
*
const
*
)
keys_list
,
rocksdb_multi_get
(
pTsdb
->
rCache
.
db
,
pTsdb
->
rCache
.
readoptions
,
num_keys
*
2
,
(
const
char
*
const
*
)
keys_list
,
keys_list_sizes
,
values_list
,
values_list_sizes
,
errs
);
keys_list_sizes
,
values_list
,
values_list_sizes
,
errs
);
for
(
int
i
=
0
;
i
<
num_keys
;
++
i
)
{
for
(
int
i
=
0
;
i
<
num_keys
;
++
i
)
{
...
@@ -957,7 +958,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
...
@@ -957,7 +958,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
SLastCol
*
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
]);
SLastCol
*
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
]);
if
(
NULL
!=
pLastCol
&&
(
pLastCol
->
ts
<=
eKey
&&
pLastCol
->
ts
>=
sKey
))
{
if
(
NULL
!=
pLastCol
&&
(
pLastCol
->
ts
<=
eKey
&&
pLastCol
->
ts
>=
sKey
))
{
SLastKey
*
key
=
&
(
SLastKey
){.
ltype
=
1
,
.
uid
=
uid
,
.
cid
=
pLastCol
->
colVal
.
cid
};
SLastKey
*
key
=
&
(
SLastKey
){.
ltype
=
1
,
.
uid
=
uid
,
.
cid
=
pLastCol
->
colVal
.
cid
};
size_t
klen
=
sizeof
(
*
key
)
;
size_t
klen
=
ROCKS_KEY_LEN
;
rocksdb_writebatch_delete
(
wb
,
(
char
*
)
key
,
klen
);
rocksdb_writebatch_delete
(
wb
,
(
char
*
)
key
,
klen
);
taosLRUCacheErase
(
pTsdb
->
lruCache
,
key
,
klen
);
taosLRUCacheErase
(
pTsdb
->
lruCache
,
key
,
klen
);
...
@@ -966,7 +967,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
...
@@ -966,7 +967,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
+
num_keys
]);
pLastCol
=
tsdbCacheDeserialize
(
values_list
[
i
+
num_keys
]);
if
(
NULL
!=
pLastCol
&&
(
pLastCol
->
ts
<=
eKey
&&
pLastCol
->
ts
>=
sKey
))
{
if
(
NULL
!=
pLastCol
&&
(
pLastCol
->
ts
<=
eKey
&&
pLastCol
->
ts
>=
sKey
))
{
SLastKey
*
key
=
&
(
SLastKey
){.
ltype
=
0
,
.
uid
=
uid
,
.
cid
=
pLastCol
->
colVal
.
cid
};
SLastKey
*
key
=
&
(
SLastKey
){.
ltype
=
0
,
.
uid
=
uid
,
.
cid
=
pLastCol
->
colVal
.
cid
};
size_t
klen
=
sizeof
(
*
key
)
;
size_t
klen
=
ROCKS_KEY_LEN
;
rocksdb_writebatch_delete
(
wb
,
(
char
*
)
key
,
klen
);
rocksdb_writebatch_delete
(
wb
,
(
char
*
)
key
,
klen
);
taosLRUCacheErase
(
pTsdb
->
lruCache
,
key
,
klen
);
taosLRUCacheErase
(
pTsdb
->
lruCache
,
key
,
klen
);
...
@@ -978,7 +979,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
...
@@ -978,7 +979,7 @@ int32_t tsdbCacheDel(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKE
taosMemoryFree
(
values_list
);
taosMemoryFree
(
values_list
);
taosMemoryFree
(
values_list_sizes
);
taosMemoryFree
(
values_list_sizes
);
rocksMayWrite
(
pTsdb
,
fals
e
);
rocksMayWrite
(
pTsdb
,
tru
e
);
taosThreadMutexUnlock
(
&
pTsdb
->
rCache
.
rMutex
);
taosThreadMutexUnlock
(
&
pTsdb
->
rCache
.
rMutex
);
_exit:
_exit:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录