Hotfix/sangshuduo/td 12655 taosdump unsigned (#9556)

* [TD-12655]<fix>(tools): taosdump unsigned

* [TD-12655]<fix>(tools): taosdump support unsigned types

add 5-taos-tools/taosdump/taosdumpTestTypeUnsignedInt.py

* [TD-12655]<fix>(tools): taosdump support unsigned

add taosdumpTestTypeUnsignedTinyInt.py

* fix query condition for 5-taos-tools/taosdump/taosdumpTestTypeUnsignedTinyInt.py

* [TD-12655]<fix>(tools): taosdump support unsigned types

add 5-taos-tools/taosdump/taosdumpTestTypeUnsignedSmallInt.py and 5-taos-tools/taosdump/taosdumpTestTypeUnsignedbigInt.py

* [TD-12655]<fix>(tools): taosdump support unsigned types

update fulltest-tools.sh and taos-tools

* [TD-11510]<test>(tools): update test case

* [TD-12655]<fix>(tools): taosdump support unsigned types

fix: local variable 'buildPath' referenced before assignment

* [TD-12655]<fix>(tools): taosdump support unsigned types

add -g to command line

* [TD-12655]<fix>(tools): taosdump support unsigned types

fix json case
Co-authored-by: Nzhaoyanggh <yzhao@taosdata.com>

taos-tools @ 00792e2c

-Subproject commit 59f00a69f36b08cea86a70a22c29b2c27ef506ae
+Subproject commit 00792e2c1a1ee61952e49dbcc33f28ebe4e2c45d

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBigInt.py

@@ -40,6 +40,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBool.py

@@ -40,6 +40,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeDouble.py

@@ -41,6 +41,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeFloat.py

@@ -41,6 +41,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeInt.py

@@ -40,6 +40,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeJson.py

@@ -40,6 +40,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosdump" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
@@ -85,11 +86,11 @@ class TDTestCase:
             os.system("rm -rf %s" % self.tmpdir)
             os.makedirs(self.tmpdir)
 
-        os.system("%staosdump --databases db -o %s" % (binPath, self.tmpdir))
+        os.system("%staosdump --databases db -o %s -g" % (binPath, self.tmpdir))
 
         tdSql.execute("drop database db")
 
-        os.system("%staosdump -i %s" % (binPath, self.tmpdir))
+        os.system("%staosdump -i %s -g" % (binPath, self.tmpdir))
 
         tdSql.query("show databases")
         tdSql.checkRows(1)

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedBigInt.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 os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<sdsang>: [TD-12655] taosdump supports unsigned big int
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.tmpdir = "tmp"
+
+    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")]
+
+        buildPath = ""
+        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):
+        tdSql.prepare()
+
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
+
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 BIGINT UNSIGNED) tags(ubntag BIGINT UNSIGNED)")
+        tdSql.execute("create table t1 using st tags(0)")
+        tdSql.execute("insert into t1 values(1640000000000, 0)")
+        tdSql.execute("create table t2 using st tags(18446744073709551614)")
+        tdSql.execute("insert into t2 values(1640000000000, 18446744073709551614)")
+        tdSql.execute("create table t3 using st tags(NULL)")
+        tdSql.execute("insert into t3 values(1640000000000, NULL)")
+
+#        sys.exit(1)
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        else:
+            print("directory exists")
+            os.system("rm -rf %s" % self.tmpdir)
+            os.makedirs(self.tmpdir)
+
+        os.system(
+            "%staosdump --databases db -o %s -T 1 -g" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
+
+        tdSql.query("show databases")
+        tdSql.checkRows(1)
+
+        tdSql.execute("use db")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'st')
+
+        tdSql.query("show tables")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from st where ubntag = 0")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 0)
+        tdSql.checkData(0, 2, 0)
+
+        tdSql.query("select * from st where ubntag = 18446744073709551614")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 18446744073709551614)
+        tdSql.checkData(0, 2, 18446744073709551614)
+
+        tdSql.query("select * from st where ubntag is null")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(0, 2, None)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedInt.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 os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<sdsang>: [TD-12526] taosdump supports unsigned int
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.tmpdir = "tmp"
+
+    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")]
+
+        buildPath = ""
+        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):
+        tdSql.prepare()
+
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
+
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 INT UNSIGNED) tags(untag INT UNSIGNED)")
+        tdSql.execute("create table t1 using st tags(0)")
+        tdSql.execute("insert into t1 values(1640000000000, 0)")
+        tdSql.execute("create table t2 using st tags(4294967294)")
+        tdSql.execute("insert into t2 values(1640000000000, 4294967294)")
+        tdSql.execute("create table t3 using st tags(NULL)")
+        tdSql.execute("insert into t3 values(1640000000000, NULL)")
+
+#        sys.exit(1)
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        else:
+            print("directory exists")
+            os.system("rm -rf %s" % self.tmpdir)
+            os.makedirs(self.tmpdir)
+
+        os.system(
+            "%staosdump --databases db -o %s -T 1 -g" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
+
+        tdSql.query("show databases")
+        tdSql.checkRows(1)
+
+        tdSql.execute("use db")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'st')
+
+        tdSql.query("show tables")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from st where untag = 0")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 0)
+        tdSql.checkData(0, 2, 0)
+
+        tdSql.query("select * from st where untag = 4294967294")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 4294967294)
+        tdSql.checkData(0, 2, 4294967294)
+
+        tdSql.query("select * from st where untag is null")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(0, 2, None)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedSmallInt.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 os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<sdsang>: [TD-12526] taosdump supports unsigned small int
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.tmpdir = "tmp"
+
+    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")]
+
+        buildPath = ""
+        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):
+        tdSql.prepare()
+
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
+
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 SMALLINT UNSIGNED) tags(usntag SMALLINT UNSIGNED)")
+        tdSql.execute("create table t1 using st tags(0)")
+        tdSql.execute("insert into t1 values(1640000000000, 0)")
+        tdSql.execute("create table t2 using st tags(65534)")
+        tdSql.execute("insert into t2 values(1640000000000, 65534)")
+        tdSql.execute("create table t3 using st tags(NULL)")
+        tdSql.execute("insert into t3 values(1640000000000, NULL)")
+
+#        sys.exit(1)
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        else:
+            print("directory exists")
+            os.system("rm -rf %s" % self.tmpdir)
+            os.makedirs(self.tmpdir)
+
+        os.system(
+            "%staosdump --databases db -o %s -T 1 -g" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
+
+        tdSql.query("show databases")
+        tdSql.checkRows(1)
+
+        tdSql.execute("use db")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'st')
+
+        tdSql.query("show tables")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from st where usntag = 0")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 0)
+        tdSql.checkData(0, 2, 0)
+
+        tdSql.query("select * from st where usntag = 65534")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 65534)
+        tdSql.checkData(0, 2, 65534)
+
+        tdSql.query("select * from st where usntag is null")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(0, 2, None)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeUnsignedTinyInt.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 os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<sdsang>: [TD-12526] taosdump supports unsigned tiny int
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.tmpdir = "tmp"
+
+    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")]
+
+        buildPath = ""
+        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):
+        tdSql.prepare()
+
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database db  days 11 keep 3649 blocks 8 ")
+
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 TINYINT UNSIGNED) tags(utntag TINYINT UNSIGNED)")
+        tdSql.execute("create table t1 using st tags(0)")
+        tdSql.execute("insert into t1 values(1640000000000, 0)")
+        tdSql.execute("create table t2 using st tags(254)")
+        tdSql.execute("insert into t2 values(1640000000000, 254)")
+        tdSql.execute("create table t3 using st tags(NULL)")
+        tdSql.execute("insert into t3 values(1640000000000, NULL)")
+
+#        sys.exit(1)
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        if not os.path.exists(self.tmpdir):
+            os.makedirs(self.tmpdir)
+        else:
+            print("directory exists")
+            os.system("rm -rf %s" % self.tmpdir)
+            os.makedirs(self.tmpdir)
+
+        os.system(
+            "%staosdump --databases db -o %s -T 1 -g" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1 -g" % (binPath, self.tmpdir))
+
+        tdSql.query("show databases")
+        tdSql.checkRows(1)
+
+        tdSql.execute("use db")
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'st')
+
+        tdSql.query("show tables")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from st where utntag = 0")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 0)
+        tdSql.checkData(0, 2, 0)
+
+        tdSql.query("select * from st where utntag = 254")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 254)
+        tdSql.checkData(0, 2, 254)
+
+        tdSql.query("select * from st where utntag is null")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(0, 2, None)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/develop-test/fulltest-tools.sh

-python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeJson.py
\ No newline at end of file
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeBigInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeBool.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeDouble.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeFloat.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeJson.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeSmallInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeTinyInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeUnsignedBigInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeUnsignedInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeUnsignedSmallInt.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeUnsignedTinyInt.py

tests/pytest/tools/taosdemoTestInterlace.py

@@ -33,6 +33,7 @@ class TDTestCase:
         else:
             projPath = selfPath[:selfPath.find("tests")]
 
+        buildPath = ""
         for root, dirs, files in os.walk(projPath):
             if ("taosd" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
@@ -49,7 +50,7 @@ class TDTestCase:
         else:
             tdLog.info("taosd found in %s" % buildPath)
         binPath = buildPath + "/build/bin/"
-        taosdemoCmd = "%staosBenchmark -f tools/insert-interlace.json -PP 2>&1 | grep sleep | wc -l" % binPath
+        taosdemoCmd = "%staosBenchmark -f tools/insert-interlace.json -G 2>&1 | grep sleep | wc -l" % binPath
         sleepTimes = subprocess.check_output(
             taosdemoCmd, shell=True).decode("utf-8")
         print("sleep times: %d" % int(sleepTimes))