Merge pull request #8361 from taosdata/dev/chr

[TD-5898]<test>:add taosdump case of mixed usage of -D

tests/pytest/tools/taosdumpTest3.py

@@ -62,8 +62,12 @@ class TDTestCase:
             os.makedirs("./taosdumptest/tmp3")
         if not os.path.exists("./taosdumptest/tmp4"):
             os.makedirs("./taosdumptest/tmp4")
-
-
+        if not os.path.exists("./taosdumptest/tmp5"):
+            os.makedirs("./taosdumptest/tmp5")
+        if not os.path.exists("./taosdumptest/tmp6"):
+            os.makedirs("./taosdumptest/tmp6")
+        if not os.path.exists("./taosdumptest/tmp7"):
+            os.makedirs("./taosdumptest/tmp7")
         buildPath = self.getBuildPath()
         if (buildPath == ""):
             tdLog.exit("taosdump not found!")
@@ -72,6 +76,8 @@ class TDTestCase:
         binPath = buildPath + "/build/bin/"
 
         # create db1 , one stables and one table ;  create general tables
+        tdSql.execute("drop database if  exists dp1")
+        tdSql.execute("drop database  if exists dp2")
         tdSql.execute("create database if not exists dp1")
         tdSql.execute("use dp1")
         tdSql.execute("create stable st0(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int)")
@@ -82,9 +88,10 @@ class TDTestCase:
         tdSql.execute("create table  if not exists gt1 (ts timestamp, c0 int, c1 double)  ")
         tdSql.execute("insert into gt0 values(1614218412000,637,8.861)")
         tdSql.execute("insert into gt1 values(1614218413000,638,8.862)")
+
         # create db1 , three stables:stb0,include ctables stb0_0 \ stb0_1,stb1 include ctables stb1_0 and stb1_1 
         # \stb3,include ctables stb3_0 and stb3_1 
-        # ; create general three tables gt0 gt1 gt2
+        # create general three tables gt0 gt1 gt2
         tdSql.execute("create database if not  exists dp2")
         tdSql.execute("use dp2")
         tdSql.execute("create stable st0(ts timestamp, c01 int, c02 nchar(10)) tags(t1 int)")
@@ -102,94 +109,188 @@ class TDTestCase:
         tdSql.execute("create table  if not exists gt0 (ts timestamp, c00 int, c01 float)  ")
         tdSql.execute("create table  if not exists gt1 (ts timestamp, c10 int, c11 double)  ")
         tdSql.execute("create table  if not exists gt2 (ts timestamp, c20 int, c21 float)  ")
-        tdSql.execute("insert into gt0 values(1614218412000,8637,78.86155)")
-        tdSql.execute("insert into gt1 values(1614218413000,8638,78.862020199)")
-        tdSql.execute("insert into gt2 values(1614218413000,8639,78.863)")
+        tdSql.execute("insert into gt0 values(1614218412700,8637,78.86155)")
+        tdSql.execute("insert into gt1 values(1614218413800,8638,78.862020199)")
+        tdSql.execute("insert into gt2 values(1614218413900,8639,78.863)")
+
+        # create 
+        tdSql.execute("create database if not exists dp3 precision 'ns'")
+        tdSql.execute("use dp3")
+        tdSql.execute("create stable st0(ts timestamp, c01 int, c02 nchar(10)) tags(t1 int)")
+        tdSql.execute("create table st0_0 using st0 tags(0) st0_1 using st0 tags(1) ")
+        tdSql.execute("insert into st0_0 values(1614218412000000001,8600,'R')(1614218422000000002,8600,'E')")
+        tdSql.execute("insert into st0_1 values(1614218413000000001,8601,'A')(1614218423000000002,8601,'D')")
+
 
         # tdSql.execute("insert into t0 values(1614218422000,8638,'R')")
         os.system("rm -rf ./taosdumptest/tmp1/*")
         os.system("rm -rf ./taosdumptest/tmp2/*")
         os.system("rm -rf ./taosdumptest/tmp3/*")
         os.system("rm -rf ./taosdumptest/tmp4/*")
+        os.system("rm -rf ./taosdumptest/tmp5/*")
+
         # #  taosdump stable and  general table
-        # os.system("%staosdump  -o ./taosdumptest/tmp1 -D dp1 dp2  " % binPath)
-        # os.system("%staosdump  -o ./taosdumptest/tmp2 dp1 st0 gt0  " % binPath)
-        # os.system("%staosdump  -o ./taosdumptest/tmp3 dp2 st0 st1_0 gt0" % binPath)
-        # os.system("%staosdump  -o ./taosdumptest/tmp4 dp2 st0 st2 gt0 gt2" % binPath)、
+        os.system("%staosdump  -o ./taosdumptest/tmp1 -D dp1,dp2  " % binPath)
+        os.system("%staosdump  -o ./taosdumptest/tmp2 dp1 st0 gt0  " % binPath)
+        os.system("%staosdump  -o ./taosdumptest/tmp3 dp2 st0 st1_0 gt0" % binPath)
+        os.system("%staosdump  -o ./taosdumptest/tmp4 dp2 st0 st2 gt0 gt2" % binPath)
+
+        # verify ns 
+        os.system("%staosdump  -o ./taosdumptest/tmp6 dp3 st0_0" % binPath)
+        assert os.system("%staosdump  -o ./taosdumptest/tmp6 dp3 st0_0 -C ns " % binPath) != 0
+
         # verify -D:--database
