Merge remote-tracking branch 'origin/develop' into szhou/fix/td-12608

src/balance/src/bnMain.c

@@ -567,7 +567,7 @@ void bnCheckStatus() {
   while (1) {
     pIter = mnodeGetNextDnode(pIter, &pDnode);
     if (pDnode == NULL) break;
-    if (tsAccessSquence - pDnode->lastAccess > 3) {
+    if (tsAccessSquence - pDnode->lastAccess > tsOfflineInterval) {
       if (pDnode->status != TAOS_DN_STATUS_DROPPING && pDnode->status != TAOS_DN_STATUS_OFFLINE) {
         pDnode->status = TAOS_DN_STATUS_OFFLINE;
         pDnode->offlineReason = TAOS_DN_OFF_STATUS_MSG_TIMEOUT;

src/client/src/tscSQLParser.c

@@ -7265,6 +7265,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
   const int tokenMonitor = 3;
   const int tokenDebugFlag = 4;
   const int tokenDebugFlagEnd = 20;
+  const int tokenOfflineInterval = 21;
   const SDNodeDynConfOption cfgOptions[] = {
       {"resetLog", 8},    {"resetQueryCache", 15},  {"balance", 7},     {"monitor", 7},
       {"debugFlag", 9},   {"monDebugFlag", 12},     {"vDebugFlag", 10}, {"mDebugFlag", 10},
@@ -7272,6 +7273,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
       {"uDebugFlag", 10}, {"tsdbDebugFlag", 13},    {"sDebugflag", 10}, {"rpcDebugFlag", 12},
       {"dDebugFlag", 10}, {"mqttDebugFlag", 13},    {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
       {"cqDebugFlag", 11},
+      {"offlineInterval", 15},
   };
 
   SStrToken* pOptionToken = taosArrayGet(pOptions->a, 1);
@@ -7303,6 +7305,14 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
       return TSDB_CODE_TSC_INVALID_OPERATION;  // options value is invalid
     }
     return TSDB_CODE_SUCCESS;
+  } else if ((strncasecmp(cfgOptions[tokenOfflineInterval].name, pOptionToken->z, pOptionToken->n) == 0) &&
+             (cfgOptions[tokenOfflineInterval].len == pOptionToken->n)) {
+    SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
+    int32_t    val = strtol(pValToken->z, NULL, 10);
+    if (val < 1 || val > 600) {
+      return TSDB_CODE_TSC_INVALID_OPERATION;  // options value is invalid
+    }
+    return TSDB_CODE_SUCCESS;
   } else {
     SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
 

src/common/inc/tglobal.h

@@ -119,6 +119,7 @@ extern int32_t tsdbWalFlushSize;
 extern int8_t  tsEnableBalance;
 extern int8_t  tsAlternativeRole;
 extern int32_t tsBalanceInterval;
+extern int32_t tsOfflineInterval;
 extern int32_t tsOfflineThreshold;
 extern int32_t tsMnodeEqualVnodeNum;
 extern int8_t  tsEnableFlowCtrl;

src/common/src/tglobal.c

@@ -164,6 +164,7 @@ int32_t tsdbWalFlushSize = TSDB_DEFAULT_WAL_FLUSH_SIZE;  // MB
 int8_t  tsEnableBalance = 1;
 int8_t  tsAlternativeRole = 0;
 int32_t tsBalanceInterval = 300;          // seconds
+int32_t tsOfflineInterval = 3;            // seconds
 int32_t tsOfflineThreshold = 86400 * 10;  // seconds of 10 days
 int32_t tsMnodeEqualVnodeNum = 4;
 int8_t  tsEnableFlowCtrl = 1;
@@ -653,6 +654,16 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "offlineInterval";
+  cfg.ptr = &tsOfflineInterval;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 600;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   // 0-any; 1-mnode; 2-vnode
   cfg.option = "role";
   cfg.ptr = &tsAlternativeRole;

taos-tools @ ed92906f

-Subproject commit 27751ba9ca17407425fb50a52cd68295794dedc3
+Subproject commit ed92906f2d09d0bfa75598f4a019de06710cffb0

src/util/inc/tconfig.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define TSDB_CFG_MAX_NUM    130
+#define TSDB_CFG_MAX_NUM    131
 #define TSDB_CFG_PRINT_LEN  23
 #define TSDB_CFG_OPTION_LEN 24
 #define TSDB_CFG_VALUE_LEN  41

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/taosdemoAllTest/insert-chinese-sml.json

+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "interlace_rows": 100,
+    "num_of_records_per_req": 1000,
+    "max_sql_len": 1024000,
+    "chinese": "yes",
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "no",
+            "replica": 1,
+            "days": 10,
+            "cache": 50,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 36500,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb3",
+            "child_table_exists":"no",
+            "childtable_count": 40,
+            "childtable_prefix": "stb03_",  
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 20,
+            "data_source": "rand",
+            "insert_mode": "sml",
+            "insert_rows": 100,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
+        },
+        {
+            "name": "stb4",
+            "child_table_exists":"no",
+            "childtable_count": 50,
+            "childtable_prefix": "stb04_",  
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 20,
+            "data_source": "rand",
+            "insert_mode": "sml",
+            "line_protocol": "telnet", 
+            "insert_rows": 100,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT", "count":2}]
+        },
+        {
+            "name": "stb5",
+            "child_table_exists":"no",
+            "childtable_count": 60,
+            "childtable_prefix": "stb05_",  
+            "auto_create_table": "no",
+            "batch_create_tbl_num": 20,
+            "data_source": "rand",
+            "insert_mode": "sml",
+            "line_protocol": "json", 
+            "insert_rows": 100,
+            "childtable_limit": -1,
+            "childtable_offset":0,
+            "multi_thread_write_one_tbl": "no",
+            "interlace_rows": 0,
+            "insert_interval":0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "TINYINT"}]
+        }]
+    }]
+}

