From f740fd61c673d44e663e336e883486ce55a4a1c3 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Wed, 15 Jun 2022 14:23:05 +0800
Subject: [PATCH] fix: use 'duration' instead of 'days' for create database

---
 tests/pytest/alter/alter_replica.py           |  2 +-
 tests/pytest/functions/function_max.py        |  2 +-
 tests/pytest/functions/function_min.py        |  2 +-
 tests/pytest/functions/queryTestCases.py      |  2 +-
 tests/pytest/insert/before_1970.py            |  2 +-
 tests/pytest/insert/retentionpolicy.py        |  2 +-
 .../multilevel/fileDistributionSameLevel.py   |  4 +--
 tests/pytest/multilevel/retentionTest.py      |  2 +-
 tests/pytest/perfbenchmark/bug3433.py         |  2 +-
 tests/pytest/perfbenchmark/joinPerformance.py |  2 +-
 tests/pytest/perfbenchmark/taosdemoInsert.py  |  2 +-
 tests/pytest/query/query1970YearsAf.py        |  2 +-
 .../taosdemoTestSupportNanoInsert.py          |  2 +-
 .../taosdemoTestSupportNanoInsert.py          |  2 +-
 tests/pytest/tools/taosdumpTest.py            |  6 ++--
 tests/pytest/tools/taosdumpTestNanoSupport.py |  2 +-
 tests/pytest/update/merge_commit_data-0.py    |  2 +-
 tests/pytest/update/merge_commit_data.py      |  2 +-
 tests/pytest/update/merge_commit_data2.py     |  2 +-
 .../update/merge_commit_data2_update0.py      |  2 +-
 tests/pytest/update/merge_commit_last.py      |  2 +-
 tests/pytest/util/sql.py                      |  2 +-
 tests/pytest/util/taosdemoCfg.py              |  2 +-
 tests/script/general/db/alter_option.sim      | 16 +++++-----
 tests/script/general/db/backup/keep.sim       |  4 +--
 tests/script/general/db/topic1.sim            | 30 +++++++++----------
 tests/script/general/import/commit.sim        |  4 +--
 tests/script/general/import/replica1.sim      |  2 +-
 tests/script/general/parser/alter.sim         |  2 +-
 .../parser/alter__for_community_version.sim   |  2 +-
 tests/script/general/parser/create_db.sim     |  6 ++--
 .../create_db__for_community_version.sim      |  6 ++--
 tests/script/tsim/db/alter_option.sim         | 14 ++++-----
 tests/script/tsim/db/basic6.sim               |  4 +--
 tests/script/tsim/db/create_all_options.sim   |  4 +--
 tests/script/tsim/insert/commit-merge0.sim    |  2 +-
 tests/script/tsim/query/interval-offset.sim   |  2 +-
 tests/script/tsim/stable/alter_count.sim      |  2 +-
 tests/script/tsim/stable/alter_import.sim     |  2 +-
 tests/script/unique/db/commit.sim             |  2 +-
 tests/script/unique/import/replica2.sim       |  2 +-
 tests/script/unique/import/replica3.sim       |  2 +-
 tests/script/windows/db/basic.sim             |  4 +--
 tests/system-test/0-others/udfTest.py         |  2 +-
 tests/system-test/0-others/udf_cluster.py     |  2 +-
 tests/system-test/0-others/udf_create.py      |  2 +-
 .../system-test/0-others/udf_restart_taosd.py |  2 +-
 tests/system-test/2-query/abs.py              |  2 +-
 tests/system-test/2-query/sample.py           |  2 +-
 tests/system-test/6-cluster/5dnode1mnode.py   |  2 +-
 tests/system-test/6-cluster/5dnode2mnode.py   |  4 +--
 .../system-test/6-cluster/5dnode3mnodeDrop.py |  2 +-
 .../system-test/6-cluster/5dnode3mnodeStop.py |  2 +-
 .../6-cluster/5dnode3mnodeStopInsert.py       |  2 +-
 54 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/tests/pytest/alter/alter_replica.py b/tests/pytest/alter/alter_replica.py
index 6cf0f65825..10047362db 100644
--- a/tests/pytest/alter/alter_replica.py
+++ b/tests/pytest/alter/alter_replica.py
@@ -42,7 +42,7 @@ class TDTestCase:
         tdDnodes.start(3)
 
     def run(self):
-        tdSql.execute('create database db replica 3 days 7')
+        tdSql.execute('create database db replica 3 duration 7')
         tdSql.execute('use db')
         for tid in range(1, 11):
             tdSql.execute('create table tb%d(ts timestamp, i int)' % tid)
diff --git a/tests/pytest/functions/function_max.py b/tests/pytest/functions/function_max.py
index c322b6af26..a53daa11d6 100644
--- a/tests/pytest/functions/function_max.py
+++ b/tests/pytest/functions/function_max.py
@@ -83,7 +83,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, np.max(floatData))
 
         # test case: https://jira.taosdata.com:18080/browse/TD-2583
