Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
d864d4d6
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
未验证
提交
d864d4d6
编写于
1月 13, 2023
作者:
D
dapan1121
提交者:
GitHub
1月 13, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19523 from taosdata/szhou/fixbugs
fix: no stable null group when no normal table
上级
4cae701e
c2fd6015
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
242 addition
and
1 deletion
+242
-1
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+3
-1
tests/develop-test/2-query/table_count_scan.py
tests/develop-test/2-query/table_count_scan.py
+238
-0
tests/parallel_test/cases.task
tests/parallel_test/cases.task
+1
-0
未找到文件。
source/libs/executor/src/scanoperator.c
浏览文件 @
d864d4d6
...
...
@@ -3222,7 +3222,9 @@ static void buildVnodeGroupedNtbTableCount(STableCountScanOperatorInfo* pInfo, S
uint64_t
groupId
=
calcGroupId
(
fullStbName
,
strlen
(
fullStbName
));
pRes
->
info
.
id
.
groupId
=
groupId
;
int64_t
ntbNum
=
metaGetNtbNum
(
pInfo
->
readHandle
.
meta
);
fillTableCountScanDataBlock
(
pSupp
,
dbName
,
""
,
ntbNum
,
pRes
);
if
(
ntbNum
!=
0
)
{
fillTableCountScanDataBlock
(
pSupp
,
dbName
,
""
,
ntbNum
,
pRes
);
}
}
static
void
buildVnodeGroupedStbTableCount
(
STableCountScanOperatorInfo
*
pInfo
,
STableCountScanSupp
*
pSupp
,
...
...
tests/develop-test/2-query/table_count_scan.py
0 → 100644
浏览文件 @
d864d4d6
import
sys
from
util.log
import
*
from
util.cases
import
*
from
util.sql
import
*
from
util.dnodes
import
tdDnodes
from
math
import
inf
class
TDTestCase
:
def
caseDescription
(
self
):
'''
case1<shenglian zhou>: [TD-21890] table count scan test case
'''
return
def
init
(
self
,
conn
,
logSql
,
replicaVer
=
1
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
(),
False
)
self
.
_conn
=
conn
def
restartTaosd
(
self
,
index
=
1
,
dbname
=
"db"
):
tdDnodes
.
stop
(
index
)
tdDnodes
.
startWithoutSleep
(
index
)
tdSql
.
execute
(
f
"use tbl_count"
)
def
run
(
self
):
print
(
"running {}"
.
format
(
__file__
))
tdSql
.
execute
(
"drop database if exists tbl_count"
)
tdSql
.
execute
(
"create database if not exists tbl_count"
)
tdSql
.
execute
(
'use tbl_count'
)
tdSql
.
execute
(
'create table stb1 (ts timestamp, c1 bool, c2 tinyint, c3 smallint, c4 int, c5 bigint, c6 float, c7 double, c8 binary(10), c9 nchar(10), c10 tinyint unsigned, c11 smallint unsigned, c12 int unsigned, c13 bigint unsigned) TAGS(t1 int, t2 binary(10), t3 double);'
)
tdSql
.
execute
(
"create table tb1 using stb1 tags(1,'1',1.0);"
)
tdSql
.
execute
(
"create table tb2 using stb1 tags(2,'2',2.0);"
)
tdSql
.
execute
(
"create table tb3 using stb1 tags(3,'3',3.0);"
)
tdSql
.
execute
(
'insert into tb1 values (
\'
2021-11-11 09:00:00
\'
,true,1,1,1,1,1,1,"123","1234",1,1,1,1);'
)
tdSql
.
execute
(
"insert into tb1 values ('2021-11-11 09:00:01',true,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);"
)
tdSql
.
execute
(
'insert into tb1 values (
\'
2021-11-11 09:00:02
\'
,true,2,NULL,2,NULL,2,NULL,"234",NULL,2,NULL,2,NULL);'
)
tdSql
.
execute
(
'insert into tb1 values (
\'
2021-11-11 09:00:03
\'
,false,NULL,3,NULL,3,NULL,3,NULL,"3456",NULL,3,NULL,3);'
)
tdSql
.
execute
(
'insert into tb1 values (
\'
2021-11-11 09:00:04
\'
,true,4,4,4,4,4,4,"456","4567",4,4,4,4);'
)
tdSql
.
execute
(
'insert into tb1 values (
\'
2021-11-11 09:00:05
\'
,true,127,32767,2147483647,9223372036854775807,3.402823466e+38,1.79769e+308,"567","5678",254,65534,4294967294,9223372036854775807);'
)
tdSql
.
execute
(
'insert into tb1 values (
\'
2021-11-11 09:00:06
\'
,true,-127,-32767,-2147483647,-9223372036854775807,-3.402823466e+38,-1.79769e+308,"678","6789",0,0,0,0);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:00
\'
,true,1,1,1,1,1,1,"111","1111",1,1,1,1);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:01
\'
,true,2,2,2,2,2,2,"222","2222",2,2,2,2);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:02
\'
,true,3,3,2,3,3,3,"333","3333",3,3,3,3);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:03
\'
,false,4,4,4,4,4,4,"444","4444",4,4,4,4);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:04
\'
,true,5,5,5,5,5,5,"555","5555",5,5,5,5);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:05
\'
,true,6,6,6,6,6,6,"666","6666",6,6,6,6);'
)
tdSql
.
execute
(
'insert into tb2 values (
\'
2021-11-11 09:00:06
\'
,true,7,7,7,7,7,7,"777","7777",7,7,7,7);'
)
tdSql
.
query
(
'select count(*),db_name, stable_name from information_schema.ins_tables group by db_name, stable_name;'
)
tdSql
.
checkRows
(
3
)
tdSql
.
checkData
(
0
,
0
,
23
)
tdSql
.
checkData
(
0
,
1
,
'information_schema'
)
tdSql
.
checkData
(
0
,
2
,
None
)
tdSql
.
checkData
(
1
,
0
,
3
)
tdSql
.
checkData
(
1
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
1
,
2
,
'stb1'
)
tdSql
.
checkData
(
2
,
0
,
5
)
tdSql
.
checkData
(
2
,
1
,
'performance_schema'
)
tdSql
.
checkData
(
2
,
2
,
None
)
tdSql
.
query
(
'select count(1),db_name, stable_name from information_schema.ins_tables group by db_name, stable_name;'
)
tdSql
.
checkRows
(
3
)
tdSql
.
checkData
(
0
,
0
,
23
)
tdSql
.
checkData
(
0
,
1
,
'information_schema'
)
tdSql
.
checkData
(
0
,
2
,
None
)
tdSql
.
checkData
(
1
,
0
,
5
)
tdSql
.
checkData
(
1
,
1
,
'performance_schema'
)
tdSql
.
checkData
(
1
,
2
,
None
)
tdSql
.
checkData
(
2
,
0
,
3
)
tdSql
.
checkData
(
2
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
2
,
2
,
'stb1'
)
tdSql
.
query
(
'select count(1),db_name from information_schema.ins_tables group by db_name'
)
tdSql
.
checkRows
(
3
)
tdSql
.
checkData
(
0
,
0
,
5
)
tdSql
.
checkData
(
0
,
1
,
'performance_schema'
)
tdSql
.
checkData
(
1
,
0
,
3
)
tdSql
.
checkData
(
1
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
2
,
0
,
23
)
tdSql
.
checkData
(
2
,
1
,
'information_schema'
)
tdSql
.
query
(
"select count(*) from information_schema.ins_tables where db_name='tbl_count'"
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
0
,
3
)
tdSql
.
query
(
'select count(*) from information_schema.ins_tables where db_name=
\'
tbl_count
\'
and stable_name="stb1";'
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
0
,
3
)
tdSql
.
query
(
'select count(*) from information_schema.ins_tables'
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
0
,
31
)
tdSql
.
execute
(
'create table stba (ts timestamp, c1 bool, c2 tinyint, c3 smallint, c4 int, c5 bigint, c6 float, c7 double, c8 binary(10), c9 nchar(10), c10 tinyint unsigned, c11 smallint unsigned, c12 int unsigned, c13 bigint unsigned) TAGS(t1 int, t2 binary(10), t3 double);'
)
tdSql
.
execute
(
"create table tba1 using stba tags(1,'1',1.0);"
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:00
\'
,true, 1,1,1,1,1,1,"111","1111",1,1,1,1);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:01
\'
,true, 2,2,2,2,2,2,"222","2222",2,2,2,2);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:02
\'
,true, 3,3,2,3,3,3,"333","3333",3,3,3,3);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:03
\'
,false,4,4,4,4,4,4,"444","4444",4,4,4,4);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:04
\'
,true, 5,5,5,5,5,5,"555","5555",5,5,5,5);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:05
\'
,true, 6,6,6,6,6,6,"666","6666",6,6,6,6);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:06
\'
,true, 7,7,7,7,7,7,"777","7777",7,7,7,7);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:07
\'
,true, 8,8,8,8,8,8,"888","8888",8,8,8,8);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:08
\'
,true, 9,9,9,9,9,9,"999","9999",9,9,9,9);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:09
\'
,true, 0,0,0,0,0,0,"000","0000",0,0,0,0);'
)
self
.
restartTaosd
(
1
,
dbname
=
'tbl_count'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:10
\'
,true, 1,1,1,1,1,1,"111","1111",1,1,1,1);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:11
\'
,true, 2,2,2,2,2,2,"222","2222",2,2,2,2);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:12
\'
,true, 3,3,2,3,3,3,"333","3333",3,3,3,3);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:13
\'
,false,4,4,4,4,4,4,"444","4444",4,4,4,4);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:14
\'
,true, 5,5,5,5,5,5,"555","5555",5,5,5,5);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:15
\'
,true, 6,6,6,6,6,6,"666","6666",6,6,6,6);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:16
\'
,true, 7,7,7,7,7,7,"777","7777",7,7,7,7);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:17
\'
,true, 8,8,8,8,8,8,"888","8888",8,8,8,8);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:18
\'
,true, 9,9,9,9,9,9,"999","9999",9,9,9,9);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:19
\'
,true, 0,0,0,0,0,0,"000","0000",0,0,0,0);'
)
self
.
restartTaosd
(
1
,
dbname
=
'tbl_count'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:20
\'
,true, 1,1,1,1,1,1,"111","1111",1,1,1,1);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:21
\'
,true, 2,2,2,2,2,2,"222","2222",2,2,2,2);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:22
\'
,true, 3,3,2,3,3,3,"333","3333",3,3,3,3);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:23
\'
,false,4,4,4,4,4,4,"444","4444",4,4,4,4);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:24
\'
,true, 5,5,5,5,5,5,"555","5555",5,5,5,5);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:25
\'
,true, 6,6,6,6,6,6,"666","6666",6,6,6,6);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:26
\'
,true, 7,7,7,7,7,7,"777","7777",7,7,7,7);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:27
\'
,true, 8,8,8,8,8,8,"888","8888",8,8,8,8);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:28
\'
,true, 9,9,9,9,9,9,"999","9999",9,9,9,9);'
)
tdSql
.
execute
(
'insert into tba1 values (
\'
2021-11-11 09:00:29
\'
,true, 0,0,0,0,0,0,"000","0000",0,0,0,0);'
)
tdSql
.
query
(
'select count(*),db_name, stable_name from information_schema.ins_tables group by db_name, stable_name;'
)
tdSql
.
checkRows
(
4
)
tdSql
.
checkData
(
0
,
0
,
1
)
tdSql
.
checkData
(
0
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
0
,
2
,
'stba'
)
tdSql
.
checkData
(
1
,
0
,
23
)
tdSql
.
checkData
(
1
,
1
,
'information_schema'
)
tdSql
.
checkData
(
1
,
2
,
None
)
tdSql
.
checkData
(
2
,
0
,
3
)
tdSql
.
checkData
(
2
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
2
,
2
,
'stb1'
)
tdSql
.
checkData
(
3
,
0
,
5
)
tdSql
.
checkData
(
3
,
1
,
'performance_schema'
)
tdSql
.
checkData
(
3
,
2
,
None
)
tdSql
.
query
(
'select count(1),db_name, stable_name from information_schema.ins_tables group by db_name, stable_name;'
)
tdSql
.
checkRows
(
4
)
tdSql
.
checkData
(
0
,
0
,
23
)
tdSql
.
checkData
(
0
,
1
,
'information_schema'
)
tdSql
.
checkData
(
0
,
2
,
None
)
tdSql
.
checkData
(
1
,
0
,
5
)
tdSql
.
checkData
(
1
,
1
,
'performance_schema'
)
tdSql
.
checkData
(
1
,
2
,
None
)
tdSql
.
checkData
(
2
,
0
,
1
)
tdSql
.
checkData
(
2
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
2
,
2
,
'stba'
)
tdSql
.
checkData
(
3
,
0
,
3
)
tdSql
.
checkData
(
3
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
3
,
2
,
'stb1'
)
tdSql
.
query
(
'select count(1),db_name from information_schema.ins_tables group by db_name'
)
tdSql
.
checkRows
(
3
)
tdSql
.
checkData
(
0
,
0
,
5
)
tdSql
.
checkData
(
0
,
1
,
'performance_schema'
)
tdSql
.
checkData
(
1
,
0
,
4
)
tdSql
.
checkData
(
1
,
1
,
'tbl_count'
)
tdSql
.
checkData
(
2
,
0
,
23
)
tdSql
.
checkData
(
2
,
1
,
'information_schema'
)
tdSql
.
query
(
"select count(*) from information_schema.ins_tables where db_name='tbl_count'"
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
0
,
4
)
tdSql
.
query
(
'select count(*) from information_schema.ins_tables where db_name=
\'
tbl_count
\'
and stable_name="stb1";'
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
0
,
3
)
tdSql
.
query
(
'select count(*) from information_schema.ins_tables'
)
tdSql
.
checkRows
(
1
)
tdSql
.
checkData
(
0
,
0
,
32
)
tdSql
.
execute
(
'drop database tbl_count'
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tests/parallel_test/cases.task
浏览文件 @
d864d4d6
...
...
@@ -1050,6 +1050,7 @@
,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-20582.py
#develop test
,,n,develop-test,python3 ./test.py -f 2-query/table_count_scan.py
,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/auto_create_table_json.py
,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/custom_col_tag.py
,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/default_json.py
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录