tests/pytest/tools/taosdemoAllTest/insert-chinese.json

@@ -63,7 +63,7 @@
             "name": "stb1",
             "child_table_exists":"no",
             "childtable_count": 20,
-            "childtable_prefix": "stb00_",  
+            "childtable_prefix": "stb01_",  
             "auto_create_table": "no",
             "batch_create_tbl_num": 20,
             "data_source": "rand",
@@ -89,7 +89,7 @@
             "name": "stb2",
             "child_table_exists":"no",
             "childtable_count": 30,
-            "childtable_prefix": "stb00_",  
+            "childtable_prefix": "stb02_",  
             "auto_create_table": "no",
             "batch_create_tbl_num": 20,
             "data_source": "rand",
@@ -110,86 +110,6 @@
             "tags_file": "",
             "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
             "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
-        },
-        {
-            "name": "stb3",
-            "child_table_exists":"no",
-            "childtable_count": 40,
-            "childtable_prefix": "stb00_",  
-            "auto_create_table": "no",
-            "batch_create_tbl_num": 20,
-            "data_source": "rand",
-            "insert_mode": "sml",
-            "insert_rows": 100,
-            "childtable_limit": -1,
-            "childtable_offset":0,
-            "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 0,
-            "insert_interval":0,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "./sample.csv",
-            "tags_file": "",
-            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
-            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
-        },
-        {
-            "name": "stb4",
-            "child_table_exists":"no",
-            "childtable_count": 50,
-            "childtable_prefix": "stb00_",  
-            "auto_create_table": "no",
-            "batch_create_tbl_num": 20,
-            "data_source": "rand",
-            "insert_mode": "sml",
-            "line_protocol": "telnet", 
-            "insert_rows": 100,
-            "childtable_limit": -1,
-            "childtable_offset":0,
-            "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 0,
-            "insert_interval":0,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "./sample.csv",
-            "tags_file": "",
-            "columns": [{"type": "INT"}],
-            "tags": [{"type": "TINYINT", "count":2}]
-        },
-        {
-            "name": "stb5",
-            "child_table_exists":"no",
-            "childtable_count": 60,
-            "childtable_prefix": "stb00_",  
-            "auto_create_table": "no",
-            "batch_create_tbl_num": 20,
-            "data_source": "rand",
-            "insert_mode": "sml",
-            "line_protocol": "json", 
-            "insert_rows": 100,
-            "childtable_limit": -1,
-            "childtable_offset":0,
-            "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 0,
-            "insert_interval":0,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "./sample.csv",
-            "tags_file": "",
-            "columns": [{"type": "INT"}],
-            "tags": [{"type": "TINYINT"}]
         }]
     }]
 }

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")