-        tdSql.execute("create database test days 2")
+        tdSql.execute("create database test duration 2")
         tdSql.execute("create table car(ts timestamp, speed int)")
         tdSql.execute("insert into car values(now, -1)")
         tdSql.execute("insert into car values(now-10d, null)")
diff --git a/tests/pytest/functions/function_min.py b/tests/pytest/functions/function_min.py
index b4d6d58f7c..db865e5ac7 100644
--- a/tests/pytest/functions/function_min.py
+++ b/tests/pytest/functions/function_min.py
@@ -83,7 +83,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, np.min(floatData))
 
         # test case: https://jira.taosdata.com:18080/browse/TD-2583
-        tdSql.execute("create database test days 2")
+        tdSql.execute("create database test duration 2")
         tdSql.execute("create table car(ts timestamp, speed int)")
         tdSql.execute("insert into car values(now, 1)")
         tdSql.execute("insert into car values(now-10d, null)")
diff --git a/tests/pytest/functions/queryTestCases.py b/tests/pytest/functions/queryTestCases.py
index 1311ad6b3c..96de8f064c 100644
--- a/tests/pytest/functions/queryTestCases.py
+++ b/tests/pytest/functions/queryTestCases.py
@@ -264,7 +264,7 @@ class TDTestCase:
 
     def td4288(self):
         tdLog.printNoPrefix("==========TD-4288==========")
-        # keep ~ [days,365000]
+        # keep ~ [duration,365000]
         tdSql.execute("drop database if exists db")
         tdSql.execute("create database  if not exists db")
         tdSql.query("show variables")
diff --git a/tests/pytest/insert/before_1970.py b/tests/pytest/insert/before_1970.py
index b2c4dc57c7..ca2b4f165f 100644
--- a/tests/pytest/insert/before_1970.py
+++ b/tests/pytest/insert/before_1970.py
@@ -32,7 +32,7 @@ class TDTestCase:
 
         print("==============step1")
         tdSql.execute("create database if not exists demo keep 36500;");
-        print("==============create db demo keep 365000 days")
+        print("==============create db demo keep 365000 duration")
         tdSql.execute("use demo;")
         tdSql.execute("CREATE table if not exists test (ts timestamp, f1 int);")
         print("==============create table test")
diff --git a/tests/pytest/insert/retentionpolicy.py b/tests/pytest/insert/retentionpolicy.py
index 607ee26a59..78e5c08c8b 100644
--- a/tests/pytest/insert/retentionpolicy.py
+++ b/tests/pytest/insert/retentionpolicy.py
@@ -51,7 +51,7 @@ class TDTestRetetion:
     def run(self):
         
         tdLog.info("=============== step1")
-        tdSql.execute('create database test keep 3 days 1;')
+        tdSql.execute('create database test keep 3 duration 1;')
         tdSql.execute('use test;')
         tdSql.execute('create table test(ts timestamp,i int);')
 
diff --git a/tests/pytest/multilevel/fileDistributionSameLevel.py b/tests/pytest/multilevel/fileDistributionSameLevel.py
index 83ce856717..64b29914b7 100644
--- a/tests/pytest/multilevel/fileDistributionSameLevel.py
+++ b/tests/pytest/multilevel/fileDistributionSameLevel.py
@@ -66,7 +66,7 @@ class TDTestCase:
         tdDnodes.deploy(1,cfg)
         tdDnodes.startWithoutSleep(1)
 
-        tdSql.execute("create database test days 1")
+        tdSql.execute("create database test duration 1")
         tdSql.execute("use test")
 
         tdSql.execute("create table stb(ts timestamp, c int) tags(t int)")
@@ -85,7 +85,7 @@ class TDTestCase:
         tdLog.info("================= step3")
         tdSql.execute('drop database test')
         for i in range(50):
-            tdSql.execute("create database test%d days 1" %(i))
+            tdSql.execute("create database test%d duration 1" %(i))
             tdSql.execute("use test%d" %(i))
             tdSql.execute("create table tb (ts timestamp,i int)") 
             for j in range(10):           
diff --git a/tests/pytest/multilevel/retentionTest.py b/tests/pytest/multilevel/retentionTest.py
index 9ea59d9d59..94d268f257 100644
--- a/tests/pytest/multilevel/retentionTest.py
+++ b/tests/pytest/multilevel/retentionTest.py
@@ -56,7 +56,7 @@ class TDTestCase:
         tdDnodes.deploy(1,cfg)
         tdDnodes.startWithoutSleep(1)
         
-        tdSql.execute("create database test days 1 keep 15,5,10")
+        tdSql.execute("create database test duration 1 keep 15,5,10")
         tdSql.execute("use test")
 
         tdSql.execute("create table tb(ts timestamp, c int)")
