Merge pull request #13291 from taosdata/cases/TS-1565-V26

test: add test case for TS-1565

tests/parallel_test/cases.task

@@ -270,6 +270,7 @@
 24,,script,./test.sh -f general/connection/test_old_data.sim 
 24,,script,./test.sh -f general/cache/restart_metrics.sim 
 24,,script,./test.sh -f general/alter/insert2.sim 
+24,,pytest,python3 test.py -f multilevel/addAnotherLevel.py 
 24,,pytest,python3 test.py -f tag_lite/datatype-without-alter.py 
 23,,script,./test.sh -f general/parser/select_from_cache_disk.sim 
 23,,script,./test.sh -f general/parser/mixed_blocks.sim 
@@ -319,6 +320,7 @@
 20,,pytest,python3 test.py -f table/create.py
 19,,script,./test.sh -f unique/stable/dnode2.sim 
 19,,script,./test.sh -f general/db/vnodes.sim 
+19,,pytest,python3 test.py -f multilevel/addAnotherDir.py 
 19,,pytest,python3 test.py -f tools/taosdumpTest3.py 
 19,,pytest,python3 test.py -f query/udf.py 
 19,,pytest,python3 test.py -f import_merge/importLastTPO.py 

tests/pytest/multilevel/addAnotherDir.py

+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):        
+        cfg={
+            'monitor': 1,
+            '/mnt/data1 0 1' : 'dataDir'
+        }
+        tdSql.createDir('/mnt/data1')
+
+        tdLog.info("================= step1")
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1,cfg)
+        tdDnodes.start(1)
+
+        tdSql.execute("create database db")
+        tdSql.execute("create table db.tb (ts timestamp, f1 int)")
+        sql = "insert into db.tb values "
+        ts = 1622390400000
+        for i in range(1000):
+            sql += "(%d, %d)" % (ts + i, i)
+        tdSql.execute(sql)
+
+        tdDnodes.stop(1)
+        tdDnodes.cfg(1, 'dataDir', '/mnt/data2 0 0')
+        tdSql.createDir('/mnt/data2')
+        tdDnodes.start(1)
+
+        tdSql.query("select * from db.tb")
+        tdSql.checkRows(1000)
+              
+
+    def stop(self):
+        tdSql.close()
+        os.system("rm -rf /mnt/data1")
+        os.system("rm -rf /mnt/data2")
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/multilevel/addAnotherLevel.py

+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):        
+        cfg={
+            '/mnt/data1 0 1' : 'dataDir'
+        }
+        tdSql.createDir('/mnt/data1')
+
+        tdLog.info("================= step1")
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1,cfg)
+        tdDnodes.start(1)
+
+        tdSql.execute("create database db")
+        tdSql.execute("create table db.tb (ts timestamp, f1 int)")
+
+        tdDnodes.stop(1)
+        tdDnodes.cfg(1, 'dataDir', '/mnt/data2 1 0')
+        tdSql.createDir('/mnt/data2')
+        tdDnodes.start(1)
+
+        tdSql.execute("insert into db.tb values('2015-1-1', 1);")
+        tdSql.execute("alter database db keep 365,3650,3650")
+
+        tdDnodes.stop(1)
+        
+        tdLog.info("================= step2")        
+        tdSql.haveFile('/mnt/data2',1)
+        
+
+    def stop(self):
+        tdSql.close()
+        os.system("rm -rf /mnt/data1")
+        os.system("rm -rf /mnt/data2")
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())