tests/system-test/2-query/TD-11943.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+import sys
+import os 
+
+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)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    def caseDescription(self):
+
+        '''
+        case1 <authors>: wenzhouwww[TD-11943] : 
+            this test case is an test case for unexpected coredump about taosd ;
+            root cause : the pExpr2 of sql select tbname, max(col)+5 from child_table has two functions, col_proj and scalar_expr.
+            for function col_proj (tbname column), it is a tag during master scan stage, the input data is not set. 
+
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.query("select tbname ,max(value) from st;")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,19)
+        tdSql.query("select tbname ,max(value)+5 from st;")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,24)
+        tdSql.query("select tbname ,max(value) from sub_1;")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,11)
+        tdSql.query("select tbname ,max(value)+5 from sub_1;")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,16)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/2-query/TD-11969.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+import sys
+import os 
+
+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)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    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 ("taosd" 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 caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>: [TD-11969] : 
+            this test case is an test case for unexpected coredump for taoshell ;
+            root cause : make TBNAME projection query so that error is raised when update functions for column projection.
+
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+        tdSql.error("select max(ts_inter) ,tbname from (select elapsed(ts) ts_inter ,tbname from st interval (1s) group by tbname) order by ts;")
+        tdSql.error("select max(ts_inter) ,tbname from (select elapsed(ts) ts_inter from st interval (1s) group by tbname) ;")
+        tdSql.error("select max(ts_inter) ,tbname from (select * from st interval (1s) group by tbname) ;")
+        tdSql.error("select max(ts_inter) ,tbname from (select elapsed(ts) ts_inter ,tbname from sub_1 interval (1s)) order by ts;")
+        tdSql.query("select ts , tbname ,max(value) from st group by tbname order by ts;")
+        tdSql.checkRows(10)
+
+    
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/2-query/TD-11978.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+import sys
+import os 
+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)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    def caseDescription(self):
+
+        '''
+        case1 <authors>: wenzhouwww[TD-11978] : 
+            this test case is an test case for unexpected coredump about taoshell  ;
+            root cause : The function does not determine whether the input is empty
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.error("select elapsed(,) from sub_1;")
+        tdSql.error("select elapsed(,,) from sub_1;")
+        tdSql.error("select elapsed(,,1s) from sub_1;")
+
+        tdSql.error("select elapsed(,) from st group by tbname ;")
+        tdSql.error("select elapsed(,,) from st group by tbname;")
+        tdSql.error("select elapsed(,,1s) from st group by tbname;")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/2-query/TD-12014.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+import sys
+import os 
+
+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)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    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 ("taosd" 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 caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>:[TD-12014] : 
+            this test case is an test case for taoshell crash ， it will coredump when query such as "select 1*now from st "
+
+        ''' 
+        return 
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.error('select 1*now+2d-3m from st;') 
+        tdSql.error('select 1*now+2d-3m from sub_1;') 
+        tdSql.error('select 1-now+2d-3m from st;') 
+        tdSql.error('select 1*now+2d-3m from st;') 
+        tdSql.error('select 1/now+2d-3m from st;') 
+        tdSql.error('select 1%now+2d-3m from st;') 
+        tdSql.error('select 1*now+2d-3m from sub_1;') 
+        tdSql.error('select elapsed(ts)+now from st  group by tbname order by ts desc ;') 
+        tdSql.error('select elapsed(ts)-now from st  group by tbname order by ts desc ;')
+        tdSql.error('select elapsed(ts)*now from st  group by tbname order by ts desc ;')
+        tdSql.error('select elapsed(ts)/now from st  group by tbname order by ts desc ;')
+        tdSql.error('select elapsed(ts)%now from st  group by tbname order by ts desc ;')
+        tdSql.error('select elapsed(ts)+now from sub_1 order by ts desc ;') 
+        tdSql.error('select twa(value)+now from st order by ts desc ;') 
+        tdSql.error('select max(value)*now from st ;') 
+        tdSql.error('select max(value)*now from sub_1 ;') 
+        tdSql.error('select max(value)*now+2d-3m from st;')
+
+        tdSql.query('select max(value) from st where ts < now -2d +3m ;') 
+        tdSql.checkRows(1)
+        tdSql.query('select ts,value from st where ts < now -2d +3m ;') 
+        tdSql.checkRows(10)
+        tdSql.query('select max(value) from sub_1 where ts < now -2d +3m ;') 
+        tdSql.checkRows(1)
+        tdSql.query('select ts ,value from sub_1 where ts < now -2d +3m ;') 
+        tdSql.checkRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/2-query/TD-12344.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+from posixpath import split
+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 init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    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 ("taosd" 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 caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>: [TD-12344] : 
+            this test case is an test case for unexpectd crash for session function , it will coredump taoshell ;
+            
+        ''' 
+        return 
+
+    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 ("taosd" 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 getcfgPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+        print(selfPath)
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+        
+        cfgPath = projPath + "/sim/dnode1/cfg  "
+        return cfgPath
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+100*i,i*2,i+10.00))
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+200*i,i*2,i+10.00))
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+300*i,i*2,i+10.00))
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        cfg_path = self.getcfgPath()
+        print(cfg_path)
+        tdSql.execute('select elapsed(ts,10s) from testdb.st   where ts>=\"2015-01-01 00:00:00.000\"  and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;')  
+        
+        datas = tdSql.getResult('select elapsed(ts,10s) from testdb.st   where ts>=\"2015-01-01 00:00:00.000\"  and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;') 
+        table_names = ["sub_%s"%str(i) for i in  range(10)]
+        # print(table_names)
+
+        for index , table_name in enumerate(table_names):
+            tdSql.query("select elapsed(ts,10s) from testdb.%s   where ts>=\"2015-01-01 00:00:00.000\"  and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) ;"%table_name)
+            # print(datas)
+            tdSql.checkData(0,1,datas[index][1])
+
+
+        for i in range(10):
+            taos_cmd1= "taos  -c %s -s 'select elapsed(ts,10s) from testdb.st   where ts>=\"2015-01-01 00:00:00.000\"  and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;' " % (cfg_path)
+            # print(taos_cmd1)
+            _ = subprocess.check_output(taos_cmd1, shell=True).decode("utf-8") 
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/2-query/TD-12388.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+import sys
+import os 
+
+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)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    def caseDescription(self):
+
+        '''
+        case1 <authors>: wenzhouwww[TD-12388] : 
+            this test case is an test case for unit time params about elapsed function. 
+
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.error("select elapsed(ts,now+1d-3m) from st group by tbname;")
+        tdSql.error("select elapsed(ts,now) from st group by tbname;")
+        tdSql.error("select elapsed(ts,now*10) from st group by tbname;")
+        tdSql.error("select elapsed(ts,now*2s) from st group by tbname;")
+        tdSql.error("select elapsed(ts,now*2s) from sub_1;")
+       
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/2-query/TD-12593.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+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 init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    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 ("taosd" 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 caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>:[TD-12593] : 
+            this test case is an value error about nest query and inner query sort .
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+100*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+200*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+300*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.query('select * from (select csum(value) from tb1 order by ts  asc );')
+        tdSql.checkRows(4)
+        tdSql.checkData(0,1,11.000000000)
+        tdSql.checkData(1,1,22.000000000)
+        tdSql.checkData(2,1,33.000000000)
+        tdSql.checkData(3,1,44.000000000)
+        
+        tdSql.query('select * from (select csum(value) from tb1 order by ts  desc );')
+        tdSql.checkRows(4)
+        tdSql.checkData(0,1,44.000000000)
+        tdSql.checkData(1,1,33.000000000)
+        tdSql.checkData(2,1,22.000000000)
+        tdSql.checkData(3,1,11.000000000)
+
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/system-test/2-query/TD-12594.py

+###################################################################
+#           Copyright (c) 2020 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 -*-
+
+from posixpath import split
+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 init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.ts = 1420041600000 # 2015-01-01 00:00:00  this is begin time for first record
+        self.num = 10
+
+    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 ("taosd" 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 caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>:[TD-12594] : 
+            this test case is an value error about nest query and inner query sort for elapsed and twa  .
+        ''' 
+        return 
+
+   
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("create database if not exists testdb keep 36500;")
+        tdSql.execute("use testdb;")
+        tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
+        for i in range(self.num):
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+100*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+200*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+300*i,i*2,i+10.00))
+            tdSql.execute("insert into tb%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
+
+        tdSql.query('select elapsed(ts) from (select csum(value) from tb1 order by ts desc) interval(1s);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,9900.000000000)
+
+        tdSql.query('select twa(data) from (select csum(value) data from tb1 order by ts desc) interval(1s);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,16.833333333)
+     
+        tdSql.query('select elapsed(ts) from (select csum(value) from tb1 order by ts asc) interval(1s);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,9900.000000000)
+
+        tdSql.query('select twa(data) from (select csum(value) data from tb1 order by ts asc) interval(1s);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,16.833333333)
+
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/system-test/fulltest-query.sh

@@ -2,4 +2,4 @@ python3 ./test.py -f 2-query/TD-11256.py
 # python3 ./test.py -f 2-query/TD-11389.py
 python3 ./test.py -f 2-query/TD-11945_crash.py
 python3 ./test.py -f 2-query/TD-12340-12342.py
-python3 ./test.py -f 2-query/TD-12204.py
+python3 ./test.py -f 2-query/TD-12204.py
\ No newline at end of file

tests/system-test/fulltest-tools.sh

 python3 ./test.py -f 5-taos-tools/basic.py
 python3 ./test.py -f 5-taos-tools/TD-12478.py
+python3 ./test.py -f 5-taos-tools/dump_col_tag.py