diff --git a/tests/pytest/perfbenchmark/bug3433.py b/tests/pytest/perfbenchmark/bug3433.py
index e4480df6b6..d688dd0310 100644
--- a/tests/pytest/perfbenchmark/bug3433.py
+++ b/tests/pytest/perfbenchmark/bug3433.py
@@ -66,7 +66,7 @@ class TDTestCase:
             "name": "db",
             "drop": "yes",
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
diff --git a/tests/pytest/perfbenchmark/joinPerformance.py b/tests/pytest/perfbenchmark/joinPerformance.py
index acd4f88c9b..2de5818c59 100644
--- a/tests/pytest/perfbenchmark/joinPerformance.py
+++ b/tests/pytest/perfbenchmark/joinPerformance.py
@@ -81,7 +81,7 @@ class JoinPerf:
             "name": self.dbname,
             "drop": self.drop,
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
diff --git a/tests/pytest/perfbenchmark/taosdemoInsert.py b/tests/pytest/perfbenchmark/taosdemoInsert.py
index 59a8143d5a..37191b2624 100644
--- a/tests/pytest/perfbenchmark/taosdemoInsert.py
+++ b/tests/pytest/perfbenchmark/taosdemoInsert.py
@@ -75,7 +75,7 @@ class Taosdemo:
             "name": self.dbname,
             "drop": self.drop,
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
diff --git a/tests/pytest/query/query1970YearsAf.py b/tests/pytest/query/query1970YearsAf.py
index a365369b21..c78324ff5c 100644
--- a/tests/pytest/query/query1970YearsAf.py
+++ b/tests/pytest/query/query1970YearsAf.py
@@ -57,7 +57,7 @@ class TDTestCase:
             "name": "db",
             "drop": "yes",
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
diff --git a/tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py b/tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py
index f069bb8f70..518f46b5e6 100644
--- a/tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py
+++ b/tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py
@@ -138,7 +138,7 @@ class TDTestCase:
 
         sqls_ls = [
             'drop database  if exists nsdbsql;',
-            'create database nsdbsql precision "ns" keep 3600 days 6 update 1;',
+            'create database nsdbsql precision "ns" keep 3600 duration 6 update 1;',
             'use nsdbsql;',
             'CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupdId int);',
             'CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);',
diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSupportNanoInsert.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSupportNanoInsert.py
index c3fdff00ec..7781a3d3d4 100644
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSupportNanoInsert.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSupportNanoInsert.py
@@ -125,7 +125,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, 600)
         # check taosdemo -s
 
