Merge remote-tracking branch 'origin/develop' into hotfix/TD-12344

tests/system-test/2-query/TD-11389.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-11389] : 
+            this test case is an test case for cache error , it will let  the cached data obtained by the client that has connected to taosd incorrect，
+            root cause : table schema is changed, tag hostname size is increased through schema-less insertion. The schema cache of client taos is not refreshed.
+
+        ''' 
+        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 distinct(hostname) from st;")
+        tdSql.checkRows(10)
+
+        binPath = self.getBuildPath() + "/build/bin/"
+        os.system( "taos -s ' ALTER STABLE testdb.st MODIFY TAG hostname binary(100); '" )
+        os.system("taos -s ' insert into testdb.sub_test using testdb.st tags(\"host_10000000000000000000\" , 100) values (now , 100 , 100.0 ); '")
+        
+    
+        tdLog.info (" ===============The correct result should be 11 rows ,there is error query result ====================")
+
+        os.system("taos -s ' select distinct(hostname) from testdb.st '")
+
+        # this bug will occor at this connect  ,it should get 11 rows ,but return 10 rows ,this error is caused by cache 
+
+        for i in range(10):
+            
+            tdSql.checkRows(11)     # query 10 times every 10 second , test cache refresh
+            sleep(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-11945_crash.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confspeedential 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 provspeeded by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1:<wenzhouwww>: [TD-11945] this test case is an issue about taoshell and taosd crash , it now has been repaired on branch https://github.com/taosdata/TDengine/tree/feature%2FTD-6140
+        the root source maybe :
+        The four arithmetic operations do not perform the verification of the numeric type,so that the numeric type and string type will coredump about Four arithmetic operations
+        ''' 
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start test case for TD-11945 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 run(self):
+
+        tdSql.prepare()
+        tdSql.execute('create database if not exists testdb')
+        tdSql.execute('create table tb (ts timestamp, speed int)')
+        tdSql.execute('create stable st (ts timestamp, speed int) tags(ind int)')
+        
+        for i in range(self.num):
+            tdSql.execute('insert into tb values(%d,%d) '%(self.ts+i*10000,i))
+            tdSql.execute('insert into sub1 using st tags(1) values(%d,%d) '%(self.ts+i*10000,i))
+            tdSql.execute('insert into sub2 using st tags(2) values(%d,%d) '%(self.ts+i*10000,i))
+
+            tdLog.info(" ==================execute query =============")
+            tdSql.error('select 1*tbname, min(speed) , ind from st;')  
+            tdSql.execute('select tbname, min(speed) , ind from st group by ind;')
+            tdSql.error('select tbname , tbname,ind ,ind, * ,speed+"ab" from st;')
+            tdSql.error('select tbname , ind ,speed+"abc" from st;')
+            tdSql.error('select speed+"abc" from st;')
+            tdSql.error('select speed+"abc" from sub1;')
+            tdSql.error('select speed+"abc" from sub2;')  
+            tdSql.error('select max(speed) + "abc" from st;') 
+            tdSql.error('select max(speed) + "abc" from sub1;')
+            tdSql.error('select max(speed) + "abc" from sub2;')
+
+    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-12340-12342.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 -*-
+
+import taos
+import time
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def __init__(self):
+        self.err_case = 0
+        self.curret_case = 0
+
+    def caseDescription(self):
+
+        '''
+        case1 <cpwu>: [TD-12340] : group by ts should  resturn two column ;\n
+        case2 <cpwu>: [TD-12342] : "group by ts order by first-tag" should return error
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def create_stb(self):
+        basetime = int(round(time.time() * 1000))
+        tdSql.prepare()
+        tdSql.execute(f"create stable stb1(ts timestamp, c1 int) tags (tag1 int)")
+        for i in range(10):
+            tdSql.execute(f"create table t{i} using stb1 tags({i})")
+            tdSql.execute(f"insert into t{i} values ({basetime}, {i})")
+
+        pass
+
+    def check_td12342(self):
+        # this case expect return err when using "group by ts order by first-tag"
+        try:
+            tdSql.error("select count(*) from stb1 group by ts order by tag1")
+            self.curret_case += 1
+            tdLog.printNoPrefix("the case2: td-12342 run passed")
+        except:
+            self.err_case += 1
+            tdLog.printNoPrefix("the case2: td-12342 run failed")
+        pass
+
+    def run(self):
+        self.create_stb()
+
+        self.check_td12342()
+
+        if self.err_case > 0:
+            tdLog.exit(f"{self.err_case} is failed")
+        else:
+            tdLog.success("2 case is all passed")
+
+    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 *
+
+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-11389] : 
+            this test case is an test case for cache error , it will let  the cached data obtained by the client that has connected to taosd incorrect，
+            root cause : table schema is changed, tag hostname size is increased through schema-less insertion. The schema cache of client taos is not refreshed.
+
+        ''' 
+        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+10000*i,i*2,i+10.00))
+
+        tdSql.query('select elapsed(ts,10s) from sub_1  where ts>="2015-01-01 00:00:00.000"  and ts < "2015-01-01 00:10:00.000" session(ts,1d) ;')
+
+        cfg_path = self.getcfgPath()
+        print(cfg_path)
+        # tdSql.execute('select elapsed(ts,10s) from 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;')  # session not support super table
+        os.system("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))
+        
+         
+    
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+

tests/system-test/4-taosAdapter/rest_insert_config.json

+{"base_url": "127.0.0.1", "precision": "ms", "clear_data": true, "database_name": "db", "tbnum": 10, "data_row": 100, "case_file": "data_insert.csv", "basetime": 1639969683873, "all_case": false, "all_err": false, "all_current": true, "err_case": {"port_err": true, "api_err": true, "header_err": true, "db_tb_err": true, "data_err": true}, "current_case": {"port_current": true, "api_current": true, "header_current": true, "db_tb_current": true, "data_current": true}}
\ No newline at end of file

tests/system-test/4-taosAdapter/rest_query_config.json

+{"base_url": "127.0.0.1", "precision": "ms", "clear_data": true, "database_name": "db", "tbnum": 10, "data_row": 100, "basetime": 1639969706198, "all_case": false, "all_err": false, "all_current": true, "err_case": {"port_err": true, "api_err": true, "header_err": true, "sql_err": true}, "current_case": {"port_current": true, "api_current": true, "header_current": true, "sql_current": true}}
\ No newline at end of file

tests/system-test/5-taos-tools/basic.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<pxiao>: [TD-11977] start taosdump without taosd   
+        case1<pxiao>: [TD-11977] start taosBenchmark without taosd
+        case1<pxiao>: [TD-11977] start taosAdaptor without taosd
+        ''' 
+        return
+    
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()        
+        
+        tools = ["taosdump", "taosBenchmark", "taosAdaptor"]                
+        tdDnodes.stop(1)
+
+        for tool in tools:            
+            path = tdDnodes.dnodes[1].getBuildPath(tool)
+
+            try:
+                path += "/build/bin/" 
+                print(f"{path}{tool}")
+                if tool == "taosBenchmark":
+                    os.system(f"{path}{tool} -y")            
+                else:
+                    os.system(f"{path}{tool}")
+            except:
+                pass
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/system-test/fulltest-insert.sh

+python3 ./test.py -f 1-insert/batchInsert.py

tests/system-test/fulltest-others.sh

+python3 ./test.py -f 0-others/json_tag.py

tests/system-test/fulltest-query.sh

+python3 ./test.py -f 2-query/ts_hidden_column.py
+python3 ./test.py -f 2-query/union-order.py