[TD-5007]<fix>: use build directory's taosdump to test. (#6710)

btw, solve two taosdemo test cases too.

tests/pytest/tools/taosdemoPerformance.py

@@ -17,6 +17,7 @@ import argparse
 import os.path
 import json
 
+
 class taosdemoPerformace:
     def __init__(self, commitID, dbName):
         self.commitID = commitID
@@ -30,7 +31,7 @@ class taosdemoPerformace:
             self.user,
             self.password,
             self.config)
-        self.insertDB = "insertDB";    
+        self.insertDB = "insertDB"
 
     def generateJson(self):
         db = {
@@ -41,7 +42,7 @@ class taosdemoPerformace:
 
         stb = {
             "name": "meters",
-            "child_table_exists":"no",
+            "child_table_exists": "no",
             "childtable_count": 10000,
             "childtable_prefix": "stb_",
             "auto_create_table": "no",
@@ -62,7 +63,7 @@ class taosdemoPerformace:
                 {"type": "INT", "count": 4}
             ],
             "tags": [
-                {"type": "INT", "count":1}, 
+                {"type": "INT", "count": 1},
                 {"type": "BINARY", "len": 16}
             ]
         }
@@ -103,17 +104,49 @@ class taosdemoPerformace:
         cmd.close()
         return output
 
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosdemo" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
     def insertData(self):
-        os.system("taosdemo -f %s > taosdemoperf.txt 2>&1" % self.generateJson())
+        tdSql.prepare()
-        self.createTableTime = self.getCMDOutput("grep 'Spent' taosdemoperf.txt | awk 'NR==1{print $2}'")
+        buildPath = self.getBuildPath()
-        self.insertRecordsTime = self.getCMDOutput("grep 'Spent' taosdemoperf.txt | awk 'NR==2{print $2}'")
+        if (buildPath == ""):
-        self.recordsPerSecond = self.getCMDOutput("grep 'Spent' taosdemoperf.txt | awk 'NR==2{print $16}'")
+            tdLog.exit("taosdemo not found!")
+        else:
+            tdLog.info("taosdemo found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        os.system(
+            "%staosdemo -f %s > taosdemoperf.txt 2>&1" %
+            (binPath, self.generateJson()))
+        self.createTableTime = self.getCMDOutput(
+            "grep 'Spent' taosdemoperf.txt | awk 'NR==1{print $2}'")
+        self.insertRecordsTime = self.getCMDOutput(
+            "grep 'Spent' taosdemoperf.txt | awk 'NR==2{print $2}'")
+        self.recordsPerSecond = self.getCMDOutput(
+            "grep 'Spent' taosdemoperf.txt | awk 'NR==2{print $16}'")
         self.commitID = self.getCMDOutput("git rev-parse --short HEAD")
-        delay = self.getCMDOutput("grep 'delay' taosdemoperf.txt | awk '{print $4}'")
+        delay = self.getCMDOutput(
+            "grep 'delay' taosdemoperf.txt | awk '{print $4}'")
         self.avgDelay = delay[:-4]
-        delay = self.getCMDOutput("grep 'delay' taosdemoperf.txt | awk '{print $6}'")
+        delay = self.getCMDOutput(
+            "grep 'delay' taosdemoperf.txt | awk '{print $6}'")
         self.maxDelay = delay[:-4]
-        delay = self.getCMDOutput("grep 'delay' taosdemoperf.txt | awk '{print $8}'") 
+        delay = self.getCMDOutput(
+            "grep 'delay' taosdemoperf.txt | awk '{print $8}'")
         self.minDelay = delay[:-3]
 
         os.system("[ -f taosdemoperf.txt ] && rm taosdemoperf.txt")
@@ -131,12 +164,20 @@ class taosdemoPerformace:
         print("avg delay: %f" % float(self.avgDelay))
         print("max delay: %f" % float(self.maxDelay))
         print("min delay: %f" % float(self.minDelay))
