Merge branch 'develop' of github.com:taosdata/TDengine into develop

taos-tools @ 59f00a69

-Subproject commit dd78bfff5549c08153798719c1707ab441b5f4ab
+Subproject commit 59f00a69f36b08cea86a70a22c29b2c27ef506ae

tests/system-test/2-query/TD-11483.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-11483] : 
+            this test case is an test case for support  nest query to  select key timestamp col  in outer query .
+        ''' 
+        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 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 ts ,max(value) from st;')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,19)
+
+        cfg_path = self.getcfgPath()
+        taos_cmd1= "taos  -c %s -s 'create table testdb.elapsed_vol as select elapsed(ts) from testdb.st interval(10s) sliding(5s) group by tbname;' " % (cfg_path)
+        _ = subprocess.check_output(taos_cmd1, shell=True).decode("utf-8") 
+        
+        flag = 0
+
+        while flag <1:
+            tdSql.query('select count(*) from testdb.elapsed_vol;')
+            data = tdSql.getResult("select count(*) from testdb.elapsed_vol;")
+            if data ==[]:
+                sleep(1)
+            else:
+                flag =1 
+                tdSql.checkData(0,0,20)
+                break
+
+        
+        
+
+    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-12145.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-12145] 
+            this test case is an test case for support  nest query to  select key timestamp col  in outer query .
+        ''' 
+        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 ts ,max(value) from st;')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,19)
+
+        tdSql.error('select ts ,max(value) from (select * from st);')
+        tdSql.error('select ts ,max(value) from (select ts ,value from st);')
+        tdSql.error('select ts ,elapsed(ts) from (select ts ,value from st);')
+        tdSql.query('select ts  from (select ts ,value from tb1);')
+        tdSql.checkRows(4)
+        tdSql.query('select ts, value from (select * from tb1);')
+        tdSql.checkRows(4)
+        tdSql.error('select _c0,max(value) from (select ts ,value from tb1);')
+        tdSql.query('select max(value) from (select ts ,value from tb1);')
+        tdSql.checkRows(1)
+        tdSql.query('select ts,max(value) from (select csum(value) value from tb1);')
+        tdSql.checkRows(1)
+        tdSql.query('select ts,max(value) from (select diff(value) value from tb1);')
+        tdSql.checkRows(1)
+        tdSql.query('select ts ,max(value) from (select csum(value) value from st group by tbname);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,76)
+
+    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-12164.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-12164] 
+            this test case is an test case for key timestamp colum , such as elapsed function ,it will occur unexpected results ;
+            Root Cause: elapse parameter column is checked that both the index and id is 0 
+            
+        ''' 
+        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))
+
+        # basic query
+        tdSql.query("select elapsed(ts) from st group by tbname ;  ")
+        tdSql.query("select elapsed(ts) from tb1 ;  ")
+        tdSql.error("select elapsed(ts) from tb1 group by tbname ;  ")
+        tdSql.query("select elapsed(ts) from st group by tbname  order by ts;  ")
+        tdSql.checkRows(10)
+        tdSql.checkData(0,0,0)
+        tdSql.checkData(1,0,9900)
+        tdSql.checkData(9,0,89100)
+        
+        # nest query  
+        tdSql.error('select elapsed(ts00 ,1s) from (select elapsed(ts,1s) ts00 from tb1) ;')
+        tdSql.error('select elapsed(ts00 ,1s) from (select elapsed(ts,1s) ts00 from st group by tbname ) ;')
+        tdSql.error('select elapsed(ts00 ,1s) from (select elapsed(ts,1s) ts00 from tb1 group by tbname ) ;')
+
+        tdSql.query('select max(ts00) from (select elapsed(ts,1s) ts00 from st group by tbname ) ;')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,89.1)
+
+        tdSql.error('select elapsed(data) from (select elapsed(ts,1s) data from st group by tbname ) ;')
+        tdSql.error('select elapsed(data) from (select elapsed(ts,1s) data from tb2 ) ;')
+
+        tdSql.error('select elapsed(data) from (select ts data from st group by tbname ) ;')
+        tdSql.error('select elapsed(data) from (select ts data from tb2 ) ;')
+
+        tdSql.error('select elapsed(data) from (select value data from st group by tbname ) ;')
+        tdSql.error('select elapsed(data) from (select value data from tb2 ) ;')
+
+        tdSql.query('select elapsed(ts) from (select csum(value) data from tb2 ) ;')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,19800)
+
+        tdSql.query('select elapsed(ts) from (select diff(value) data from tb2 ) ;')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,19600.0)
+
+        # another bug : it will be forbidden in the feature .
+        # tdSql.error('select elapsed(ts) from (select csum(value) data 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-12165.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-12165]  
+            this test case is an test case for unexpectd use way for alias _c0 ,it should be regarded as keywords ;
+            
+        ''' 
+        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))
+
+        # basic alis
+        tdSql.error('select value ,value as _c0 from st;')  
+        tdSql.error('select value _c0 from st;')
+        tdSql.error('select ind ,ind as _c0 from st;')  
+        tdSql.error('select ind _c0 from st;')
+        tdSql.error('select ts ,ts as _c0 from st;')  
+        tdSql.error('select ts _c0 from st;')
+        tdSql.error('select value ,value as _c0 from tb1;')  
+        tdSql.error('select value _c0 from tb2;')    
+        tdSql.error('select ts ,ts as _c0 from tb1;')  
+        tdSql.error('select ts _c0 from tb2;') 
+       
+        # nest query  alis name
+
+        tdSql.error('select ts , ts _c0 from (select ts ,value from st);')  
+        tdSql.error('select ts , ts as _c0 from (select ts ,value from tb1);')  
+        tdSql.error('select ts , ts _c0 from (select * from st);')  
+        tdSql.error('select ts , ts as _c0 from (select * from tb1);')  
+        tdSql.error('select ts , _c0 from (select max(value) _c0 from st);')  
+        tdSql.error('select ts , _c0 from (select max(value) _c0 from tb1);')
+        tdSql.query('select _c0,data from (select max(value) data from tb1);')  
+        tdSql.query('select _c0,data from (select max(value) data from st);')
+        tdSql.query('select _c0,data from (select ts ,max(value) data from st);')
+        tdSql.checkData(0,1,'19.0')
+        tdSql.query('select _c0,data from (select ts ,max(value) data from tb1);')
+        tdSql.checkData(0,1,'11.0')
+        tdSql.query('select _c0,data from (select csum(value) data from tb1);')
+        tdSql.checkData(0,1,'11.0')
+
+    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-12614.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 <author>:wenzhouwww [TD-12614] : 
+            this test case is an function error about nest query inner group by tbname for some cases .
+        ''' 
+        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 ts ,max(value) from st;')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,1,19)
+
+        tdSql.query(' select elapsed(ts) from (select csum(value) from tb1);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,9900)
+
+        tdSql.query(' select elapsed(ts) from (select csum(value) from tb2);')
+        tdSql.checkRows(1)
+        tdSql.checkData(0,0,19800)
+
+        tdSql.error(' select elapsed(ts) from (select csum(value) 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/fulltest-query.sh

@@ -7,4 +7,3 @@ python3 ./test.py -f 2-query/TD-11561.py
 
 python3 ./test.py -f 2-query/TD-12204.py
 
-