Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b1949b55
T
TDengine
项目概览
taosdata
/
TDengine
接近 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
b1949b55
编写于
3月 16, 2023
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(tsdb/cache): skip remaining rows in current data block
上级
6e0343fc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
49 addition
and
7 deletion
+49
-7
source/dnode/vnode/src/tsdb/tsdbCache.c
source/dnode/vnode/src/tsdb/tsdbCache.c
+49
-7
未找到文件。
source/dnode/vnode/src/tsdb/tsdbCache.c
浏览文件 @
b1949b55
...
@@ -745,6 +745,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
...
@@ -745,6 +745,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
int
nCols
)
{
int
nCols
)
{
SFSNextRowIter
*
state
=
(
SFSNextRowIter
*
)
iter
;
SFSNextRowIter
*
state
=
(
SFSNextRowIter
*
)
iter
;
int32_t
code
=
0
;
int32_t
code
=
0
;
bool
checkRemainingRow
=
true
;
switch
(
state
->
state
)
{
switch
(
state
->
state
)
{
case
SFSNEXTROW_FS
:
case
SFSNEXTROW_FS
:
...
@@ -859,11 +860,54 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
...
@@ -859,11 +860,54 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
code
=
tsdbReadDataBlock
(
*
state
->
pDataFReader
,
&
block
,
state
->
pBlockData
);
code
=
tsdbReadDataBlock
(
*
state
->
pDataFReader
,
&
block
,
state
->
pBlockData
);
if
(
code
)
goto
_err
;
if
(
code
)
goto
_err
;
for
(
int
colIndex
=
0
;
colIndex
<
state
->
pBlockData
->
nColData
;
++
colIndex
)
{
SColData
*
pColData
=
&
state
->
pBlockData
->
aColData
[
colIndex
];
if
(
isLast
&&
(
pColData
->
flag
&
HAS_VALUE
))
{
skipBlock
=
false
;
break
;
}
else
if
(
pColData
->
flag
&
(
HAS_VALUE
|
HAS_NULL
))
{
skipBlock
=
false
;
break
;
}
}
if
(
skipBlock
)
{
if
(
--
state
->
iBlock
<
0
)
{
tsdbDataFReaderClose
(
state
->
pDataFReader
);
*
state
->
pDataFReader
=
NULL
;
// resetLastBlockLoadInfo(state->pLoadInfo);
if
(
state
->
aBlockIdx
)
{
// taosArrayDestroy(state->aBlockIdx);
tsdbBICacheRelease
(
state
->
pTsdb
->
biCache
,
state
->
aBlockIdxHandle
);
state
->
aBlockIdxHandle
=
NULL
;
state
->
aBlockIdx
=
NULL
;
}
state
->
state
=
SFSNEXTROW_FILESET
;
goto
_next_fileset
;
}
else
{
goto
_next_datablock
;
}
}
state
->
nRow
=
state
->
blockData
.
nRow
;
state
->
iRow
=
state
->
nRow
-
1
;
state
->
state
=
SFSNEXTROW_BLOCKROW
;
checkRemainingRow
=
false
;
}
case
SFSNEXTROW_BLOCKROW
:
{
if
(
checkRemainingRow
)
{
bool
skipBlock
=
true
;
int
inputColIndex
=
0
;
for
(
int
colIndex
=
0
;
colIndex
<
state
->
pBlockData
->
nColData
;
++
colIndex
)
{
for
(
int
colIndex
=
0
;
colIndex
<
state
->
pBlockData
->
nColData
;
++
colIndex
)
{
SColData
*
pColData
=
&
state
->
pBlockData
->
aColData
[
colIndex
];
SColData
*
pColData
=
&
state
->
pBlockData
->
aColData
[
colIndex
];
int16_t
cid
=
pColData
->
cid
;
int16_t
cid
=
pColData
->
cid
;
if
(
inputColIndex
<
nCols
&&
cid
==
aCols
[
inputColIndex
++
])
{
if
(
inputColIndex
<
nCols
&&
cid
==
aCols
[
inputColIndex
])
{
if
(
isLast
&&
pColData
->
numOfValue
!=
0
)
{
if
(
isLast
&&
pColData
->
numOfValue
!=
0
)
{
skipBlock
=
false
;
skipBlock
=
false
;
break
;
break
;
...
@@ -871,6 +915,8 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
...
@@ -871,6 +915,8 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
skipBlock
=
false
;
skipBlock
=
false
;
break
;
break
;
}
}
++
inputColIndex
;
}
}
}
}
...
@@ -894,13 +940,8 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
...
@@ -894,13 +940,8 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
goto
_next_datablock
;
goto
_next_datablock
;
}
}
}
}
state
->
nRow
=
state
->
blockData
.
nRow
;
state
->
iRow
=
state
->
nRow
-
1
;
state
->
state
=
SFSNEXTROW_BLOCKROW
;
}
}
case
SFSNEXTROW_BLOCKROW
:
if
(
state
->
iRow
>=
0
)
{
if
(
state
->
iRow
>=
0
)
{
state
->
row
=
tsdbRowFromBlockData
(
state
->
pBlockData
,
state
->
iRow
);
state
->
row
=
tsdbRowFromBlockData
(
state
->
pBlockData
,
state
->
iRow
);
*
ppRow
=
&
state
->
row
;
*
ppRow
=
&
state
->
row
;
...
@@ -926,6 +967,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
...
@@ -926,6 +967,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
}
}
return
code
;
return
code
;
}
default:
default:
ASSERT
(
0
);
ASSERT
(
0
);
break
;
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录