From 062e5a339ee34db0b020cf9e64c2d5da67797079 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Mon, 15 Jan 2024 11:23:04 +0800 Subject: [PATCH] fix: sum.py support -R --- tests/pytest/util/autogen.py | 7 +++---- tests/system-test/2-query/sum.py | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/pytest/util/autogen.py b/tests/pytest/util/autogen.py index 243cb8c333..f1af5364d2 100644 --- a/tests/pytest/util/autogen.py +++ b/tests/pytest/util/autogen.py @@ -114,7 +114,6 @@ class AutoGen: def create_db(self, dbname, vgroups = 2, replica = 1): self.dbname = dbname tdSql.execute(f'create database {dbname} vgroups {vgroups} replica {replica}') - tdSql.execute(f'use {dbname}') # create table or stable def create_stable(self, stbname, tag_cnt, column_cnt, binary_len, nchar_len): @@ -124,7 +123,7 @@ class AutoGen: self.mtags, tags = self.gen_columns_sql("t", tag_cnt, binary_len, nchar_len) self.mcols, cols = self.gen_columns_sql("c", column_cnt - 1, binary_len, nchar_len) - sql = f"create table {stbname} (ts timestamp, {cols}) tags({tags})" + sql = f"create table {self.dbname}.{stbname} (ts timestamp, {cols}) tags({tags})" tdSql.execute(sql) # create child table @@ -133,7 +132,7 @@ class AutoGen: self.child_name = prename for i in range(cnt): tags_data = self.gen_data(i, self.mtags) - sql = f"create table {prename}{i} using {stbname} tags({tags_data})" + sql = f"create table {self.dbname}.{prename}{i} using {stbname} tags({tags_data})" tdSql.execute(sql) tdLog.info(f"create child tables {cnt} ok") @@ -158,7 +157,7 @@ class AutoGen: # end batch if values != "": - sql = f"insert into {child_name} values {values}" + sql = f"insert into {self.dbname}.{child_name} values {values}" tdSql.execute(sql) tdLog.info(f" insert data i={i}") values = "" diff --git a/tests/system-test/2-query/sum.py b/tests/system-test/2-query/sum.py index b600387603..5e372bca20 100644 --- a/tests/system-test/2-query/sum.py +++ b/tests/system-test/2-query/sum.py @@ -211,9 +211,11 @@ class TDTestCase: def testAllTypes(self): # create stable and insert tdLog.info("test all types") + dbname = "sumdb" stbname = "stb" colnum = 16 self.autoGen.set_batch_size(1000) + self.autoGen.create_db(dbname) self.autoGen.create_stable(stbname, 16, colnum, 8, 16) self.autoGen.create_child(stbname, "d", 4) self.autoGen.insert_data(10000) @@ -228,7 +230,7 @@ class TDTestCase: # query col = f"c{i}" - sql = f"select count({col}), sum({col}), avg({col}), max({col}), min({col}), stddev({col}), leastsquares({col},1,9)) from stb" + sql = f"select count({col}), sum({col}), avg({col}), max({col}), min({col}), stddev({col}), leastsquares({col},1,9) from {dbname}.{stbname}" tdSql.query(sql) # sum tdSql.checkData(0, 0, 4*10000, True)