-        cursor.execute("insert into taosdemo_perf values(now, %f, %f, %f, '%s', %f, %f, %f)" % 
+        cursor.execute(
-        (float(self.createTableTime), float(self.insertRecordsTime), float(self.recordsPerSecond), self.commitID, float(self.avgDelay), float(self.maxDelay), float(self.minDelay)))
+            "insert into taosdemo_perf values(now, %f, %f, %f, '%s', %f, %f, %f)" %
+            (float(
+                self.createTableTime), float(
+                self.insertRecordsTime), float(
+                self.recordsPerSecond), self.commitID, float(
+                    self.avgDelay), float(
+                        self.maxDelay), float(
+                            self.minDelay)))
         cursor.execute("drop database if exists %s" % self.insertDB)
 
         cursor.close()
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument(

tests/pytest/tools/taosdemoTest.py

@@ -36,7 +36,7 @@ class TDTestCase:
             projPath = selfPath[:selfPath.find("tests")]
 
         for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
+            if ("taosdemo" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
                 if ("packaging" not in rootRealPath):
                     buildPath = root[:len(root) - len("/build/bin")]
@@ -47,9 +47,9 @@ class TDTestCase:
         tdSql.prepare()
         buildPath = self.getBuildPath()
         if (buildPath == ""):
-            tdLog.exit("taosd not found!")
+            tdLog.exit("taosdemo not found!")
         else:
-            tdLog.info("taosd found in %s" % buildPath)
+            tdLog.info("taosdemo found in %s" % buildPath)
         binPath = buildPath + "/build/bin/"
         os.system("%staosdemo -y -t %d -n %d" %
                   (binPath, self.numberOfTables, self.numberOfRecords))

tests/pytest/tools/taosdumpTest.py

@@ -28,18 +28,36 @@ class TDTestCase:
         self.numberOfTables = 10000
         self.numberOfRecords = 100
 
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosdump" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
     def run(self):
-        if not os.path.exists("/taosdumptest/tmp1"):
+        if not os.path.exists("./taosdumptest/tmp1"):
-            os.makedirs("/taosdumptest/tmp1")
+            os.makedirs("./taosdumptest/tmp1")
         else:
             print("目录存在")
-        if not os.path.exists("/taosdumptest/tmp2"):
+
-            os.makedirs("/taosdumptest/tmp2")        
+        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("use db")
-        tdSql.execute("create table st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
         tdSql.execute("create table t1 using st tags(1, 'beijing')")
         sql = "insert into t1 values"
         currts = self.ts
@@ -52,22 +70,32 @@ class TDTestCase:
         for i in range(100):
             sql += "(%d, %d, 'nchar%d')" % (currts + i, i % 100, i % 100)
         tdSql.execute(sql)
-        os.system("taosdump --databases db -o /taosdumptest/tmp1")
+
-        os.system("taosdump --databases db1 -N -o /taosdumptest/tmp2")
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        os.system("%staosdump --databases db -o ./taosdumptest/tmp1" % binPath)
+        os.system(
+            "%staosdump --databases db1 -N -o ./taosdumptest/tmp2" %
+            binPath)
 
         tdSql.execute("drop database db")
         tdSql.execute("drop database db1")
         tdSql.query("show databases")
         tdSql.checkRows(0)
-        os.system("taosdump -i /taosdumptest/tmp1")
+        os.system("%staosdump -i ./taosdumptest/tmp1" % binPath)
-        os.system("taosdump -i /taosdumptest/tmp2")
+        os.system("%staosdump -i ./taosdumptest/tmp2" % binPath)
 
         tdSql.execute("use db")
         tdSql.query("show databases")
         tdSql.checkRows(2)
         dbresult = tdSql.queryResult
         # 6--days,7--keep0,keep1,keep, 12--block,
-        for i in  range(len(dbresult)):
+        for i in range(len(dbresult)):
             if dbresult[i][0] == 'db':
                 print(dbresult[i])
                 print(type(dbresult[i][6]))
@@ -102,36 +130,38 @@ class TDTestCase:
             tdSql.checkData(i, 1, i)
             tdSql.checkData(i, 2, "nchar%d" % i)
 
-        # drop all databases，boundary value testing. length(databasename)<=32;length(tablesname)<=192
+        # drop all databases，boundary value testing.
+        # length(databasename)<=32;length(tablesname)<=192
         tdSql.execute("drop database db")
         tdSql.execute("drop database db1")
-        os.system("rm -rf /taosdumptest/tmp1")
+        os.system("rm -rf ./taosdumptest/tmp1")
-        os.system("rm -rf /taosdumptest/tmp2")    
+        os.system("rm -rf ./taosdumptest/tmp2")
-        os.makedirs("/taosdumptest/tmp1")
+        os.makedirs("./taosdumptest/tmp1")
         tdSql.execute("create database db12312313231231321312312312_323")
         tdSql.error("create database db12312313231231321312312312_3231")
         tdSql.execute("use db12312313231231321312312312_323")
         tdSql.execute("create stable st12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
         tdSql.error("create stable st_12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
-        tdSql.execute("create stable st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
+        tdSql.execute(
+            "create stable st(ts timestamp, c1 int, c2 nchar(10)) tags(t1 int, t2 binary(10))")
         tdSql.error("create stable st1(ts timestamp, c1 int, col2_012345678901234567890123456789012345678901234567890123456789 nchar(10)) tags(t1 int, t2 binary(10))")
 
         tdSql.execute("select * from db12312313231231321312312312_323.st12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9")
         tdSql.error("create table t0_12345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678912345678_9 using st tags(1, 'beijing')")
         tdSql.query("show stables")
         tdSql.checkRows(2)
-        os.system("taosdump --databases db12312313231231321312312312_323 -o /taosdumptest/tmp1")
+        os.system(
+            "%staosdump --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" % binPath)
         tdSql.execute("drop database db12312313231231321312312312_323")
-        os.system("taosdump -i /taosdumptest/tmp1")
+        os.system("%staosdump -i ./taosdumptest/tmp1" % binPath)
         tdSql.execute("use db12312313231231321312312312_323")
         tdSql.query("show stables")
         tdSql.checkRows(2)
-        os.system("rm -rf /taosdumptest/tmp1")
+        os.system("rm -rf ./taosdumptest/tmp1")
-        os.system("rm -rf /taosdumptest/tmp2") 
+        os.system("rm -rf ./taosdumptest/tmp2")
         os.system("rm -rf ./dump_result.txt")
         os.system("rm -rf ./db.csv")
 
-
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)