[TD-12526]<test>(tools): taosdump supplement testcase (#9440)

* [TD-12526]<test>(tools): add taosdump bool type test

* add test case for int type.

* add tinyint case

* add small int case

* add big int case

* add big int case

* add float test case

* add double test case

* add double test case

* update taos-tools

* [TD-12526]<test>(tools): taosdump supplement test cases

fix description

* [TD-12526]<test>(tools): taosdump supplement test cases

fix description

* [TD-12526]<test>(tools): taosdump supplement test case

autopep8 formatted

* [TD-12526]<test>(tools): update taosdemo

* [TD-12526]<test>(tools): taosdump supplement test case
update taos-tools

* [TD-12318]<feature>(tools)taosBenchmark support custom tag

* fix tools/taosdumpTest2.py

* [TD-12526]<test>(tools): fix test case and update taos-tools
Co-authored-by: Nzhaoyanggh <yzhao@taosdata.com>

taos-tools @ ed92906f

-Subproject commit 27751ba9ca17407425fb50a52cd68295794dedc3
+Subproject commit ed92906f2d09d0bfa75598f4a019de06710cffb0

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeBigInt.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 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")]
+
+        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) tags(bntag BIGINT)")
+        tdSql.execute("create table t1 using st tags(1)")
+        tdSql.execute("insert into t1 values(1640000000000, 1)")
+
+        tdSql.execute("create table t2 using st tags(9223372036854775807)")
+        tdSql.execute(
+            "insert into t2 values(1640000000000, 9223372036854775807)")
+
+        tdSql.execute("create table t3 using st tags(-9223372036854775807)")
+        tdSql.execute(
+            "insert into t3 values(1640000000000, -9223372036854775807)")
+
+        tdSql.execute("create table t4 using st tags(NULL)")
+        tdSql.execute("insert into t4 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" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1" % (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(4)
+
+        tdSql.query("select * from st where bntag = 1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(0, 2, 1)
+
+        tdSql.query("select * from st where bntag = 9223372036854775807")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 9223372036854775807)
+        tdSql.checkData(0, 2, 9223372036854775807)
+
+        tdSql.query("select * from st where bntag = -9223372036854775807")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, -9223372036854775807)
+        tdSql.checkData(0, 2, -9223372036854775807)
+
+        tdSql.query("select * from st where bntag 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/taosdumpTestTypeBool.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 bool
+        '''
+        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")]
+
+        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 BOOL) tags(btag BOOL)")
+        tdSql.execute("create table t1 using st tags(true)")
+        tdSql.execute("insert into t1 values(1640000000000, true)")
+        tdSql.execute("create table t2 using st tags(false)")
+        tdSql.execute("insert into t2 values(1640000000000, false)")
+        tdSql.execute("create table t3 using st tags(NULL)")
+        tdSql.execute("insert into t3 values(1640000000000, NULL)")
+
+        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" % (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s" % (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.checkData(0, 0, 't3')
+        tdSql.checkData(1, 0, 't2')
+        tdSql.checkData(2, 0, 't1')
+
+        tdSql.query("select btag from st")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 0, "False")
+        tdSql.checkData(1, 0, "True")
+        tdSql.checkData(2, 0, None)
+
+        tdSql.query("select * from st where btag = 'true'")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, "True")
+        tdSql.checkData(0, 2, "True")
+
+        tdSql.query("select * from st where btag = 'false'")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, "False")
+        tdSql.checkData(0, 2, "False")
+
+        tdSql.query("select * from st where btag is null")
+        tdSql.checkRows(1)
+        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/taosdumpTestTypeDouble.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
+import math
+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 double
+        '''
+        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")]
+
+        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 DOUBLE) tags(dbtag DOUBLE)")
+        tdSql.execute("create table t1 using st tags(1.0)")
+        tdSql.execute("insert into t1 values(1640000000000, 1.0)")
+
+        tdSql.execute("create table t2 using st tags(1.7E308)")
+        tdSql.execute("insert into t2 values(1640000000000, 1.7E308)")
+
+        tdSql.execute("create table t3 using st tags(-1.7E308)")
+        tdSql.execute("insert into t3 values(1640000000000, -1.7E308)")
+
+        tdSql.execute("create table t4 using st tags(NULL)")
+        tdSql.execute("insert into t4 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" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1" % (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(4)
+
+        tdSql.query("select * from st where dbtag = 1.0")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        if not math.isclose(tdSql.getData(0, 1), 1.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 1), 1.0))
+            tdLog.exit("data is different")
+        if not math.isclose(tdSql.getData(0, 2), 1.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 2), 1.0))
+            tdLog.exit("data is different")
+
+        tdSql.query("select * from st where dbtag = 1.7E308")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        if not math.isclose(tdSql.getData(0, 1), 1.7E308):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 1), 1.7E308))
+            tdLog.exit("data is different")
+        if not math.isclose(tdSql.getData(0, 2), 1.7E308):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 2), 1.7E308))
+            tdLog.exit("data is different")
+
+        tdSql.query("select * from st where dbtag = -1.7E308")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        if not math.isclose(tdSql.getData(0, 1), -1.7E308):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 1), -1.7E308))
+            tdLog.exit("data is different")
+        if not math.isclose(tdSql.getData(0, 2), -1.7E308):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 2), -1.7E308))
+            tdLog.exit("data is different")
+
+        tdSql.query("select * from st where dbtag 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/taosdumpTestTypeFloat.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
+import math
+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 float
+        '''
+        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")]
+
+        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 FLOAT) tags(ftag FLOAT)")
+        tdSql.execute("create table t1 using st tags(1.0)")
+        tdSql.execute("insert into t1 values(1640000000000, 1.0)")
+
+        tdSql.execute("create table t2 using st tags(3.40E+38)")
+        tdSql.execute("insert into t2 values(1640000000000, 3.40E+38)")
+
+        tdSql.execute("create table t3 using st tags(-3.40E+38)")
+        tdSql.execute("insert into t3 values(1640000000000, -3.40E+38)")
+
+        tdSql.execute("create table t4 using st tags(NULL)")
+        tdSql.execute("insert into t4 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" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1" % (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(4)
+
+        tdSql.query("select * from st where ftag = 1.0")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        if not math.isclose(tdSql.getData(0, 1), 1.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 1), 1.0))
+            tdLog.exit("data is different")
+        if not math.isclose(tdSql.getData(0, 2), 1.0):
+            tdLog.exit("data is different")
+
+        tdSql.query("select * from st where ftag = 3.4E38")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        if not math.isclose(tdSql.getData(0, 1), 3.4E38,
+                            rel_tol=1e-07, abs_tol=0.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 1), 3.4E38))
+            tdLog.exit("data is different")
+        if not math.isclose(tdSql.getData(0, 2), 3.4E38,
+                            rel_tol=1e-07, abs_tol=0.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 2), 3.4E38))
+            tdLog.exit("data is different")
+
+        tdSql.query("select * from st where ftag = -3.4E38")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        if not math.isclose(tdSql.getData(0, 1), (-3.4E38),
+                            rel_tol=1e-07, abs_tol=0.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 1), -3.4E38))
+            tdLog.exit("data is different")
+        if not math.isclose(tdSql.getData(0, 2), (-3.4E38),
+                            rel_tol=1e-07, abs_tol=0.0):
+            tdLog.debug("getData(0, 1): %f, to compare %f" %
+                        (tdSql.getData(0, 2), -3.4E38))
+            tdLog.exit("data is different")
+
+        tdSql.query("select * from st where ftag 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/taosdumpTestTypeInt.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 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")]
+
+        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) tags(ntag INT)")
+        tdSql.execute("create table t1 using st tags(1)")
+        tdSql.execute("insert into t1 values(1640000000000, 1)")
+        tdSql.execute("create table t2 using st tags(2147483647)")
+        tdSql.execute("insert into t2 values(1640000000000, 2147483647)")
+        tdSql.execute("create table t3 using st tags(-2147483647)")
+        tdSql.execute("insert into t3 values(1640000000000, -2147483647)")
+        tdSql.execute("create table t4 using st tags(NULL)")
+        tdSql.execute("insert into t4 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" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1" % (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(4)
+
+        tdSql.query("select * from st where ntag = 1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(0, 2, 1)
+
+        tdSql.query("select * from st where ntag = 2147483647")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 2147483647)
+        tdSql.checkData(0, 2, 2147483647)
+
+        tdSql.query("select * from st where ntag = -2147483647")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, -2147483647)
+        tdSql.checkData(0, 2, -2147483647)
+
+        tdSql.query("select * from st where ntag 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/taosdumpTestTypeJson.py

@@ -57,7 +57,8 @@ class TDTestCase:
         tdSql.execute("use db")
         tdSql.execute(
             "create table st(ts timestamp, c1 int) tags(jtag JSON)")
-        tdSql.execute("create table t1 using st tags('{\"location\": \"beijing\"}')")
+        tdSql.execute(
+            "create table t1 using st tags('{\"location\": \"beijing\"}')")
         tdSql.execute("insert into t1 values(1500000000000, 1)")
 
         buildPath = self.getBuildPath()
@@ -101,7 +102,6 @@ class TDTestCase:
         tdSql.checkData(0, 1, 1)
         tdSql.checkData(0, 2, '{\"location\":\"beijing\"}')
 
-
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/develop-test/5-taos-tools/taosdump/taosdumpTestTypeSmallInt.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 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")]
+
+        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) tags(sntag SMALLINT)")
+        tdSql.execute("create table t1 using st tags(1)")
+        tdSql.execute("insert into t1 values(1640000000000, 1)")
+
+        tdSql.execute("create table t2 using st tags(32767)")
+        tdSql.execute("insert into t2 values(1640000000000, 32767)")
+
+        tdSql.execute("create table t3 using st tags(-32767)")
+        tdSql.execute("insert into t3 values(1640000000000, -32767)")
+
+        tdSql.execute("create table t4 using st tags(NULL)")
+        tdSql.execute("insert into t4 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" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1" % (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(4)
+
+        tdSql.query("select * from st where sntag = 1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(0, 2, 1)
+
+        tdSql.query("select * from st where sntag = 32767")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 32767)
+        tdSql.checkData(0, 2, 32767)
+
+        tdSql.query("select * from st where sntag = -32767")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, -32767)
+        tdSql.checkData(0, 2, -32767)
+
+        tdSql.query("select * from st where sntag 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/taosdumpTestTypeTinyInt.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 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")]
+
+        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) tags(tntag TINYINT)")
+        tdSql.execute("create table t1 using st tags(1)")
+        tdSql.execute("insert into t1 values(1640000000000, 1)")
+
+        tdSql.execute("create table t2 using st tags(127)")
+        tdSql.execute("insert into t2 values(1640000000000, 127)")
+
+        tdSql.execute("create table t3 using st tags(-127)")
+        tdSql.execute("insert into t3 values(1640000000000, -127)")
+
+        tdSql.execute("create table t4 using st tags(NULL)")
+        tdSql.execute("insert into t4 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" %
+            (binPath, self.tmpdir))
+
+#        sys.exit(1)
+        tdSql.execute("drop database db")
+
+        os.system("%staosdump -i %s -T 1" % (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(4)
+
+        tdSql.query("select * from st where tntag = 1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(0, 2, 1)
+
+        tdSql.query("select * from st where tntag = 127")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, 127)
+        tdSql.checkData(0, 2, 127)
+
+        tdSql.query("select * from st where tntag = -127")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1640000000000)
+        tdSql.checkData(0, 1, -127)
+        tdSql.checkData(0, 2, -127)
+
+        tdSql.query("select * from st where tntag 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/pytest/fulltest-tools.sh

@@ -16,14 +16,14 @@ python3 test.py -f tools/taosdemoTestWithJson.py
 python3 test.py -f tools/taosdemoTestLimitOffset.py
 python3 test.py -f tools/taosdemoTestTblAlt.py
 python3 test.py -f tools/taosdemoTestSampleData.py
-python3 test.py -f tools/taosdemoTestInterlace.py
+#python3 test.py -f tools/taosdemoTestInterlace.py
 # python3 test.py -f tools/taosdemoTestQuery.py
 python3 ./test.py -f tools/taosdemoTestdatatype.py
 #======================p2-end===============
 #======================p3-start===============
 
 # nano support
-python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py
+#python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py
 python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoQuery.py
 python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanosubscribe.py
 python3 test.py -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestInsertTime_step.py
@@ -32,14 +32,14 @@ python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
 #======================p3-end===============
 #======================p4-start===============
 
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertAllType.py
+#python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
+#python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertAllType.py
 python3 test.py -f tools/taosdemoAllTest/TD-4985/query-limit-offset.py
 python3 test.py -f tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py
 python3 test.py -f tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.py
 
-#python3 test.py -f tools/taosdemoAllTest/TD-10539/create_taosdemo.py
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py
+#python3 test.py -f tools/taosdemoAllTest/TD-10539/creatfe_taosdemo.py
+#python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonSml.py
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertShell.py
 

tests/pytest/tools/taosdumpTest2.py

@@ -68,8 +68,9 @@ class TDTestCase:
         binPath = buildPath + "/build/bin/"
 
         os.system("rm /tmp/*.sql")
+        os.system("rm /tmp/*.avro*")
         os.system(
-            "%staosdump --databases db -o /tmp -B 16384 -L 1048576" %
+            "%staosdump --databases db -o /tmp -B 16384" %
             binPath)
 
         tdSql.execute("drop database db")