-        sqls_ls = ['drop database  if exists nsdbsql;','create database nsdbsql precision "ns" keep 36 days 6 update 1;',
+        sqls_ls = ['drop database  if exists nsdbsql;','create database nsdbsql precision "ns" keep 36 duration 6 update 1;',
                 'use nsdbsql;','CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupdId int);',
                 'CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);',
                 'INSERT INTO d1001 USING METERS TAGS ("Beijng.Chaoyang", 2) VALUES (now, 10.2, 219, 0.32);',
diff --git a/tests/pytest/tools/taosdumpTest.py b/tests/pytest/tools/taosdumpTest.py
index 0dfc42f331..bc31b9fbcc 100644
--- a/tests/pytest/tools/taosdumpTest.py
+++ b/tests/pytest/tools/taosdumpTest.py
@@ -60,8 +60,8 @@ class TDTestCase:
         if not os.path.exists("./taosdumptest/tmp2"):
             os.makedirs("./taosdumptest/tmp2")
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
-        tdSql.execute("create database db1  days 12 keep 3640 blocks 7 ")
+        tdSql.execute("create database db  duration 11 keep 3649 blocks 8 ")
+        tdSql.execute("create database db1  duration 12 keep 3640 blocks 7 ")
         tdSql.execute("use db")
         tdSql.execute(
             "create table st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
@@ -102,7 +102,7 @@ class TDTestCase:
         tdSql.query("show databases")
         tdSql.checkRows(2)
         dbresult = tdSql.queryResult
-        # 6--days,7--keep0,keep1,keep, 12--block,
+        # 6--duration,7--keep0,keep1,keep, 12--block,
 
         isCommunity = self.checkCommunity()
         print("iscommunity: %d" % isCommunity)
diff --git a/tests/pytest/tools/taosdumpTestNanoSupport.py b/tests/pytest/tools/taosdumpTestNanoSupport.py
index 55f1671daa..0101a65407 100644
--- a/tests/pytest/tools/taosdumpTestNanoSupport.py
+++ b/tests/pytest/tools/taosdumpTestNanoSupport.py
@@ -60,7 +60,7 @@ class TDTestCase:
         def build_db(precision, start_time):
             tdSql.execute("drop database if exists timedb1")
             tdSql.execute(
-                "create database timedb1 days 10 keep 365 blocks 8 precision "+"\""+precision+"\"")
+                "create database timedb1 duration 10 keep 365 blocks 8 precision "+"\""+precision+"\"")
 
             tdSql.execute("use timedb1")
             tdSql.execute(
diff --git a/tests/pytest/update/merge_commit_data-0.py b/tests/pytest/update/merge_commit_data-0.py
index 14d435f7f2..6f7951b16a 100644
--- a/tests/pytest/update/merge_commit_data-0.py
+++ b/tests/pytest/update/merge_commit_data-0.py
@@ -30,7 +30,7 @@ class TDTestCase:
         tdSql.execute(s)
         s = 'drop database if exists db'
         tdSql.execute(s)
-        s = 'create database db days 30'
+        s = 'create database db duration 30'
         tdSql.execute(s)
         s = 'use db'
         tdSql.execute(s)
diff --git a/tests/pytest/update/merge_commit_data.py b/tests/pytest/update/merge_commit_data.py
index 4fb6765361..0b18071179 100644
--- a/tests/pytest/update/merge_commit_data.py
+++ b/tests/pytest/update/merge_commit_data.py
@@ -30,7 +30,7 @@ class TDTestCase:
         tdSql.execute(s)
         s = 'drop database if exists db'
         tdSql.execute(s)
-        s = 'create database db update 1 days 30'
+        s = 'create database db update 1 duration 30'
         tdSql.execute(s)
         s = 'use db'
         tdSql.execute(s)
diff --git a/tests/pytest/update/merge_commit_data2.py b/tests/pytest/update/merge_commit_data2.py
index a334f39e86..034d9b9913 100644
--- a/tests/pytest/update/merge_commit_data2.py
+++ b/tests/pytest/update/merge_commit_data2.py
@@ -50,7 +50,7 @@ class TDTestCase:
         tdSql.execute(sql)
         sql = 'drop database if exists db'
         tdSql.execute(sql)
-        sql = 'create database db update 1 days 30;'
+        sql = 'create database db update 1 duration 30;'
         tdSql.execute(sql)
         sql = 'use db;'
         tdSql.execute(sql)
diff --git a/tests/pytest/update/merge_commit_data2_update0.py b/tests/pytest/update/merge_commit_data2_update0.py
index def50e0466..824f085630 100644
--- a/tests/pytest/update/merge_commit_data2_update0.py
+++ b/tests/pytest/update/merge_commit_data2_update0.py
@@ -49,7 +49,7 @@ class TDTestCase:
         tdSql.execute(sql)
         sql = 'drop database if exists db'
         tdSql.execute(sql)
-        sql = 'create database db update 0 days 30;'
+        sql = 'create database db update 0 duration 30;'
         tdSql.execute(sql)
         sql = 'use db;'
         tdSql.execute(sql)
diff --git a/tests/pytest/update/merge_commit_last.py b/tests/pytest/update/merge_commit_last.py
index 183cca0a1e..2e268e4e9e 100644
--- a/tests/pytest/update/merge_commit_last.py
+++ b/tests/pytest/update/merge_commit_last.py
@@ -34,7 +34,7 @@ class TDTestCase:
     def run(self):              
         tdSql.prepare()
 
-        tdSql.execute("create database udb update 1 days 30")   
+        tdSql.execute("create database udb update 1 duration 30")   
         tdSql.execute("use udb")
 
         print("==============step 1: UPDATE THE LAST RECORD REPEATEDLY")                     
diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index bdda7c453b..79983f97d0 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -57,7 +57,7 @@ class TDSql:
             tdLog.notice("'reset query cache' is not supported")
         s = 'drop database if exists db'
         self.cursor.execute(s)
-        s = 'create database db days 300'
+        s = 'create database db duration 300'
         self.cursor.execute(s)
         s = 'use db'
         self.cursor.execute(s)
diff --git a/tests/pytest/util/taosdemoCfg.py b/tests/pytest/util/taosdemoCfg.py
index d211f86b81..7523a80898 100644
--- a/tests/pytest/util/taosdemoCfg.py
+++ b/tests/pytest/util/taosdemoCfg.py
@@ -63,7 +63,7 @@ class TDTaosdemoCfg:
             "name": 'db',
             "drop": 'yes',
             "replica": 1,
-            "days": 10,
+            "duration": 10,
             "cache": 16,
             "blocks": 6,
             "precision": "ms",
diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim
index 36f4c0e7dc..89a32b5a5c 100644
--- a/tests/script/general/db/alter_option.sim
+++ b/tests/script/general/db/alter_option.sim
@@ -9,7 +9,7 @@ sleep 2000
 sql connect
 
 print ============= create database
-sql create database db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
+sql create database db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
 sql show databases
 if $data00 != db then 
   return -1
@@ -87,13 +87,13 @@ sql_error alter database db quorum 4
 sql_error alter database db quorum 5
 sql_error alter database db quorum -1
 
-print ============== step days
-sql_error alter database db days 0
-sql_error alter database db days 1
-sql_error alter database db days 2
-sql_error alter database db days 10
-sql_error alter database db days 50
-sql_error alter database db days 100
+print ============== step duration
+sql_error alter database db duration 0
+sql_error alter database db duration 1
+sql_error alter database db duration 2
+sql_error alter database db duration 10
+sql_error alter database db duration 50
+sql_error alter database db duration 100
 
 print ============== step keep
 sql show databases
diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim
index 4d157b3985..626040e347 100644
--- a/tests/script/general/db/backup/keep.sim
+++ b/tests/script/general/db/backup/keep.sim
@@ -26,7 +26,7 @@ system sh/exec.sh -n dnode2 -s start
 sleep 2000
 
 print ======== step1 create db
-sql create database keepdb replica 1 keep 30 days 7
+sql create database keepdb replica 1 keep 30 duration 7
 sql use keepdb
 sql create table tb (ts timestamp, i int)
 
@@ -201,7 +201,7 @@ sql alter database keepdb keep 0 -x error2
   return -1
 error2:
 
-sql alter database keepdb days 1 -x error3
+sql alter database keepdb duration 1 -x error3
   return -1
 error3:
 
diff --git a/tests/script/general/db/topic1.sim b/tests/script/general/db/topic1.sim
index 1639973120..b5058e8f9b 100644
--- a/tests/script/general/db/topic1.sim
+++ b/tests/script/general/db/topic1.sim
@@ -171,7 +171,7 @@ sql_error create topic t1 partitions -1;
 sql_error create topic t1 partitions 10001;
 
 print =============step3 create with db para
-sql create topic db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
+sql create topic db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
 sql show databases
 if $data00 != db then 
   return -1
@@ -199,7 +199,7 @@ if $data09 != 4 then
 endi
 sql drop topic db;
 
-sql create topic db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 partitions 7
+sql create topic db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 partitions 7
 sql show databases
 if $data00 != db then 
   return -1
@@ -334,19 +334,19 @@ sql_error alter topic db quorum 4
 sql_error alter topic db quorum 5
 sql_error alter topic db quorum -1
 
-print ============== step days
-sql_error alter database db days 0
-sql_error alter database db days 1
-sql_error alter database db days 2
-sql_error alter database db days 10
-sql_error alter database db days 50
-sql_error alter database db days 100
-sql_error alter topic db days 0
-sql_error alter topic db days 1
-sql_error alter topic db days 2
-sql_error alter topic db days 10
-sql_error alter topic db days 50
-sql_error alter topic db days 100
+print ============== step duration
+sql_error alter database db duration 0
+sql_error alter database db duration 1
+sql_error alter database db duration 2
+sql_error alter database db duration 10
+sql_error alter database db duration 50
+sql_error alter database db duration 100
+sql_error alter topic db duration 0
+sql_error alter topic db duration 1
+sql_error alter topic db duration 2
+sql_error alter topic db duration 10
+sql_error alter topic db duration 50
+sql_error alter topic db duration 100
 
 print ============== step keep
 sql show databases
diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim
index 3b4055d712..aefc724fdb 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
@@ -30,7 +30,7 @@ sleep 2000
 sql connect
 
 print ========= step1
-sql create database ic1db days 7;
+sql create database ic1db duration 7;
 sql create table ic1db.tb(ts timestamp, s int);
 sql insert into ic1db.tb values(now-30d, -30);
 sql insert into ic1db.tb values(now-20d, -20);
@@ -50,7 +50,7 @@ if $rows != 12 then
 endi
 
 print ========= step2
-sql create database ic2db days 7;
+sql create database ic2db duration 7;
 sql create table ic2db.tb(ts timestamp, s int);
 sql insert into ic2db.tb values(now, 0);
 sql import into ic2db.tb values(now-30d, -30);
diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim
index 48d5455b79..1e8eabb798 100644
--- a/tests/script/general/import/replica1.sim
+++ b/tests/script/general/import/replica1.sim
@@ -30,7 +30,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 2000
 sql connect
 
-sql create database ir1db days 7
+sql create database ir1db duration 7
 sql use ir1db
 sql create table tb(ts timestamp, i bigint)
 
diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index d1a4702a69..78c1a3029a 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -20,7 +20,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
 sql drop database if exists $db
-sql create database $db days 10 keep 20,20,20
+sql create database $db duration 10 keep 20,20,20
 sql use $db
 
 sql_error alter database $db keep "20"
diff --git a/tests/script/general/parser/alter__for_community_version.sim b/tests/script/general/parser/alter__for_community_version.sim
index f55fb812a7..7a9a970822 100644
--- a/tests/script/general/parser/alter__for_community_version.sim
+++ b/tests/script/general/parser/alter__for_community_version.sim
@@ -20,7 +20,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
 sql drop database if exists $db
-sql create database $db days 10 keep 20
+sql create database $db duration 10 keep 20
 sql use $db
 sql show databases
 if $rows != 1 then
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index a62a45e023..040331ec4f 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -101,7 +101,7 @@ print db_already_exists test passed
 print create_db.sim case5: db_meta_data test
 # cfg params
 $replica = 1 # max=3
-$days = 10
+$duration = 10
 $keep = 365,365,365
 $rows_db = 1000
 $cache = 16 # 16MB
@@ -111,7 +111,7 @@ $ctime = 36000 # 10 hours
 $wal = 1 # valid value is 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding
 
-sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
 sql show databases
 if $rows != 1 then
   return -1
@@ -122,7 +122,7 @@ endi
 if $data04 != $replica then 
  return -1
 endi
-if $data06 != $days then 
+if $data06 != $duration then 
  return -1
 endi
 if $data07 != 365,365,365 then 
diff --git a/tests/script/general/parser/create_db__for_community_version.sim b/tests/script/general/parser/create_db__for_community_version.sim
index 406e69b0e6..5dc4263d5d 100644
--- a/tests/script/general/parser/create_db__for_community_version.sim
+++ b/tests/script/general/parser/create_db__for_community_version.sim
@@ -101,7 +101,7 @@ print db_already_exists test passed
 print create_db.sim case5: db_meta_data test
 # cfg params
 $replica = 1 # max=3
-$days = 10
+$duration = 10
 $keep = 365
 $rows_db = 1000
 $cache = 16 # 16MB
@@ -111,7 +111,7 @@ $ctime = 36000 # 10 hours
 $wal = 1 # valid value is 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding
 
-sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
 sql show databases
 if $rows != 1 then
   return -1
@@ -122,7 +122,7 @@ endi
 if $data04 != $replica then 
  return -1
 endi
-if $data06 != $days then 
+if $data06 != $duration then 
  return -1
 endi
 if $data07 != 365 then 
diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim
index 4692b9d91b..4351ee5cb1 100644
--- a/tests/script/tsim/db/alter_option.sim
+++ b/tests/script/tsim/db/alter_option.sim
@@ -62,7 +62,7 @@ print ============= create database
 #  | PAGES value        [64~16384, default: 256]
 #  | CACHELAST value    [0, 1, 2, 3]
 #  | FSYNC value        [0 ~ 180000 ms]
-#  | KEEP value         [days, 365000]
+#  | KEEP value         [duration, 365000]
 #  | REPLICA value      [1 | 3]
 #  | WAL value          [1 | 2]
 
@@ -92,7 +92,7 @@ endi
 if $data5_db != no_strict then  # strict
   return -1
 endi
-if $data6_db != 345600 then  # days
+if $data6_db != 345600 then  # duration
   return -1
 endi
 if $data7_db != 1440000m,1440000m,1440000m then # keep
@@ -222,11 +222,11 @@ sql_error alter database db replica 0
 #sql_error alter database db quorum 4
 #sql_error alter database db quorum 5
 
-#print ============== modify days
-sql_error alter database db days 480
-sql_error alter database db days 360
-sql_error alter database db days 0
-sql_error alter database db days 14400  # set over than keep
+#print ============== modify duration
+sql_error alter database db duration 480
+sql_error alter database db duration 360
+sql_error alter database db duration 0
+sql_error alter database db duration 14400  # set over than keep
 
 print ============== modify keep
 sql alter database db keep 2400
diff --git a/tests/script/tsim/db/basic6.sim b/tests/script/tsim/db/basic6.sim
index 142460f214..64103b5dac 100644
--- a/tests/script/tsim/db/basic6.sim
+++ b/tests/script/tsim/db/basic6.sim
@@ -15,7 +15,7 @@ $tb = $tbPrefix . $i
 
 print =============== step1
 # quorum  presicion 
-sql create database $db vgroups 8 replica 1 days 2 keep 10 minrows 80 maxrows 10000 wal 2 fsync 1000 comp 0 cachelast 2 precision 'us'
+sql create database $db vgroups 8 replica 1 duration 2 keep 10 minrows 80 maxrows 10000 wal 2 fsync 1000 comp 0 cachelast 2 precision 'us'
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 
@@ -66,7 +66,7 @@ print =============== step4
 sql_error drop database $db
 
 print =============== step5
-sql create database $db replica 1 days 15 keep 1500
+sql create database $db replica 1 duration 15 keep 1500
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data20 != $db then
diff --git a/tests/script/tsim/db/create_all_options.sim b/tests/script/tsim/db/create_all_options.sim
index 03068698e2..284875ee08 100644
--- a/tests/script/tsim/db/create_all_options.sim
+++ b/tests/script/tsim/db/create_all_options.sim
@@ -79,7 +79,7 @@ print ============= create database with all options
 #$data2_db  : vgroups
 #$data3_db  : ntables
 #$data4_db  : replica
-#$data6_db  : days
+#$data6_db  : duration
 #$data7_db  : keep
 #$data10_db : minrows
 #$data11_db : maxrows
@@ -113,7 +113,7 @@ endi
 if $data5_db != no_strict then  # strict
   return -1
 endi
-if $data6_db != 14400 then  # days
+if $data6_db != 14400 then  # duration
   return -1
 endi
 if $data7_db != 5256000m,5256000m,5256000m then # keep
diff --git a/tests/script/tsim/insert/commit-merge0.sim b/tests/script/tsim/insert/commit-merge0.sim
index adbd1904b2..56e818654f 100644
--- a/tests/script/tsim/insert/commit-merge0.sim
+++ b/tests/script/tsim/insert/commit-merge0.sim
@@ -5,7 +5,7 @@ sleep 50
 sql connect
 
 print =============== create database
-sql create database db  days 300 keep 365000d,365000d,365000d
+sql create database db  duration 300 keep 365000d,365000d,365000d
 sql show databases
 if $rows != 3 then
   return -1
diff --git a/tests/script/tsim/query/interval-offset.sim b/tests/script/tsim/query/interval-offset.sim
index dcd88e5a0c..ab6ee79d6e 100644
--- a/tests/script/tsim/query/interval-offset.sim
+++ b/tests/script/tsim/query/interval-offset.sim
@@ -5,7 +5,7 @@ sleep 500
 sql connect
 
 print =============== create database
-sql create database d0 days 300
+sql create database d0 duration 300
 sql use d0
 
 print =============== create super table and child table
diff --git a/tests/script/tsim/stable/alter_count.sim b/tests/script/tsim/stable/alter_count.sim
index e5af9a5735..eca8ca1559 100644
--- a/tests/script/tsim/stable/alter_count.sim
+++ b/tests/script/tsim/stable/alter_count.sim
@@ -6,7 +6,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print ======== step1 
-sql create database d1 replica 1 days 7 keep 50 
+sql create database d1 replica 1 duration 7 keep 50 
 sql use d1
 sql create table tb (ts timestamp, a int)
 sql insert into tb values(now-28d, -28)
diff --git a/tests/script/tsim/stable/alter_import.sim b/tests/script/tsim/stable/alter_import.sim
index cdd7b60e14..b968eb6a12 100644
--- a/tests/script/tsim/stable/alter_import.sim
+++ b/tests/script/tsim/stable/alter_import.sim
@@ -6,7 +6,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print ======== step1 
-sql create database d1 replica 1 days 7 keep 50
+sql create database d1 replica 1 duration 7 keep 50
 sql use d1
 sql create table tb (ts timestamp, a int)
 sql insert into tb values(now-30d, -28)
diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim
index 661dd4505f..74c1366afb 100644
--- a/tests/script/unique/db/commit.sim
+++ b/tests/script/unique/db/commit.sim
@@ -24,7 +24,7 @@ system sh/exec.sh -n dnode2 -s start
 sleep 2000
 
 print ======== step1 create db
-sql create database commitdb replica 1 days 7 keep 30
+sql create database commitdb replica 1 duration 7 keep 30
 sql use commitdb
 sql create table tb (ts timestamp, i int)
 
diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim
index 54ce28543e..387567fc82 100644
--- a/tests/script/unique/import/replica2.sim
+++ b/tests/script/unique/import/replica2.sim
@@ -52,7 +52,7 @@ if $data4_2 != ready then
   goto step1
 endi
 
-sql create database ir2db replica 2 days 7
+sql create database ir2db replica 2 duration 7
 sql use ir2db
 sql create table tb(ts timestamp, i bigint)
 
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
index 5da9e141a5..5c1b8b8932 100644
--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
@@ -58,7 +58,7 @@ if $data4_3 != ready then
   goto step1
 endi
 
-sql create database ir3db replica 3 days 7
+sql create database ir3db replica 3 duration 7
 sql use ir3db
 sql create table tb(ts timestamp, i bigint)
 
diff --git a/tests/script/windows/db/basic.sim b/tests/script/windows/db/basic.sim
index 914e456fe1..1f0fc31a6b 100644
--- a/tests/script/windows/db/basic.sim
+++ b/tests/script/windows/db/basic.sim
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =============== step1
-sql create database $db replica 1 days 20 keep 2000 cache 16
+sql create database $db replica 1 duration 20 keep 2000 cache 16
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data00 != $db then 
@@ -57,7 +57,7 @@ print =============== step4
 sql_error drop database $db
 
 print =============== step5
-sql create database $db replica 1 days 15 keep 1500
+sql create database $db replica 1 duration 15 keep 1500
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data00 != $db then 
diff --git a/tests/system-test/0-others/udfTest.py b/tests/system-test/0-others/udfTest.py
index 57ae1c1490..9b145e9093 100644
--- a/tests/system-test/0-others/udfTest.py
+++ b/tests/system-test/0-others/udfTest.py
@@ -60,7 +60,7 @@ class TDTestCase:
     def prepare_data(self):
         
         tdSql.execute("drop database if exists db ")
-        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("create database if not exists db  duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
diff --git a/tests/system-test/0-others/udf_cluster.py b/tests/system-test/0-others/udf_cluster.py
index c5c0c7b8f2..9ef3137a7e 100644
--- a/tests/system-test/0-others/udf_cluster.py
+++ b/tests/system-test/0-others/udf_cluster.py
@@ -63,7 +63,7 @@ class TDTestCase:
     def prepare_data(self):
     
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database if not exists db replica 1 days 300")
+        tdSql.execute("create database if not exists db replica 1 duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
diff --git a/tests/system-test/0-others/udf_create.py b/tests/system-test/0-others/udf_create.py
index 170d9b1421..11ad8e1584 100644
--- a/tests/system-test/0-others/udf_create.py
+++ b/tests/system-test/0-others/udf_create.py
@@ -62,7 +62,7 @@ class TDTestCase:
     def prepare_data(self):
         
         tdSql.execute("drop database if exists db ")
-        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("create database if not exists db  duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
diff --git a/tests/system-test/0-others/udf_restart_taosd.py b/tests/system-test/0-others/udf_restart_taosd.py
index 94b14f01ba..c9eb22cf15 100644
--- a/tests/system-test/0-others/udf_restart_taosd.py
+++ b/tests/system-test/0-others/udf_restart_taosd.py
@@ -59,7 +59,7 @@ class TDTestCase:
     def prepare_data(self):
         
         tdSql.execute("drop database if exists db ")
-        tdSql.execute("create database if not exists db  days 300")
+        tdSql.execute("create database if not exists db  duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
diff --git a/tests/system-test/2-query/abs.py b/tests/system-test/2-query/abs.py
index d9c37be996..d779cc26cd 100644
--- a/tests/system-test/2-query/abs.py
+++ b/tests/system-test/2-query/abs.py
@@ -68,7 +68,7 @@ class TDTestCase:
 
     def prepare_tag_datas(self):
                 # prepare datas
-        tdSql.execute("create database if not exists testdb keep 3650 days 1000")
+        tdSql.execute("create database if not exists testdb keep 3650 duration 1000")
         tdSql.execute(" use testdb ")
         tdSql.execute(
             '''create table stb1
diff --git a/tests/system-test/2-query/sample.py b/tests/system-test/2-query/sample.py
index 8c0cd83d4f..a84d93404a 100644
--- a/tests/system-test/2-query/sample.py
+++ b/tests/system-test/2-query/sample.py
@@ -628,7 +628,7 @@ class TDTestCase:
 
     def basic_sample_query(self):
         tdSql.execute(" drop database if exists db ")
-        tdSql.execute(" create database if not exists db days 300 ")
+        tdSql.execute(" create database if not exists db duration 300 ")
         tdSql.execute(" use db ")
         tdSql.execute(
             '''create table stb1
diff --git a/tests/system-test/6-cluster/5dnode1mnode.py b/tests/system-test/6-cluster/5dnode1mnode.py
index 7c3715cd0b..75134224db 100644
--- a/tests/system-test/6-cluster/5dnode1mnode.py
+++ b/tests/system-test/6-cluster/5dnode1mnode.py
@@ -104,7 +104,7 @@ class TDTestCase:
         tdSql.error("drop mnode on dnode 1;")
 
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database if not exists db replica 1 days 300")
+        tdSql.execute("create database if not exists db replica 1 duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
diff --git a/tests/system-test/6-cluster/5dnode2mnode.py b/tests/system-test/6-cluster/5dnode2mnode.py
index 9d9cc9c0d6..04d9c9b3b4 100644
--- a/tests/system-test/6-cluster/5dnode2mnode.py
+++ b/tests/system-test/6-cluster/5dnode2mnode.py
@@ -104,7 +104,7 @@ class TDTestCase:
         tdSql.error("drop mnode on dnode 1;")
 
         tdSql.execute("drop database if exists db")
-        tdSql.execute("create database if not exists db replica 1 days 300")
+        tdSql.execute("create database if not exists db replica 1 duration 300")
         tdSql.execute("use db")
         tdSql.execute(
         '''create table stb1
@@ -163,7 +163,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
 
         tdSql.execute("drop database if exists db2")
-        tdSql.execute("create database if not exists db2 replica 1 days 300")
+        tdSql.execute("create database if not exists db2 replica 1 duration 300")
         tdSql.execute("use db2")
         tdSql.execute(
         '''create table stb1
diff --git a/tests/system-test/6-cluster/5dnode3mnodeDrop.py b/tests/system-test/6-cluster/5dnode3mnodeDrop.py
index 1512fc9897..9c18c63b85 100644
--- a/tests/system-test/6-cluster/5dnode3mnodeDrop.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeDrop.py
@@ -53,7 +53,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
         for couti in count:
             tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
+            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
             tdSql.execute("use db%d" %couti)
             tdSql.execute(
             '''create table stb1
diff --git a/tests/system-test/6-cluster/5dnode3mnodeStop.py b/tests/system-test/6-cluster/5dnode3mnodeStop.py
index a9784f2d0f..08da7f9101 100644
--- a/tests/system-test/6-cluster/5dnode3mnodeStop.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeStop.py
@@ -53,7 +53,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
         for couti in count:
             tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
+            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
             tdSql.execute("use db%d" %couti)
             tdSql.execute(
             '''create table stb1
diff --git a/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py b/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py
index 95cd26dedc..bdb6cf28e1 100644
--- a/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py
+++ b/tests/system-test/6-cluster/5dnode3mnodeStopInsert.py
@@ -54,7 +54,7 @@ class TDTestCase:
         # fisrt add data : db\stable\childtable\general table
         for couti in count:
             tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
+            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
             tdSql.execute("use db%d" %couti)
             tdSql.execute(
             '''create table stb1
-- 
GitLab