Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
0dfd0320
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,发现更多精彩内容 >>
提交
0dfd0320
编写于
8月 20, 2022
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): reset block data when no blocks are available.
上级
09ffcd2e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
14 deletion
+29
-14
source/dnode/vnode/src/tsdb/tsdbRead.c
source/dnode/vnode/src/tsdb/tsdbRead.c
+29
-14
未找到文件。
source/dnode/vnode/src/tsdb/tsdbRead.c
浏览文件 @
0dfd0320
...
...
@@ -400,7 +400,7 @@ _err:
static
void
resetDataBlockIterator
(
SDataBlockIter
*
pIter
,
int32_t
order
,
SHashObj
*
pTableMap
)
{
pIter
->
order
=
order
;
pIter
->
index
=
-
1
;
pIter
->
numOfBlocks
=
-
1
;
pIter
->
numOfBlocks
=
0
;
if
(
pIter
->
blockList
==
NULL
)
{
pIter
->
blockList
=
taosArrayInit
(
4
,
sizeof
(
SFileDataBlockInfo
));
}
else
{
...
...
@@ -1904,7 +1904,6 @@ static bool nextRowInLastBlock(SLastBlockReader *pLastBlockReader) {
return
false
;
}
bool
asc
=
ASCENDING_TRAVERSE
(
pLastBlockReader
->
order
);
*
(
pLastBlockReader
->
rowIndex
)
+=
step
;
SBlockData
*
pBlockData
=
&
pLastBlockReader
->
lastBlockData
;
...
...
@@ -2320,10 +2319,12 @@ static int32_t moveToNextFile(STsdbReader* pReader, SBlockNumber* pBlockNum) {
size_t
numOfTables
=
taosHashGetSize
(
pReader
->
status
.
pTableMap
);
SArray
*
pIndexList
=
taosArrayInit
(
numOfTables
,
sizeof
(
SBlockIdx
));
SArray
*
pLastBlocks
=
pStatus
->
fileIter
.
pLastBlockReader
->
pBlockL
;
while
(
1
)
{
bool
hasNext
=
filesetIteratorNext
(
&
pStatus
->
fileIter
,
pReader
);
if
(
!
hasNext
)
{
// no data files on disk
taosArrayClear
(
pLastBlocks
);
break
;
}
...
...
@@ -2334,7 +2335,6 @@ static int32_t moveToNextFile(STsdbReader* pReader, SBlockNumber* pBlockNum) {
return
code
;
}
SArray
*
pLastBlocks
=
pStatus
->
fileIter
.
pLastBlockReader
->
pBlockL
;
code
=
tsdbReadBlockL
(
pReader
->
pFileReader
,
pLastBlocks
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
taosArrayDestroy
(
pIndexList
);
...
...
@@ -2385,6 +2385,7 @@ static int32_t doLoadRelatedLastBlock(SLastBlockReader* pLastBlockReader, uint64
}
if
(
pLastBlockReader
->
currentBlockIndex
==
-
1
)
{
tBlockDataDestroy
(
&
pLastBlockReader
->
lastBlockData
,
false
);
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -2431,16 +2432,25 @@ static int32_t doLoadLastBlockSequentially(STsdbReader* pReader) {
return
code
;
}
initLastBlockReader
(
pLastBlockReader
,
pScanInfo
->
uid
,
&
pScanInfo
->
indexInBlockL
);
if
(
pScanInfo
->
indexInBlockL
==
DEFAULT_ROW_INDEX_VAL
||
pScanInfo
->
indexInBlockL
==
pLastBlockReader
->
lastBlockData
.
nRow
)
{
bool
hasData
=
nextRowInLastBlock
(
pLastBlockReader
);
if
(
!
hasData
)
{
// current table does not have rows in last block, try next table
pStatus
->
pTableIter
=
taosHashIterate
(
pStatus
->
pTableMap
,
pStatus
->
pTableIter
);
if
(
pStatus
->
pTableIter
==
NULL
)
{
return
TSDB_CODE_SUCCESS
;
if
(
pLastBlockReader
->
currentBlockIndex
!=
-
1
)
{
initLastBlockReader
(
pLastBlockReader
,
pScanInfo
->
uid
,
&
pScanInfo
->
indexInBlockL
);
if
(
pScanInfo
->
indexInBlockL
==
DEFAULT_ROW_INDEX_VAL
||
pScanInfo
->
indexInBlockL
==
pLastBlockReader
->
lastBlockData
.
nRow
)
{
bool
hasData
=
nextRowInLastBlock
(
pLastBlockReader
);
if
(
!
hasData
)
{
// current table does not have rows in last block, try next table
pStatus
->
pTableIter
=
taosHashIterate
(
pStatus
->
pTableMap
,
pStatus
->
pTableIter
);
if
(
pStatus
->
pTableIter
==
NULL
)
{
return
TSDB_CODE_SUCCESS
;
}
continue
;
}
continue
;
}
}
else
{
// no data in last block, try next table
pStatus
->
pTableIter
=
taosHashIterate
(
pStatus
->
pTableMap
,
pStatus
->
pTableIter
);
if
(
pStatus
->
pTableIter
==
NULL
)
{
return
TSDB_CODE_SUCCESS
;
}
continue
;
}
code
=
doBuildDataBlock
(
pReader
);
...
...
@@ -2491,6 +2501,11 @@ static int32_t doBuildDataBlock(STsdbReader* pReader) {
return
code
;
}
if
(
pLastBlockReader
->
currentBlockIndex
==
-
1
)
{
// ASSERT(0);
printf
(
"error
\n
"
);
}
initLastBlockReader
(
pLastBlockReader
,
pScanInfo
->
uid
,
&
pScanInfo
->
indexInBlockL
);
if
(
pScanInfo
->
indexInBlockL
==
DEFAULT_ROW_INDEX_VAL
||
pScanInfo
->
indexInBlockL
==
pLastBlockReader
->
lastBlockData
.
nRow
)
{
bool
hasData
=
nextRowInLastBlock
(
pLastBlockReader
);
...
...
@@ -2594,7 +2609,8 @@ static int32_t initForFirstBlockInFile(STsdbReader* pReader, SDataBlockIter* pBl
if
(
num
.
numOfBlocks
>
0
)
{
code
=
initBlockIterator
(
pReader
,
pBlockIter
,
num
.
numOfBlocks
);
}
else
{
pBlockIter
->
numOfBlocks
=
0
;
tBlockDataReset
(
&
pReader
->
status
.
fileBlockData
);
resetDataBlockIterator
(
pBlockIter
,
pReader
->
order
,
pReader
->
status
.
pTableMap
);
}
// set the correct start position according to the query time window
...
...
@@ -2663,9 +2679,8 @@ static int32_t buildBlockFromFiles(STsdbReader* pReader) {
initBlockDumpInfo
(
pReader
,
pBlockIter
);
}
else
if
(
taosArrayGetSize
(
pReader
->
status
.
fileIter
.
pLastBlockReader
->
pBlockL
)
>
0
)
{
// data blocks in current file are exhausted, let's try the next file now
// todo dump all data in last block if exists.
pBlockIter
->
numOfBlocks
=
0
;
taosArrayClear
(
pBlockIter
->
blockList
);
tBlockDataReset
(
&
pReader
->
status
.
fileBlockData
);
resetDataBlockIterator
(
pBlockIter
,
pReader
->
order
,
pReader
->
status
.
pTableMap
);
goto
_begin
;
}
else
{
code
=
initForFirstBlockInFile
(
pReader
,
pBlockIter
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录