Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
6cbedc5d
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6cbedc5d
编写于
5月 15, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: do some internal refactor.
上级
40ffe0cd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
55 addition
and
47 deletion
+55
-47
source/dnode/vnode/src/tq/tqRead.c
source/dnode/vnode/src/tq/tqRead.c
+55
-47
未找到文件。
source/dnode/vnode/src/tq/tqRead.c
浏览文件 @
6cbedc5d
...
...
@@ -503,6 +503,55 @@ int32_t tqMaskBlock(SSchemaWrapper* pDst, SSDataBlock* pBlock, const SSchemaWrap
return
0
;
}
static
int32_t
buildResSDataBlock
(
SSDataBlock
*
pBlock
,
SSchemaWrapper
*
pSchema
,
const
SArray
*
pColIdList
)
{
if
(
blockDataGetNumOfCols
(
pBlock
)
>
0
)
{
return
TSDB_CODE_SUCCESS
;
}
int32_t
numOfCols
=
taosArrayGetSize
(
pColIdList
);
if
(
numOfCols
==
0
)
{
// all columns are required
for
(
int32_t
i
=
0
;
i
<
pSchema
->
nCols
;
++
i
)
{
SSchema
*
pColSchema
=
&
pSchema
->
pSchema
[
i
];
SColumnInfoData
colInfo
=
createColumnInfoData
(
pColSchema
->
type
,
pColSchema
->
bytes
,
pColSchema
->
colId
);
int32_t
code
=
blockDataAppendColInfo
(
pBlock
,
&
colInfo
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
blockDataFreeRes
(
pBlock
);
return
TSDB_CODE_OUT_OF_MEMORY
;
}
}
}
else
{
if
(
numOfCols
>
pSchema
->
nCols
)
{
numOfCols
=
pSchema
->
nCols
;
}
int32_t
i
=
0
;
int32_t
j
=
0
;
while
(
i
<
pSchema
->
nCols
&&
j
<
numOfCols
)
{
SSchema
*
pColSchema
=
&
pSchema
->
pSchema
[
i
];
col_id_t
colIdSchema
=
pColSchema
->
colId
;
col_id_t
colIdNeed
=
*
(
col_id_t
*
)
taosArrayGet
(
pColIdList
,
j
);
if
(
colIdSchema
<
colIdNeed
)
{
i
++
;
}
else
if
(
colIdSchema
>
colIdNeed
)
{
j
++
;
}
else
{
SColumnInfoData
colInfo
=
createColumnInfoData
(
pColSchema
->
type
,
pColSchema
->
bytes
,
pColSchema
->
colId
);
int32_t
code
=
blockDataAppendColInfo
(
pBlock
,
&
colInfo
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
-
1
;
}
i
++
;
j
++
;
}
}
}
return
TSDB_CODE_SUCCESS
;
}
int32_t
tqRetrieveDataBlock
(
STqReader
*
pReader
,
SSubmitTbData
**
pSubmitTbDataRet
)
{
tqDebug
(
"tq reader retrieve data block %p, index:%d"
,
pReader
->
msg
.
msgStr
,
pReader
->
nextBlk
);
...
...
@@ -534,57 +583,16 @@ int32_t tqRetrieveDataBlock(STqReader* pReader, SSubmitTbData** pSubmitTbDataRet
return
-
1
;
}
ASSERT
(
pReader
->
cachedSchemaVer
==
pReader
->
pSchemaWrapper
->
version
);
pReader
->
cachedSchemaUid
=
uid
;
pReader
->
cachedSchemaSuid
=
suid
;
pReader
->
cachedSchemaVer
=
sversion
;
SSchemaWrapper
*
pSchemaWrapper
=
pReader
->
pSchemaWrapper
;
if
(
blockDataGetNumOfCols
(
pBlock
)
>
0
)
{
blockDataDestroy
(
pReader
->
pResBlock
);
pReader
->
pResBlock
=
createDataBlock
();
pBlock
=
pReader
->
pResBlock
;
pBlock
->
info
.
id
.
uid
=
uid
;
pBlock
->
info
.
version
=
pReader
->
msg
.
ver
;
}
int32_t
numOfCols
=
taosArrayGetSize
(
pReader
->
pColIdList
);
if
(
numOfCols
==
0
)
{
// all columns are required
for
(
int32_t
i
=
0
;
i
<
pSchemaWrapper
->
nCols
;
++
i
)
{
SSchema
*
pColSchema
=
&
pSchemaWrapper
->
pSchema
[
i
];
SColumnInfoData
colInfo
=
createColumnInfoData
(
pColSchema
->
type
,
pColSchema
->
bytes
,
pColSchema
->
colId
);
int32_t
code
=
blockDataAppendColInfo
(
pBlock
,
&
colInfo
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
blockDataFreeRes
(
pBlock
);
return
-
1
;
}
}
}
else
{
if
(
numOfCols
>
pSchemaWrapper
->
nCols
)
{
numOfCols
=
pSchemaWrapper
->
nCols
;
}
int32_t
i
=
0
;
int32_t
j
=
0
;
while
(
i
<
pSchemaWrapper
->
nCols
&&
j
<
numOfCols
)
{
SSchema
*
pColSchema
=
&
pSchemaWrapper
->
pSchema
[
i
];
col_id_t
colIdSchema
=
pColSchema
->
colId
;
col_id_t
colIdNeed
=
*
(
col_id_t
*
)
taosArrayGet
(
pReader
->
pColIdList
,
j
);
if
(
colIdSchema
<
colIdNeed
)
{
i
++
;
}
else
if
(
colIdSchema
>
colIdNeed
)
{
j
++
;
}
else
{
SColumnInfoData
colInfo
=
createColumnInfoData
(
pColSchema
->
type
,
pColSchema
->
bytes
,
pColSchema
->
colId
);
int32_t
code
=
blockDataAppendColInfo
(
pBlock
,
&
colInfo
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
-
1
;
}
i
++
;
j
++
;
}
if
(
blockDataGetNumOfCols
(
pBlock
)
==
0
)
{
int32_t
code
=
buildResSDataBlock
(
pReader
->
pResBlock
,
pReader
->
pSchemaWrapper
,
pReader
->
pColIdList
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录