Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c62b1985
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c62b1985
编写于
10月 05, 2022
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix invalid tag value
上级
16c14738
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
8 deletion
+19
-8
source/dnode/vnode/inc/vnode.h
source/dnode/vnode/inc/vnode.h
+2
-2
source/dnode/vnode/src/meta/metaQuery.c
source/dnode/vnode/src/meta/metaQuery.c
+8
-3
source/libs/executor/src/executil.c
source/libs/executor/src/executil.c
+9
-3
未找到文件。
source/dnode/vnode/inc/vnode.h
浏览文件 @
c62b1985
...
...
@@ -96,11 +96,11 @@ void metaReaderClear(SMetaReader *pReader);
int32_t
metaGetTableEntryByUid
(
SMetaReader
*
pReader
,
tb_uid_t
uid
);
int
metaGetTableEntryByName
(
SMetaReader
*
pReader
,
const
char
*
name
);
int32_t
metaGetTableTags
(
SMeta
*
pMeta
,
uint64_t
suid
,
SArray
*
uidList
,
SHashObj
*
tags
);
int32_t
metaGetTableTagsByUids
(
SMeta
*
pMeta
,
u
int64_t
suid
,
SArray
*
uidList
,
SHashObj
*
tags
);
int32_t
metaGetTableTagsByUids
(
SMeta
*
pMeta
,
int64_t
suid
,
SArray
*
uidList
,
SHashObj
*
tags
);
int32_t
metaReadNext
(
SMetaReader
*
pReader
);
const
void
*
metaGetTableTagVal
(
void
*
tag
,
int16_t
type
,
STagVal
*
tagVal
);
int
metaGetTableNameByUid
(
void
*
meta
,
uint64_t
uid
,
char
*
tbName
);
int
metaGetTableUidByName
(
void
*
meta
,
char
*
tbName
,
u
int64_t
*
uid
);
int
metaGetTableUidByName
(
void
*
meta
,
char
*
tbName
,
int64_t
*
uid
);
int
metaGetTableTypeByName
(
void
*
meta
,
char
*
tbName
,
ETableType
*
tbType
);
bool
metaIsTableExist
(
SMeta
*
pMeta
,
tb_uid_t
uid
);
...
...
source/dnode/vnode/src/meta/metaQuery.c
浏览文件 @
c62b1985
...
...
@@ -202,7 +202,7 @@ int metaGetTableNameByUid(void *meta, uint64_t uid, char *tbName) {
return
0
;
}
int
metaGetTableUidByName
(
void
*
meta
,
char
*
tbName
,
u
int64_t
*
uid
)
{
int
metaGetTableUidByName
(
void
*
meta
,
char
*
tbName
,
int64_t
*
uid
)
{
int
code
=
0
;
SMetaReader
mr
=
{
0
};
metaReaderInit
(
&
mr
,
(
SMeta
*
)
meta
,
0
);
...
...
@@ -1134,7 +1134,7 @@ END:
return
ret
;
}
static
int32_t
metaGetTableTagByUid
(
SMeta
*
pMeta
,
uint64_t
suid
,
u
int64_t
uid
,
void
**
tag
,
int32_t
*
len
,
bool
lock
)
{
static
int32_t
metaGetTableTagByUid
(
SMeta
*
pMeta
,
int64_t
suid
,
int64_t
uid
,
void
**
tag
,
int32_t
*
len
,
bool
lock
)
{
int
ret
=
0
;
if
(
lock
)
{
metaRLock
(
pMeta
);
...
...
@@ -1148,7 +1148,7 @@ static int32_t metaGetTableTagByUid(SMeta *pMeta, uint64_t suid, uint64_t uid, v
return
ret
;
}
int32_t
metaGetTableTagsByUids
(
SMeta
*
pMeta
,
u
int64_t
suid
,
SArray
*
uidList
,
SHashObj
*
tags
)
{
int32_t
metaGetTableTagsByUids
(
SMeta
*
pMeta
,
int64_t
suid
,
SArray
*
uidList
,
SHashObj
*
tags
)
{
const
int32_t
LIMIT
=
128
;
int32_t
isLock
=
false
;
...
...
@@ -1169,6 +1169,11 @@ int32_t metaGetTableTagsByUids(SMeta *pMeta, uint64_t suid, SArray *uidList, SHa
if
(
metaGetTableTagByUid
(
pMeta
,
suid
,
*
id
,
&
val
,
&
len
,
false
)
==
0
)
{
taosHashPut
(
tags
,
id
,
sizeof
(
tb_uid_t
),
val
,
len
);
tdbFree
(
val
);
}
else
{
metaError
(
"vgId:%d, failed to table IDs, suid: %"
PRId64
", uid: %"
PRId64
""
,
TD_VID
(
pMeta
->
pVnode
),
suid
,
*
id
);
if
(
isLock
)
metaULock
(
pMeta
);
return
TSDB_CODE_TDB_IVLD_TAG_VAL
;
}
}
}
...
...
source/libs/executor/src/executil.c
浏览文件 @
c62b1985
...
...
@@ -373,7 +373,7 @@ static int32_t createResultData(SDataType* pType, int32_t numOfRows, SScalarPara
return
TSDB_CODE_SUCCESS
;
}
static
SColumnInfoData
*
getColInfoResult
(
void
*
metaHandle
,
u
int64_t
suid
,
SArray
*
uidList
,
SNode
*
pTagCond
)
{
static
SColumnInfoData
*
getColInfoResult
(
void
*
metaHandle
,
int64_t
suid
,
SArray
*
uidList
,
SNode
*
pTagCond
)
{
int32_t
code
=
TSDB_CODE_SUCCESS
;
SArray
*
pBlockList
=
NULL
;
SSDataBlock
*
pResBlock
=
NULL
;
...
...
@@ -420,8 +420,14 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, uint64_t suid, SArray
goto
end
;
}
}
else
{
metaGetTableTagsByUids
(
metaHandle
,
suid
,
uidList
,
tags
);
qInfo
(
"succ to get table from meta idx, suid:%"
PRIu64
,
suid
);
code
=
metaGetTableTagsByUids
(
metaHandle
,
suid
,
uidList
,
tags
);
if
(
code
!=
0
)
{
terrno
=
code
;
qError
(
"failed to get table from meta idx, reason: %s, suid:%"
PRId64
,
tstrerror
(
code
),
suid
);
goto
end
;
}
else
{
qInfo
(
"succ to get table from meta idx, suid:%"
PRId64
,
suid
);
}
}
int32_t
rows
=
taosArrayGetSize
(
uidList
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录