-        # os.system("%staosdump --databases dp1 -o ./taosdumptest/tmp3 dp2 st0 st1_0 gt0" % binPath)
-        # os.system("%staosdump --databases dp1,dp2 -o ./taosdumptest/tmp3 " % binPath)
-
-        # #check taosdumptest/tmp1
-        # tdSql.execute("drop database  dp1")
-        # tdSql.execute("drop database  dp2")
-        # os.system("%staosdump -i ./taosdumptest/tmp1 -T 2   " % binPath)
-        # tdSql.execute("use dp1")
-        # tdSql.query("show stables")
-        # tdSql.checkRows(1)
-        # tdSql.query("show tables")
-        # tdSql.checkRows(4)
-        # tdSql.execute("use dp2")
-        # tdSql.query("show stables")
-        # tdSql.checkRows(3)
-        # tdSql.query("show tables")
-        # tdSql.checkRows(9)
-        # tdSql.query("select c01 from gt0")
-        # tdSql.checkData(0,0,78.86155)
-        # tdSql.query("select c11 from gt1")
-        # tdSql.checkData(0, 0, 78.862020199)
-        # tdSql.query("select c21 from gt2")
-        # tdSql.checkData(0, 0, 78.86300)
-
-        # #check taosdumptest/tmp2
-        # tdSql.execute("drop database  dp1")
-        # tdSql.execute("drop database  dp2")
-        # os.system("%staosdump -i ./taosdumptest/tmp2 -T 2   " % binPath)
-        # tdSql.execute("use dp1")
-        # tdSql.query("show stables")
-        # tdSql.checkRows(1)
-        # tdSql.query("show tables")
-        # tdSql.checkRows(3)
-        # tdSql.error("use dp2")
-        # tdSql.query("select c01 from gt0")
-        # tdSql.checkData(0,0,78.86155)
-
-        # #check taosdumptest/tmp3
-        # tdSql.execute("drop database  dp1")
-        # os.system("%staosdump  -i ./taosdumptest/tmp3 -T 2 " % binPath)  
-        # tdSql.execute("use dp2")
-        # tdSql.query("show stables")
-        # tdSql.checkRows(2)
-        # tdSql.query("show tables")
-        # tdSql.checkRows(4)
-        # tdSql.query("select count(*) from st1_0")
-        # tdSql.query("select c01 from gt0")
-        # tdSql.checkData(0,0,78.86155)
-        # tdSql.error("use dp1")
-        # tdSql.error("select count(*) from st2_0")
-        # tdSql.error("select count(*) from gt2")
-
-        # #check taosdumptest/tmp4
-        # tdSql.execute("drop database  dp2")
-        # os.system("%staosdump  -i ./taosdumptest/tmp4 -T 2 " % binPath)  
-        # tdSql.execute("use dp2")
-        # tdSql.query("show stables")
-        # tdSql.checkRows(2)
-        # tdSql.query("show tables")
-        # tdSql.checkRows(6)
-        # tdSql.query("select c21 from gt2")
-        # tdSql.checkData(0, 0, 78.86300)
-        # tdSql.query("select count(*) from st2_0")
-        # tdSql.error("use dp1")
-        # tdSql.error("select count(*) from st1_0")
-        # tdSql.error("select count(*) from gt3")
-        # tdSql.execute("drop database  dp2")
-
-
-        # os.system("rm -rf ./taosdumptest/tmp1")
-        # os.system("rm -rf ./taosdumptest/tmp2")
-        # os.system("rm -rf ./dump_result.txt")
-        # os.system("rm -rf ./db.csv")
+        os.system("%staosdump  -o ./taosdumptest/tmp5  --databases dp1,dp2 " % binPath)
+        # verify mixed -D:--database and dbname tbname
+        assert os.system("%staosdump --databases dp1 -o ./taosdumptest/tmp5 dp2 st0 st1_0 gt0" % binPath) != 0
+
+        #check taosdumptest/tmp1
+        tdSql.execute("drop database  dp1")
+        tdSql.execute("drop database  dp2")
+        os.system("%staosdump -i ./taosdumptest/tmp1 -T 2   " % binPath)
+        tdSql.execute("use dp1")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.query("show tables")
+        tdSql.checkRows(4)
+        tdSql.query("select c1 from st0_0 order by ts")
+        tdSql.checkData(0,0,8537)
+        tdSql.query("select c2 from st0_1 order by ts")
+        tdSql.checkData(1,0,"D")
+        tdSql.query("select * from gt0")
+        tdSql.checkData(0,0,'2021-02-25 10:00:12.000')
+        tdSql.checkData(0,1,637)
+        tdSql.execute("use dp2")
+        tdSql.query("show stables")
+        tdSql.checkRows(3)
+        tdSql.query("show tables")
+        tdSql.checkRows(9)
+        tdSql.query("select ts from gt0")
+        tdSql.checkData(0,0,'2021-02-25 10:00:12.700')
+        tdSql.query("select c10 from gt1")
+        tdSql.checkData(0, 0, 8638)
+        tdSql.query("select c20 from gt2")
+        tdSql.checkData(0, 0, 8639)
+
+
+        #check taosdumptest/tmp2
+        tdSql.execute("drop database  dp1")
+        tdSql.execute("drop database  dp2")
+        os.system("%staosdump -i ./taosdumptest/tmp2 -T 2   " % binPath)
+        tdSql.execute("use dp1")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.query("show tables")
+        tdSql.checkRows(3)
+        tdSql.query("select c1 from st0_0 order by ts")
+        tdSql.checkData(0,0,8537)
+        tdSql.query("select c2 from st0_1 order by ts")
+        tdSql.checkData(1,0,"D")
+        tdSql.query("select * from gt0")
+        tdSql.checkData(0,0,'2021-02-25 10:00:12.000')
+        tdSql.checkData(0,1,637)
+        tdSql.error("select count(*) from gt1")
+        tdSql.error("use dp2")
+
+
+        #check taosdumptest/tmp3
+        tdSql.execute("drop database  dp1")
+        os.system("%staosdump  -i ./taosdumptest/tmp3 -T 2 " % binPath)  
+        tdSql.execute("use dp2")
+        tdSql.query("show stables")
+        tdSql.checkRows(2)
+        tdSql.query("show tables")
+        tdSql.checkRows(4)
+        tdSql.query("select count(*) from st1_0")
+        tdSql.checkData(0,0,2)
+        tdSql.query("select ts from gt0")
+        tdSql.checkData(0,0,'2021-02-25 10:00:12.700')
+        tdSql.error("use dp1")
+        tdSql.error("select count(*) from st2_0")
+        tdSql.error("select count(*) from gt2")
+
+        #check taosdumptest/tmp4
+        tdSql.execute("drop database  dp2")
+        os.system("%staosdump  -i ./taosdumptest/tmp4 -T 2 " % binPath)  
+        tdSql.execute("use dp2")
+        tdSql.query("show stables")
+        tdSql.checkRows(2)
+        tdSql.query("show tables")
+        tdSql.checkRows(6)
+        tdSql.query("select c20 from gt2")
+        tdSql.checkData(0, 0, 8639)
+        tdSql.query("select count(*) from st0_0")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st0_1")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st2_1")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st2_0")
+        tdSql.checkData(0, 0, 2)
+        tdSql.error("use dp1")
+        tdSql.error("select count(*) from st1_0")
+        tdSql.error("select count(*) from st1_1")
+        tdSql.error("select count(*) from gt3")
+
+
+        #check taosdumptest/tmp5
+        tdSql.execute("drop database  dp2")
+        os.system("%staosdump  -i ./taosdumptest/tmp5 -T 2 " % binPath)  
+        tdSql.execute("use dp2")
+        tdSql.query("show stables")
+        tdSql.checkRows(3)
+        tdSql.query("show tables")
+        tdSql.checkRows(9)
+        tdSql.query("select c20 from gt2")
+        tdSql.checkData(0, 0, 8639)
+        tdSql.query("select count(*) from st0_0")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st0_1")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st2_1")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st2_0")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st1_1")
+        tdSql.checkData(0, 0, 2)
+        tdSql.query("select count(*) from st1_0")
+        tdSql.checkData(0, 0, 2)
+        tdSql.execute("use dp1")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.query("show tables")
+        tdSql.checkRows(4)
+        tdSql.query("select c1 from st0_0 order by ts")
+        tdSql.checkData(0,0,8537)
+        tdSql.query("select c2 from st0_1 order by ts")
+        tdSql.checkData(1,0,"D")
+        tdSql.query("select * from gt0")
+        tdSql.checkData(0,0,'2021-02-25 10:00:12.000')
+        tdSql.checkData(0,1,637)
+
+       #check taosdumptest/tmp6
+        tdSql.execute("drop database dp1")
+        tdSql.execute("drop database dp2")
+        tdSql.execute("drop database dp3")
+        os.system("%staosdump  -i ./taosdumptest/tmp6 -T 2 " % binPath)  
+        tdSql.execute("use dp3")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+        tdSql.query("select count(*) from st0_0")
+        tdSql.checkData(0, 0, 2)        
+        tdSql.query("select * from st0 order by ts")
+        tdSql.checkData(0,0,'2021-02-25 10:00:12.000000001')
+        tdSql.checkData(0,1,8600)
+
+        os.system("rm -rf ./taosdumptest/tmp1")
+        os.system("rm -rf ./taosdumptest/tmp2")
+        os.system("rm -rf ./taosdumptest/tmp3")
+        os.system("rm -rf ./taosdumptest/tmp4")
+        os.system("rm -rf ./taosdumptest/tmp5")
+        os.system("rm -rf ./dump_result.txt")
+        os.system("rm -rf ./db.csv")
 
     def stop(self):
         tdSql.close()