Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
f3e15742
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
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,发现更多精彩内容 >>
未验证
提交
f3e15742
编写于
10月 29, 2022
作者:
H
Haojun Liao
提交者:
GitHub
10月 29, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17752 from taosdata/fix/liao_cov
Fix/liao cov
上级
a2a1f5b1
d583f1fa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
14 deletion
+17
-14
source/dnode/vnode/src/tsdb/tsdbRead.c
source/dnode/vnode/src/tsdb/tsdbRead.c
+15
-12
tests/system-test/2-query/interp.py
tests/system-test/2-query/interp.py
+2
-2
未找到文件。
source/dnode/vnode/src/tsdb/tsdbRead.c
浏览文件 @
f3e15742
...
@@ -3483,6 +3483,7 @@ static int32_t doOpenReaderImpl(STsdbReader* pReader) {
...
@@ -3483,6 +3483,7 @@ static int32_t doOpenReaderImpl(STsdbReader* pReader) {
initFilesetIterator
(
&
pReader
->
status
.
fileIter
,
pReader
->
pReadSnap
->
fs
.
aDFileSet
,
pReader
);
initFilesetIterator
(
&
pReader
->
status
.
fileIter
,
pReader
->
pReadSnap
->
fs
.
aDFileSet
,
pReader
);
resetDataBlockIterator
(
&
pReader
->
status
.
blockIter
,
pReader
->
order
);
resetDataBlockIterator
(
&
pReader
->
status
.
blockIter
,
pReader
->
order
);
// resetDataBlockScanInfo(pReader->status.pTableMap, pReader->window.skey);
// no data in files, let's try buffer in memory
// no data in files, let's try buffer in memory
if
(
pReader
->
status
.
fileIter
.
numOfFiles
==
0
)
{
if
(
pReader
->
status
.
fileIter
.
numOfFiles
==
0
)
{
...
@@ -3606,16 +3607,6 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* pTabl
...
@@ -3606,16 +3607,6 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, SArray* pTabl
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
return
code
;
}
}
code
=
doOpenReaderImpl
(
pNextReader
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
code
=
doOpenReaderImpl
(
pReader
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
}
}
}
}
...
@@ -3746,15 +3737,21 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
...
@@ -3746,15 +3737,21 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
if
(
pReader
->
innerReader
[
0
]
!=
NULL
&&
pReader
->
step
==
0
)
{
if
(
pReader
->
innerReader
[
0
]
!=
NULL
&&
pReader
->
step
==
0
)
{
bool
ret
=
doTsdbNextDataBlock
(
pReader
->
innerReader
[
0
]);
bool
ret
=
doTsdbNextDataBlock
(
pReader
->
innerReader
[
0
]);
resetDataBlockScanInfo
(
pReader
->
innerReader
[
0
]
->
status
.
pTableMap
,
pReader
->
innerReader
[
0
]
->
window
.
ekey
);
pReader
->
step
=
EXTERNAL_ROWS_PREV
;
pReader
->
step
=
EXTERNAL_ROWS_PREV
;
if
(
ret
)
{
if
(
ret
)
{
return
ret
;
return
ret
;
}
}
}
}
if
(
pReader
->
step
==
EXTERNAL_ROWS_PREV
)
{
if
(
pReader
->
step
==
EXTERNAL_ROWS_PREV
)
{
// prepare for the main scan
int32_t
code
=
doOpenReaderImpl
(
pReader
);
resetDataBlockScanInfo
(
pReader
->
status
.
pTableMap
,
pReader
->
innerReader
[
0
]
->
window
.
ekey
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
pReader
->
step
=
EXTERNAL_ROWS_MAIN
;
pReader
->
step
=
EXTERNAL_ROWS_MAIN
;
}
}
...
@@ -3764,7 +3761,13 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
...
@@ -3764,7 +3761,13 @@ bool tsdbNextDataBlock(STsdbReader* pReader) {
}
}
if
(
pReader
->
innerReader
[
1
]
!=
NULL
&&
pReader
->
step
==
EXTERNAL_ROWS_MAIN
)
{
if
(
pReader
->
innerReader
[
1
]
!=
NULL
&&
pReader
->
step
==
EXTERNAL_ROWS_MAIN
)
{
// prepare for the next row scan
int32_t
code
=
doOpenReaderImpl
(
pReader
->
innerReader
[
1
]);
resetDataBlockScanInfo
(
pReader
->
innerReader
[
1
]
->
status
.
pTableMap
,
pReader
->
window
.
ekey
);
resetDataBlockScanInfo
(
pReader
->
innerReader
[
1
]
->
status
.
pTableMap
,
pReader
->
window
.
ekey
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
bool
ret1
=
doTsdbNextDataBlock
(
pReader
->
innerReader
[
1
]);
bool
ret1
=
doTsdbNextDataBlock
(
pReader
->
innerReader
[
1
]);
pReader
->
step
=
EXTERNAL_ROWS_NEXT
;
pReader
->
step
=
EXTERNAL_ROWS_NEXT
;
if
(
ret1
)
{
if
(
ret1
)
{
...
...
tests/system-test/2-query/interp.py
浏览文件 @
f3e15742
...
@@ -36,7 +36,7 @@ class TDTestCase:
...
@@ -36,7 +36,7 @@ class TDTestCase:
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
values ('2020-02-01 00:00:05', 5, 5, 5, 5, 5.0, 5.0, true, 'varchar', 'nchar')"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
values ('2020-02-01 00:00:05', 5, 5, 5, 5, 5.0, 5.0, true, 'varchar', 'nchar')"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
values ('2020-02-01 00:00:10', 10, 10, 10, 10, 10.0, 10.0, true, 'varchar', 'nchar')"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
values ('2020-02-01 00:00:10', 10, 10, 10, 10, 10.0, 10.0, true, 'varchar', 'nchar')"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
values ('2020-02-01 00:00:15', 15, 15, 15, 15, 15.0, 15.0, true, 'varchar', 'nchar')"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
values ('2020-02-01 00:00:15', 15, 15, 15, 15, 15.0, 15.0, true, 'varchar', 'nchar')"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
(ts) values (now)"
)
tdSql
.
execute
(
f
"insert into
{
dbname
}
.
{
tbname
}
(ts) values (now)"
)
tdLog
.
printNoPrefix
(
"==========step3:fill null"
)
tdLog
.
printNoPrefix
(
"==========step3:fill null"
)
...
@@ -886,7 +886,7 @@ class TDTestCase:
...
@@ -886,7 +886,7 @@ class TDTestCase:
tdSql
.
query
(
f
"select interp(c0),interp(c1),interp(c2),interp(c3),interp(c4),interp(c5) from
{
dbname
}
.
{
tbname
}
range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(linear)"
)
tdSql
.
query
(
f
"select interp(c0),interp(c1),interp(c2),interp(c3),interp(c4),interp(c5) from
{
dbname
}
.
{
tbname
}
range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(linear)"
)
tdSql
.
checkRows
(
3
)
tdSql
.
checkRows
(
3
)
tdSql
.
checkCols
(
6
)
tdSql
.
checkCols
(
6
)
for
i
in
range
(
tdSql
.
queryCols
):
for
i
in
range
(
tdSql
.
queryCols
):
tdSql
.
checkData
(
0
,
i
,
13
)
tdSql
.
checkData
(
0
,
i
,
13
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录