From 947be795c79bdb9b175f549cf9cc9175be4b4066 Mon Sep 17 00:00:00 2001 From: charles Date: Mon, 26 Aug 2024 13:50:39 +0800 Subject: [PATCH 1/3] add test case for ts-5191 --- tests/army/alter/alterConfig.py | 43 ++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/tests/army/alter/alterConfig.py b/tests/army/alter/alterConfig.py index 7413e5e5a6..c6b5f44397 100644 --- a/tests/army/alter/alterConfig.py +++ b/tests/army/alter/alterConfig.py @@ -22,10 +22,47 @@ from frame.log import * from frame.cases import * from frame.sql import * from frame.caseBase import * +from frame.epath import * +from frame.srvCtl import * from frame import * class TDTestCase(TBase): + def alterTtlConfig(self): + """Add test case for altering ttl config + """ + db_name = "db" + tdSql.execute(f"create database {db_name};") + tdSql.execute(f"use {db_name};") + tdSql.execute("create table t1 (ts timestamp, a int);") + + ttl_min_value = 0 + ttl_max_value = 2147483647 + # verify ttl min value + tdSql.execute(f"alter table t1 ttl {ttl_min_value}") + tdSql.query("select `ttl` from information_schema.ins_tables where table_name='t1' and db_name='db';") + tdSql.checkData(0, 0, ttl_min_value) + # verify ttl max value + tdSql.execute(f"alter table t1 ttl {ttl_max_value}") + tdSql.query("select `ttl` from information_schema.ins_tables where table_name='t1' and db_name='db';") + tdSql.checkData(0, 0, ttl_max_value) + # verify abnormal ttl value + tdSql.error(f"alter table t1 ttl {ttl_max_value + 1}", expectErrInfo="Value out of range") + tdSql.error(f"alter table t1 ttl {ttl_min_value - 1}", expectErrInfo="syntax error") + + # TS-5291 + tdSql.execute("create database db5291 vgroups 1;") + tdSql.execute("use db5291;") + tdSql.execute("create table ttltb1(ts timestamp, ival int) ttl 1;") + tdSql.execute("create table ttltb2(ts timestamp, ival int) ttl 1;") + tdSql.execute("drop table ttltb1;") + tdSql.execute("flush database db5291;") + tdSql.execute("drop table ttltb2;") + # restart taosd + os.system("ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9") + sc.dnodeStart(1) + tdSql.execute("flush database db5291;") + def alterSupportVnodes(self): tdLog.info(f"test function of altering supportVnodes") @@ -33,7 +70,7 @@ class TDTestCase(TBase): time.sleep(1) tdSql.query('show dnodes') tdSql.checkData(0, 3, "128") - + tdSql.execute("alter dnode 1 'supportVnodes' '64'") time.sleep(1) tdSql.query('show dnodes') @@ -45,11 +82,11 @@ class TDTestCase(TBase): # TS-4721 self.alterSupportVnodes() - + # TS-5191 + self.alterTtlConfig() tdLog.success(f"{__file__} successfully executed") - tdCases.addLinux(__file__, TDTestCase()) tdCases.addWindows(__file__, TDTestCase()) From c525bd5ef946824e731484708747b6db8142d43f Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 26 Aug 2024 16:49:38 +0800 Subject: [PATCH 2/3] Update alterConfig.py --- tests/army/alter/alterConfig.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/army/alter/alterConfig.py b/tests/army/alter/alterConfig.py index c6b5f44397..7977dfa94a 100644 --- a/tests/army/alter/alterConfig.py +++ b/tests/army/alter/alterConfig.py @@ -61,6 +61,8 @@ class TDTestCase(TBase): # restart taosd os.system("ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9") sc.dnodeStart(1) + sc.dnodeStart(2) + sc.dnodeStart(3) tdSql.execute("flush database db5291;") def alterSupportVnodes(self): From 58c8156e8fce0f4fd8b795444d78bd55e686fd2f Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Wed, 28 Aug 2024 14:52:01 +0800 Subject: [PATCH 3/3] Update alterConfig.py --- tests/army/alter/alterConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/army/alter/alterConfig.py b/tests/army/alter/alterConfig.py index 7977dfa94a..6f709eb802 100644 --- a/tests/army/alter/alterConfig.py +++ b/tests/army/alter/alterConfig.py @@ -59,7 +59,7 @@ class TDTestCase(TBase): tdSql.execute("flush database db5291;") tdSql.execute("drop table ttltb2;") # restart taosd - os.system("ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9") + sc.dnodeStopAll() sc.dnodeStart(1) sc.dnodeStart(2) sc.dnodeStart(3)