Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
bb80e5c6
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22017
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看板
提交
bb80e5c6
编写于
7月 26, 2022
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: handle both null tag values
上级
292d0f78
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
42 addition
and
11 deletion
+42
-11
source/dnode/vnode/src/meta/metaOpen.c
source/dnode/vnode/src/meta/metaOpen.c
+42
-11
未找到文件。
source/dnode/vnode/src/meta/metaOpen.c
浏览文件 @
bb80e5c6
...
...
@@ -180,11 +180,41 @@ int metaClose(SMeta *pMeta) {
return
0
;
}
int32_t
metaRLock
(
SMeta
*
pMeta
)
{
return
taosThreadRwlockRdlock
(
&
pMeta
->
lock
);
}
int32_t
metaRLock
(
SMeta
*
pMeta
)
{
int32_t
ret
=
0
;
int32_t
metaWLock
(
SMeta
*
pMeta
)
{
return
taosThreadRwlockWrlock
(
&
pMeta
->
lock
);
}
metaDebug
(
"meta rlock %p B"
,
&
pMeta
->
lock
);
int32_t
metaULock
(
SMeta
*
pMeta
)
{
return
taosThreadRwlockUnlock
(
&
pMeta
->
lock
);
}
ret
=
taosThreadRwlockRdlock
(
&
pMeta
->
lock
);
metaDebug
(
"meta rlock %p E"
,
&
pMeta
->
lock
);
return
ret
;
}
int32_t
metaWLock
(
SMeta
*
pMeta
)
{
int32_t
ret
=
0
;
metaDebug
(
"meta wlock %p B"
,
&
pMeta
->
lock
);
ret
=
taosThreadRwlockWrlock
(
&
pMeta
->
lock
);
metaDebug
(
"meta wlock %p E"
,
&
pMeta
->
lock
);
return
ret
;
}
int32_t
metaULock
(
SMeta
*
pMeta
)
{
int32_t
ret
=
0
;
metaDebug
(
"meta ulock %p B"
,
&
pMeta
->
lock
);
ret
=
taosThreadRwlockUnlock
(
&
pMeta
->
lock
);
metaDebug
(
"meta ulock %p E"
,
&
pMeta
->
lock
);
return
ret
;
}
static
int
tbDbKeyCmpr
(
const
void
*
pKey1
,
int
kLen1
,
const
void
*
pKey2
,
int
kLen2
)
{
STbDbKey
*
pTbDbKey1
=
(
STbDbKey
*
)
pKey1
;
...
...
@@ -259,7 +289,7 @@ static int ctbIdxKeyCmpr(const void *pKey1, int kLen1, const void *pKey2, int kL
static
int
tagIdxKeyCmpr
(
const
void
*
pKey1
,
int
kLen1
,
const
void
*
pKey2
,
int
kLen2
)
{
STagIdxKey
*
pTagIdxKey1
=
(
STagIdxKey
*
)
pKey1
;
STagIdxKey
*
pTagIdxKey2
=
(
STagIdxKey
*
)
pKey2
;
tb_uid_t
uid1
,
uid2
;
tb_uid_t
uid1
=
0
,
uid2
=
0
;
int
c
;
// compare suid
...
...
@@ -287,14 +317,15 @@ static int tagIdxKeyCmpr(const void *pKey1, int kLen1, const void *pKey2, int kL
// all not NULL, compr tag vals
c
=
doCompare
(
pTagIdxKey1
->
data
,
pTagIdxKey2
->
data
,
pTagIdxKey1
->
type
,
0
);
if
(
c
)
return
c
;
}
if
(
IS_VAR_DATA_TYPE
(
pTagIdxKey1
->
type
))
{
uid1
=
*
(
tb_uid_t
*
)(
pTagIdxKey1
->
data
+
varDataTLen
(
pTagIdxKey1
->
data
));
uid2
=
*
(
tb_uid_t
*
)(
pTagIdxKey2
->
data
+
varDataTLen
(
pTagIdxKey2
->
data
));
}
else
{
uid1
=
*
(
tb_uid_t
*
)(
pTagIdxKey1
->
data
+
tDataTypes
[
pTagIdxKey1
->
type
].
bytes
);
uid2
=
*
(
tb_uid_t
*
)(
pTagIdxKey2
->
data
+
tDataTypes
[
pTagIdxKey2
->
type
].
bytes
);
}
// both null or tag values are equal, then continue to compare uids
if
(
IS_VAR_DATA_TYPE
(
pTagIdxKey1
->
type
))
{
uid1
=
*
(
tb_uid_t
*
)(
pTagIdxKey1
->
data
+
varDataTLen
(
pTagIdxKey1
->
data
));
uid2
=
*
(
tb_uid_t
*
)(
pTagIdxKey2
->
data
+
varDataTLen
(
pTagIdxKey2
->
data
));
}
else
{
uid1
=
*
(
tb_uid_t
*
)(
pTagIdxKey1
->
data
+
tDataTypes
[
pTagIdxKey1
->
type
].
bytes
);
uid2
=
*
(
tb_uid_t
*
)(
pTagIdxKey2
->
data
+
tDataTypes
[
pTagIdxKey2
->
type
].
bytes
);
}
// compare uid
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录