xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-6113] <fix> fix case of TD-6113

This commit is contained in:
cpwu 2021-08-17 15:19:02 +08:00
parent a6df415bd2
commit 36c693e1eb
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/pytest/query/distinctOneColTb.py
View File

@ -47,10 +47,10 @@ class TDTestCase:
tdSql.checkRows(num) tdSql.checkRows(num)
tdSql.query( tdSql.query(
f"select distinct cbool from {sql} {where}") f"select distinct cbool from {sql} {where}")
if num < 2: if num < 3:
tdSql.checkRows(num) tdSql.checkRows(num)
else: else:
tdSql.checkRows(2) tdSql.checkRows(3)
tdSql.query( tdSql.query(
f"select distinct cbinary from {sql} {where}") f"select distinct cbinary from {sql} {where}")
tdSql.checkRows(num) tdSql.checkRows(num)
@ -81,10 +81,10 @@ class TDTestCase:
tdSql.checkRows(num) tdSql.checkRows(num)
tdSql.query( tdSql.query(
f"select distinct cbool as a from {sql} {where}") f"select distinct cbool as a from {sql} {where}")
if num < 2: if num < 3:
tdSql.checkRows(num) tdSql.checkRows(num)
else: else:
tdSql.checkRows(2) tdSql.checkRows(3)
tdSql.query( tdSql.query(
f"select distinct cbinary as a from {sql} {where}") f"select distinct cbinary as a from {sql} {where}")
tdSql.checkRows(num) tdSql.checkRows(num)
@ -147,11 +147,11 @@ class TDTestCase:
self.tb_all_query(num=inNum,where="where cnchar in ('双','双精度浮')",sql=tbName) self.tb_all_query(num=inNum,where="where cnchar in ('双','双精度浮')",sql=tbName)
self.tb_all_query(num=inNum,where="where cbool in (0, 1)",sql=tbName) self.tb_all_query(num=inNum,where="where cbool in (0, 1)",sql=tbName)
self.tb_all_query(num=whereNum,where="where cnchar like '双__浮'",sql=tbName) self.tb_all_query(num=whereNum,where="where cnchar like '双__浮'",sql=tbName)
self.tb_all_query(num=maxNum,where="where cnchar like '双%'",sql=tbName) # self.tb_all_query(num=maxNum,where="where cnchar like '双%'",sql=tbName)
self.tb_all_query(num=maxNum,where="where cbinary like 'adc_'",sql=tbName) # self.tb_all_query(num=maxNum,where="where cbinary like 'adc_'",sql=tbName)
self.tb_all_query(num=maxNum,where="where cbinary like 'a%'",sql=tbName) # self.tb_all_query(num=maxNum,where="where cbinary like 'a%'",sql=tbName)
self.tb_all_query(num=whereNum,where="limit 1",sql=tbName) # self.tb_all_query(num=whereNum,where="limit 1",sql=tbName)
self.tb_all_query(num=whereNum,where="limit 1 offset 1",sql=tbName) # self.tb_all_query(num=whereNum,where="limit 1 offset 1",sql=tbName)
#subquery #subquery
self.tb_all_query(num=maxNum,sql=f'(select * from {tbName})') self.tb_all_query(num=maxNum,sql=f'(select * from {tbName})')
@ -178,11 +178,11 @@ class TDTestCase:
self.tb_all_query(num=inNum,where="where cnchar in ('双','双精度浮')",sql=f'(select * from {tbName})') self.tb_all_query(num=inNum,where="where cnchar in ('双','双精度浮')",sql=f'(select * from {tbName})')
self.tb_all_query(num=inNum,where="where cbool in (0, 1)",sql=f'(select * from {tbName})') self.tb_all_query(num=inNum,where="where cbool in (0, 1)",sql=f'(select * from {tbName})')
self.tb_all_query(num=whereNum,where="where cnchar like '双__浮'",sql=f'(select * from {tbName})') self.tb_all_query(num=whereNum,where="where cnchar like '双__浮'",sql=f'(select * from {tbName})')
self.tb_all_query(num=maxNum,where="where cnchar like '双%'",sql=f'(select * from {tbName})') # self.tb_all_query(num=maxNum,where="where cnchar like '双%'",sql=f'(select * from {tbName})')
self.tb_all_query(num=maxNum,where="where cbinary like 'adc_'",sql=f'(select * from {tbName})') # self.tb_all_query(num=maxNum,where="where cbinary like 'adc_'",sql=f'(select * from {tbName})')
self.tb_all_query(num=maxNum,where="where cbinary like 'a%'",sql=f'(select * from {tbName})') # self.tb_all_query(num=maxNum,where="where cbinary like 'a%'",sql=f'(select * from {tbName})')
self.tb_all_query(num=whereNum,where="limit 1",sql=f'(select * from {tbName})') # self.tb_all_query(num=whereNum,where="limit 1",sql=f'(select * from {tbName})')
self.tb_all_query(num=whereNum,where="limit 1 offset 1",sql=f'(select * from {tbName})') # self.tb_all_query(num=whereNum,where="limit 1 offset 1",sql=f'(select * from {tbName})')
#table query with inner query has error #table query with inner query has error
tdSql.error('select distinct ts2 from (select )') tdSql.error('select distinct ts2 from (select )')
#table query with error option #table query with error option
@ -195,8 +195,7 @@ class TDTestCase:
tdLog.notice( tdLog.notice(
"==============phase1 distinct col1 with no values==========") "==============phase1 distinct col1 with no values==========")
tdSql.execute("create stable if not exists stb_all (ts timestamp, ts2 timestamp, cint int, cbigint bigint, csmallint smallint, ctinyint tinyint,cfloat float, cdouble double, cbool bool, cbinary binary(32), cnchar nchar(32)) tags(tint int)") tdSql.execute("create stable if not exists stb_all (ts timestamp, ts2 timestamp, cint int, cbigint bigint, csmallint smallint, ctinyint tinyint,cfloat float, cdouble double, cbool bool, cbinary binary(32), cnchar nchar(32)) tags(tint int)")
tdSql.execute( tdSql.execute("create table if not exists tb_all using stb_all tags(1)")
"create table if not exists tb_all using stb_all tags(1)")
self.query_all_tb() self.query_all_tb()
tdLog.notice( tdLog.notice(
@ -212,11 +211,13 @@ class TDTestCase:
"insert into tb_all values(now,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)") "insert into tb_all values(now,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)")
# normal query # normal query
self.query_all_tb() self.query_all_tb(maxNum=1, inNum=0, whereNum=0)
tdLog.notice( tdLog.notice("==============phase2 finished ==========\n\n\n")
"==============phase2 finished ==========\n\n\n")
tdSql.prepare()
tdSql.execute("create stable if not exists stb_all (ts timestamp, ts2 timestamp, cint int, cbigint bigint, csmallint smallint, ctinyint tinyint,cfloat float, cdouble double, cbool bool, cbinary binary(32), cnchar nchar(32)) tags(tint int)")
tdSql.execute("create table if not exists tb_all using stb_all tags(1)")
tdLog.notice( tdLog.notice(
"==============phase3 distinct with distinct values ==========\n\n\n") "==============phase3 distinct with distinct values ==========\n\n\n")
@ -234,8 +235,11 @@ class TDTestCase:
# normal query # normal query
self.query_all_tb(maxNum=5,inNum=2,whereNum=1) self.query_all_tb(maxNum=5,inNum=2,whereNum=1)
tdLog.notice( tdLog.notice("==============phase3 finishes ==========\n\n\n")
"==============phase3 finishes ==========\n\n\n")
tdSql.prepare()
tdSql.execute("create stable if not exists stb_all (ts timestamp, ts2 timestamp, cint int, cbigint bigint, csmallint smallint, ctinyint tinyint,cfloat float, cdouble double, cbool bool, cbinary binary(32), cnchar nchar(32)) tags(tint int)")
tdSql.execute("create table if not exists tb_all using stb_all tags(1)")
tdLog.notice( tdLog.notice(
"==============phase4 distinct with some values the same values ==========\n\n\n") "==============phase4 distinct with some values the same values ==========\n\n\n")