diff --git a/tests/system-test/0-others/compact_auto.py b/tests/system-test/0-others/compact_auto.py index dbf050e00a..813be3e9f0 100644 --- a/tests/system-test/0-others/compact_auto.py +++ b/tests/system-test/0-others/compact_auto.py @@ -133,20 +133,20 @@ class TDTestCase: ["compact_time_range -100;-90", "Invalid option compact_time_range, should have 2 value"], ["compact_time_range -100:-90", "syntax error near"], ["compact_time_range -100 -90", "syntax error near"], - ["compact_interval 1m", "Invalid option compact_interval: 1m, valid range: [10m, 5256000m]"], - ["compact_interval 199999999999m", "valid range: [10m, 5256000m]"], - ["compact_interval 9999999999999m", "Invalid option compact_interval: 9999999999999m, valid range: [10m, 5256000m]"], - ["compact_interval 5256001m", "Invalid option compact_interval: 5256001m, valid range: [10m, 5256000m]"], - ["compact_interval 3651", "Invalid option compact_interval: 5257440m, valid range: [10m, 5256000m]"], + ["compact_interval 1m", "Invalid option compact_interval: 1, valid range: [10, 5256000]"], + ["compact_interval 199999999999m", "valid range: [10, 5256000]"], + ["compact_interval 9999999999999m", "Invalid option compact_interval: 9999999999999, valid range: [10, 5256000]"], + ["compact_interval 5256001m", "Invalid option compact_interval: 5256001, valid range: [10, 5256000]"], + ["compact_interval 3651", "Invalid option compact_interval: 5257440, valid range: [10, 5256000]"], ["compact_interval 86400s", "Invalid option compact_interval unit: s, only m, h, d allowed"], ["compact_interval -1", "syntax error near"], ["compact_time_offset -1", "syntax error near"], ["compact_time_offset 3600s", "Invalid option compact_time_offset unit: s, only h allowed"], ["compact_time_offset 1d", "Invalid option compact_time_offset unit: d, only h allowed"], - ["compact_time_offset 24", "Invalid option compact_time_offset: 24h, valid range: [0h, 23h]"], - ["compact_time_offset 24h", "Invalid option compact_time_offset: 24h, valid range: [0h, 23h]"], - ["compact_time_offset 9999999999999", "valid range: [0h, 23h]"], - ["compact_time_offset 199999999999", "valid range: [0h, 23h]"], + ["compact_time_offset 24", "Invalid option compact_time_offset: 24, valid range: [0, 23]"], + ["compact_time_offset 24h", "Invalid option compact_time_offset: 24, valid range: [0, 23]"], + ["compact_time_offset 9999999999999", "valid range: [0, 23]"], + ["compact_time_offset 199999999999", "valid range: [0, 23]"], ["compact_time_offset 1d", "Invalid option compact_time_offset unit: d, only h allowed"], ["compact_interval 10m compact_time_range -120d,-60 compact_time_offset 1d", "Invalid option compact_time_offset unit: d, only h allowed"], ] diff --git a/tests/system-test/0-others/compact_auto_dispatch.py b/tests/system-test/0-others/compact_auto_dispatch.py new file mode 100644 index 0000000000..0d83974354 --- /dev/null +++ b/tests/system-test/0-others/compact_auto_dispatch.py @@ -0,0 +1,57 @@ +import taos +import sys +import time +import socket +import os +import threading +import psutil +import platform +from util.log import * +from util.sql import * +from util.cases import * +from util.dnodes import * + + +class TDTestCase: + def init(self, conn, logSql, replicaVar=1): + self.replicaVar = int(replicaVar) + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def compact_auto_dispatch(self): + tdLog.info("compact_auto_dispatch") + tdSql.execute("drop database if exists db") + tdSql.execute("create database db duration 1d compact_interval 10m compact_time_range -2d,-1d compact_time_offset 10") + tdSql.execute("create table db.stb (ts timestamp, a int) tags (tag1 binary(8))") + tdSql.execute("create table db.c1 using db.stb tags('c1')") + nowSec = time.time() + for i in range(2): + insertSql = f"insert into db.c1 values (%d, 1) tags('c1')" %(1000*(nowSec - 8640*i)) + tdLog.info(f"sql: {insertSql}") + tdSql.execute(insertSql) + tdSql.execute("select count(*) from db.c1") + tdSql.checkRows(100) + + def checkShowCreateWithTimeout(self, db, expectResult, timeout=30): + result = False + for i in range(timeout): + tdSql.query(f'show create database `%s`' %(db)) + tdSql.checkEqual(tdSql.queryResult[0][0], db) + if expectResult in tdSql.queryResult[0][1]: + result = True + break + time.sleep(1) + if result == False: + raise Exception(f"Unexpected result of 'show create database `{db}`':{tdSql.queryResult[0][1]}, expect:{expectResult}") + + + def run(self): + self.compact_auto_dispatch() + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase())