Merge pull request #3914 from taosdata/hotfix/test

[1750]<fix> add python ConnectionError

src/connector/python/linux/python2/taos/cinterface.py

@@ -225,6 +225,7 @@ class CTaosInterface(object):
 
         if connection.value == None:
             print('connect to TDengine failed')
+            raise ConnectionError("connect to TDengine failed")
             # sys.exit(1)
         else:
             print('connect to TDengine success')

src/connector/python/linux/python3/taos/cinterface.py

@@ -225,6 +225,7 @@ class CTaosInterface(object):
 
         if connection.value == None:
             print('connect to TDengine failed')
+            raise ConnectionError("connect to TDengine failed")
             # sys.exit(1)
         #else:
         #    print('connect to TDengine success')
@@ -414,4 +415,4 @@ if __name__ == '__main__':
     print(data)
 
     cinter.freeResult(result)
-    cinter.close(conn)
\ No newline at end of file
+    cinter.close(conn)

tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCConnectorChecker.java

@@ -120,6 +120,7 @@ public class JDBCConnectorChecker {
             printSql(sql, execute, (end - start));
         } catch (SQLException e) {
             e.printStackTrace();
+            
         }
     }
 

tests/examples/python/PYTHONConnectorChecker/PythonChecker.py

+import taos
+import time 
+import sys
+import getopt
+class ConnectorChecker:
+    def init(self):  
+        self.host = "127.0.0.1"
+        self.dbName = "test"
+        self.tbName = "weather"
+        self.user = "root"
+        self.password = "taosdata"
+        
+       
+    def sethdt(self,FQDN,dbname,tbname):
+        if(FQDN):
+            self.host=FQDN
+        if(dbname):
+            self.dbname=dbname
+        if(tbname):
+            self.tbName
+    def printSql(self,sql,elapsed):
+        print("[ "+"OK"+" ]"+" time cost: %s ms, execute statement ====> %s"
+                   %(elapsed,sql))
+    def executeQuery(self,sql):
+        try:
+            start=time.time()
+            execute = self.cl.execute(sql)
+            elapsed = (time.time()-start)*1000
+            self.printSql(sql,elapsed)
+            data = self.cl.fetchall()
+            numOfRows = self.cl.rowcount
+            numOfCols = len(self.cl.description)
+            for irow in range(numOfRows):
+                print("Row%d: ts=%s, temperature=%d, humidity=%f" %(irow, data[irow][0], data[irow][1],data[irow][2]))
+        except Exception as e:
+            print("Failure sql: %s,exception: %s" %sql,str(e))  
+    def execute(self,sql):
+        try:
+            start=time.time()
+            execute = self.cl.execute(sql)
+            elapsed = (time.time()-start)*1000
+            self.printSql(sql,elapsed)
+           
+        except Exception as e:
+            print("Failure sql: %s,exception: %s" %
+                sql,str(e))
+    def close(self):
+        self.cl.close()
+        self.conn.close()
+    def createDatabase(self):
+        sql="create database if not exists %s" % self.dbName
+        self.execute(sql)
+    def useDatabase(self):
+        sql="use %s" % self.dbName
+        self.execute(sql)
+    def createTable(self):
+        sql="create table if not exists %s.%s (ts timestamp, temperature float, humidity int)"%(self.dbName,self.tbName)
+        self.execute(sql)
+    def checkDropTable(self):
+        sql="drop table if exists " + self.dbName + "." + self.tbName + ""
+        self.execute(sql)
+    def checkInsert(self):
+        sql="insert into test.weather (ts, temperature, humidity) values(now, 20.5, 34)"
+        self.execute(sql)
+    def checkSelect(self):
+        sql = "select * from test.weather"
+        self.executeQuery(sql)
+    def srun(self):
+        print(self.host)
+        try:
+            self.conn = taos.connect(host=self.host,user=self.user,password=self.password)
+            #self.conn = taos.connect(self.host,self.user,self.password)
+        except Exception as e:
+            print("connection failed: %s"%self.host)
+            exit(1)
+        print("[ OK ] Connection established.")
+        self.cl = self.conn.cursor()
+
+def main(argv):
+    FQDN=''
+    dbname=''
+    tbname=''
+    try:
+      opts, args = getopt.getopt(argv,"h:d:t:",["FQDN=","ifile=","ofile="])
+    except getopt.GetoptError:
+        print ('PYTHONConnectorChecker.py -h <FQDN>')
+        sys.exit(2)
+    for opt, arg in opts:
+        if opt in ("-h", "--FQDN"):
+            FQDN=arg
+        elif opt in ("-d", "--dbname"):
+            dbname = arg
+        elif opt in ("-t", "--tbname"):
+            tbname = arg
+   
+    checker = ConnectorChecker()
+    checker.init()
+    checker.sethdt(FQDN,dbname,tbname)
+    checker.srun()
+    checker.createDatabase()
+    checker.useDatabase()
+    checker.checkDropTable()
+    checker.createTable()
+    checker.checkInsert()
+    checker.checkSelect()
+    checker.checkDropTable()
+    checker.close()
+
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
+           
+

tests/gotest/batchtest.bat

+@echo off
+echo ==== start Go connector test cases test ====
+cd /d %~dp0
+
+set severIp=%1
+set serverPort=%2
+if "%severIp%"=="" (set severIp=127.0.0.1)
+if "%serverPort%"=="" (set serverPort=6030)
+
+cd case001
+case001.bat %severIp% %serverPort%  
+
+rem cd case002
+rem case002.bat
+
+:: cd case002
+:: case002.bat

tests/gotest/batchtest.sh

 #!/bin/bash
 
-bash ./case001/case001.sh
-#bash ./case002/case002.sh
-#bash ./case003/case003.sh
+echo "==== start Go connector test cases test ===="
+
+severIp=$1
+serverPort=$2
+
+if [ ! -n "$severIp" ]; then
+  severIp=127.0.0.1
+fi
+
+if [ ! -n "$serverPort" ]; then
+  serverPort=6030
+fi
+
+bash ./case001/case001.sh $severIp $serverPort
+#bash ./case002/case002.sh $severIp $serverPort
+#bash ./case003/case003.sh $severIp $serverPort

tests/gotest/case001/case001.bat

+@echo off
+echo ==== start run cases001.go
+
+del go.*
+go mod init demotest
+go build
+demotest.exe -h %1 -p %2
+cd ..
+

tests/gotest/case001/case001.go

@@ -16,20 +16,53 @@ package main
 
 import (
 	"database/sql"
+	"flag"
 	"fmt"
 	_ "github.com/taosdata/driver-go/taosSql"
 	"log"
+	"strconv"
 	"time"
 )
 
+type config struct {
+	hostName                string
+	serverPort              int
+	user                    string
+	password                string
+}
+
+var configPara config
+var url string
+
+func init() {
+	flag.StringVar(&configPara.hostName, "h", "127.0.0.1","The host to connect to TDengine server.")
+	flag.IntVar(&configPara.serverPort, "p", 6030, "The TCP/IP port number to use for the connection to TDengine server.")
+	flag.StringVar(&configPara.user, "u", "root", "The TDengine user name to use when connecting to the server.")
+	flag.StringVar(&configPara.password, "P", "taosdata", "The password to use when connecting to the server.")
+
+	flag.Parse()
+}
+
+func printAllArgs() {
+	fmt.Printf("\n============= args parse result: =============\n")
+	fmt.Printf("hostName:             %v\n", configPara.hostName)
+	fmt.Printf("serverPort:           %v\n", configPara.serverPort)
+	fmt.Printf("usr:                  %v\n", configPara.user)
+	fmt.Printf("password:             %v\n", configPara.password)
+	fmt.Printf("================================================\n")
+}
+
 func main() {
+	printAllArgs()
 	taosDriverName := "taosSql"
 	demodb := "demodb"
 	demot := "demot"
 
 	fmt.Printf("\n======== start demo test ========\n")
+
+	url = "root:taosdata@/tcp(" + configPara.hostName + ":" + strconv.Itoa(configPara.serverPort) + ")/"
 	// open connect to taos server
-	db, err := sql.Open(taosDriverName, "root:taosdata@/tcp(192.168.1.217:7100)/")
+	db, err := sql.Open(taosDriverName, url)
 	if err != nil {
 		log.Fatalf("Open database error: %s\n", err)
 	}

tests/gotest/case001/case001.sh

 #!/bin/bash
 
-##################################################
-# 
-# Do go test 
-#
-##################################################
+echo "==== start run cases001.go"
 
 set +e
 #set -x
@@ -12,59 +8,14 @@ set +e
 script_dir="$(dirname $(readlink -f $0))"
 #echo "pwd: $script_dir, para0: $0"
 
-execName=$0
-execName=`echo ${execName##*/}`
-goName=`echo ${execName%.*}`
-
-###### step 1: start one taosd
-scriptDir=$script_dir/../../script/sh
-bash $scriptDir/stop_dnodes.sh
-bash $scriptDir/deploy.sh -n dnode1 -i 1
-bash $scriptDir/cfg.sh -n dnode1 -c walLevel -v 0
-bash $scriptDir/exec.sh -n dnode1 -s start
-
-###### step 2: set config item
-TAOS_CFG=/etc/taos/taos.cfg
-HOSTNAME=`hostname -f`
-
-if [ ! -f ${TAOS_CFG} ]; then
-  touch -f $TAOS_CFG
-fi 
-
-echo " "                                           > $TAOS_CFG
-echo "firstEp            ${HOSTNAME}:7100"        >> $TAOS_CFG
-echo "secondEp           ${HOSTNAME}:7200"        >> $TAOS_CFG
-echo "serverPort         7100"                    >> $TAOS_CFG
-#echo "dataDir            $DATA_DIR"              >> $TAOS_CFG
-#echo "logDir             $LOG_DIR"               >> $TAOS_CFG
-#echo "scriptDir          ${CODE_DIR}/../script"  >> $TAOS_CFG
-echo "numOfLogLines      100000000"               >> $TAOS_CFG
-echo "dDebugFlag         135"                     >> $TAOS_CFG
-echo "mDebugFlag         135"                     >> $TAOS_CFG
-echo "sdbDebugFlag       135"                     >> $TAOS_CFG
-echo "rpcDebugFlag       135"                     >> $TAOS_CFG
-echo "tmrDebugFlag       131"                     >> $TAOS_CFG
-echo "cDebugFlag         135"                     >> $TAOS_CFG
-echo "httpDebugFlag      135"                     >> $TAOS_CFG
-echo "monitorDebugFlag   135"                     >> $TAOS_CFG
-echo "udebugFlag         135"                     >> $TAOS_CFG
-echo "tablemetakeeptimer 5"                       >> $TAOS_CFG
-echo "wal                0"                       >> $TAOS_CFG
-echo "asyncLog           0"                       >> $TAOS_CFG
-echo "locale             en_US.UTF-8"             >> $TAOS_CFG
-echo "enableCoreFile     1"                       >> $TAOS_CFG
-echo " "                                          >> $TAOS_CFG  
-
-ulimit -n 600000
-ulimit -c unlimited
-#
-##sudo sysctl -w kernel.core_pattern=$TOP_DIR/core.%p.%e
-#
+#execName=$0
+#execName=`echo ${execName##*/}`
+#goName=`echo ${execName%.*}`
 
 ###### step 3: start build
 cd $script_dir
 rm -f go.*
-go mod init $goName
+go mod init demotest
 go build 
-sleep  1s
-sudo ./$goName
+sleep 1s
+./demotest -h $1 -p $2

tests/pytest/concurrent_inquiry.py

@@ -27,6 +27,7 @@ query_sql = [
 "select count(*) from test.meters where t7 like 'fi%';",
 "select count(*) from test.meters where t7 like '_econd';",
 "select count(*) from test.meters interval(1n) order by ts desc;",
+"select max(c0) from test.meters group by tbname",
 "select first(*)  from test.meters;",
 "select last(*)  from test.meters;",
 "select last_row(*)  from test.meters;",
@@ -56,6 +57,12 @@ query_sql = [
 "select stddev(c6) from test.t1;",
 "select sum(c6) from test.meters;",
 "select top(c6, 2) from test.meters;",
+#all vnode
+"select count(*) from test.meters where t5 >2500 and t5<7500",       
+"select max(c0),avg(c1) from test.meters where t5 >2500 and t5<7500",
+"select sum(c5),avg(c1) from test.meters where t5 >2500 and t5<7500",
+"select max(c0),min(c6) from test.meters where t5 >2500 and t5<7500",
+"select min(c0),avg(c6) from test.meters where t5 >2500 and t5<7500",
 # second supertable
 "select count(*) from test.meters1 where c1 > 50;",
 "select count(*) from test.meters1 where c2 >= 50 and c2 < 100;",
@@ -65,6 +72,7 @@ query_sql = [
 "select count(*) from test.meters1 where t7 like 'fi%';",
 "select count(*) from test.meters1 where t7 like '_econd';",
 "select count(*) from test.meters1 interval(1n) order by ts desc;",
+"select max(c0) from test.meters1 group by tbname",
 "select first(*)  from test.meters1;",
 "select last(*)  from test.meters1;",
 "select last_row(*)  from test.meters1;",
@@ -93,7 +101,19 @@ query_sql = [
 "select spread(c6) from test.m1  ;",
 "select stddev(c6) from test.m1;",
 "select sum(c6) from test.meters1;",
-"select top(c6, 2) from test.meters1;"
+"select top(c6, 2) from test.meters1;",
+"select count(*) from test.meters1 where t5 >2500 and t5<7500",
+#all vnode
+"select count(*) from test.meters1 where t5 >2500 and t5<7500",       
+"select max(c0),avg(c1) from test.meters1 where t5 >2500 and t5<7500",
+"select sum(c5),avg(c1) from test.meters1 where t5 >2500 and t5<7500",
+"select max(c0),min(c6) from test.meters1 where t5 >2500 and t5<7500",
+"select min(c0),avg(c6) from test.meters1 where t5 >2500 and t5<7500",
+#join 
+"select * from meters,meters1 where meters.ts = meters1.ts and meters.t5 = meters1.t5",
+"select * from meters,meters1 where meters.ts = meters1.ts and meters.t7 = meters1.t7",
+"select * from meters,meters1 where meters.ts = meters1.ts and meters.t8 = meters1.t8",
+"select meters.ts,meters1.c2 from meters,meters1 where meters.ts = meters1.ts and meters.t8 = meters1.t8"
 ]
 
 class ConcurrentInquiry:
@@ -112,6 +132,7 @@ class ConcurrentInquiry:
             password,
             )
         cl = conn.cursor()
+        cl.execute("use test;")
         
         print("Thread %d: starting" % threadID)