From 7e0c4eeb7dc3589e8a08863c5c48107c4e60beca Mon Sep 17 00:00:00 2001 From: factosea <285808407@qq.com> Date: Tue, 11 Jun 2024 15:36:41 +0800 Subject: [PATCH] fix: join test case --- .../2-query/agg_group_AlwaysReturnValue.py | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/system-test/2-query/agg_group_AlwaysReturnValue.py b/tests/system-test/2-query/agg_group_AlwaysReturnValue.py index f7c82fc859..0cac9cb03b 100755 --- a/tests/system-test/2-query/agg_group_AlwaysReturnValue.py +++ b/tests/system-test/2-query/agg_group_AlwaysReturnValue.py @@ -1615,47 +1615,47 @@ class TDTestCase(TDTestCase): time.sleep(1) tdSql.query('select tbname,count(*) from d2') tdSql.checkData(0, 1, 0) - - tdSql.query('select b.tbname, count(*) from d1 a, d2 b where a.ts = b.ts group by b.tbname') - tdSql.checkData(0, 0, 'd2') - tdSql.checkData(0, 1, 0) - tdSql.query('select meter1.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter1.tbname order by meter1.tbname') - tdSql.checkData(0, 0, 'd1') - tdSql.checkData(1, 0, 'd2') - tdSql.checkData(0, 1, 0) - tdSql.query('select meter2.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter2.tbname order by meter2.tbname') - tdSql.checkData(0, 0, 'd21') - tdSql.checkData(1, 0, 'd22') - tdSql.checkData(0, 1, 0) - tdSql.query('select meter2.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts partition by meter2.tbname order by meter2.tbname') - tdSql.checkData(0, 0, 'd21') - tdSql.checkData(1, 0, 'd22') - tdSql.checkData(0, 1, 0) - tdSql.query('select m2.tbname, count(*) from meter1 m1, meter2 m2 where m1.ts = m2.ts partition by m2.tbname order by m2.tbname') - tdSql.checkData(0, 0, 'd21') - tdSql.checkData(1, 0, 'd22') - tdSql.checkData(0, 1, 0) - - tdSql.execute('insert into `d1` VALUES (now, 1) `d21` VALUES (now, 21)') - tdSql.execute('insert into `d1` VALUES (now, 2) `d21` VALUES (now, 22)') - tdSql.execute('insert into `d1` VALUES (now, 3) `d21` VALUES (now, 32)') + + tdSql.execute('insert into `d1` VALUES (now, 1)') + tdSql.execute('insert into `d1` VALUES (now+1s, 2)') + tdSql.execute('insert into `d1` VALUES (now+2s, 3)') + tdSql.execute('insert into `d2` VALUES (now+3s, 11)') + tdSql.execute('insert into `d2` VALUES (now+4s, 22)') + tdSql.execute('insert into `d2` VALUES (now+5s, 33)') + tdSql.execute('insert into `d21` select * from `d1`') # tdSql.query('select b.tbname, count(*) from d1 a, d2 b where a.ts = b.ts group by b.tbname') # tdSql.checkData(0, 0, 'd2') tdSql.query('select meter1.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter1.tbname order by meter1.tbname') tdSql.checkData(0, 0, 'd1') - tdSql.checkData(1, 0, 'd2') + tdSql.checkData(0, 1, 3) + # tdSql.checkData(1, 0, 'd2') tdSql.query('select meter2.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter2.tbname order by meter2.tbname') tdSql.checkData(0, 0, 'd21') - tdSql.checkData(1, 0, 'd22') + tdSql.checkData(0, 1, 3) + # tdSql.checkData(1, 0, 'd22') tdSql.query('select meter2.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts partition by meter2.tbname order by meter2.tbname') tdSql.checkData(0, 0, 'd21') - tdSql.checkData(1, 0, 'd22') + tdSql.checkData(0, 1, 3) + # tdSql.checkData(1, 0, 'd22') tdSql.query('select m2.tbname, count(*) from meter1 m1, meter2 m2 where m1.ts = m2.ts partition by m2.tbname order by m2.tbname') tdSql.checkData(0, 0, 'd21') + tdSql.checkData(0, 1, 3) + # tdSql.checkData(1, 0, 'd22') + + tdSql.execute('insert into `d22` select * from `d1`') + + tdSql.query('select meter1.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter1.tbname order by meter1.tbname') + tdSql.checkData(0, 0, 'd1') + tdSql.checkData(0, 1, 6) + + tdSql.query('select m2.tbname, count(*) from meter1 m1, meter2 m2 where m1.ts = m2.ts partition by m2.tbname order by m2.tbname') + tdSql.checkData(0, 0, 'd21') + tdSql.checkData(0, 1, 3) tdSql.checkData(1, 0, 'd22') - + tdSql.checkData(1, 1, 3) + tdSql.error('select tbname, count(*) from d1 a, d2 b where a.ts = b.ts group by b.tbname') # tdSql.error('select meter2.tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter1.tbname order by meter1.tbname') tdSql.error('select tbname, count(*) from meter1, meter2 where meter1.ts = meter2.ts group by meter2.tbname order by meter2.tbname') @@ -1671,9 +1671,9 @@ class TDTestCase(TDTestCase): # self.create_tables() # self.insert_data() - self.testTBNameUseJoin() - self.dropandcreateDB_random("nested", 1) #self.testTBNameUseJoin() + self.dropandcreateDB_random("nested", 1) + self.testTBNameUseJoin() self.modify_tables()