Merge branch 'develop' into feature/TD-1701

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)
+    cinter.close(conn)

src/mnode/src/mnodeTable.c

@@ -1399,16 +1399,20 @@ int32_t mnodeRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows,
 void mnodeDropAllSuperTables(SDbObj *pDropDb) {
   void *  pIter= NULL;
   int32_t numOfTables = 0;
-  int32_t dbNameLen = strlen(pDropDb->name);
   SSuperTableObj *pTable = NULL;
 
+  char prefix[64] = {0};
+  tstrncpy(prefix, pDropDb->name, 64);
+  strcat(prefix, TS_PATH_DELIMITER);
+  int32_t prefixLen = strlen(prefix);
+
   mInfo("db:%s, all super tables will be dropped from sdb", pDropDb->name);
 
   while (1) {
     pIter = mnodeGetNextSuperTable(pIter, &pTable);
     if (pTable == NULL) break;
 
-    if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) {
+    if (strncmp(prefix, pTable->info.tableId, prefixLen) == 0) {
       SSdbOper oper = {
         .type = SDB_OPER_LOCAL,
         .table = tsSuperTableSdb,

tests/examples/C#/C#checker/C#checker.cs

@@ -0,0 +1,377 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace TDengineDriver
+{
+    class TDengineTest
+    {
+        //connect parameters
+        private string host;
+        private string configDir;
+        private string user;
+        private string password;
+        private short port = 0;
+
+        //sql parameters
+        private string dbName;
+        private string tbName;
+
+
+        private bool isInsertData;
+        private bool isQueryData;
+
+        private long tableCount;
+        private long totalRows;
+        private long batchRows;
+        private long beginTimestamp = 1551369600000L;
+
+        private IntPtr conn = IntPtr.Zero;
+        private long rowsInserted = 0;
+
+        static void Main(string[] args)
+        {
+            TDengineTest tester = new TDengineTest();
+            tester.ReadArgument(args);
+
+
+            tester.InitTDengine();
+            tester.ConnectTDengine();
+            tester.createDatabase();
+            tester.useDatabase();
+            tester.checkDropTable();
+            tester.createTable();
+            tester.checkInsert();
+            tester.checkSelect();
+            tester.checkDropTable();
+
+            tester.CloseConnection();
+
+
+
+        }
+
+        public long GetArgumentAsLong(String[] argv, String argName, int minVal, int maxVal, int defaultValue)
+        {
+            int argc = argv.Length;
+            for (int i = 0; i < argc; ++i)
+            {
+                if (argName != argv[i])
+                {
+                    continue;
+                }
+                if (i < argc - 1)
+                {
+                    String tmp = argv[i + 1];
+                    if (tmp[0] == '-')
+                    {
+                        Console.WriteLine("option {0:G} requires an argument", tmp);
+                        ExitProgram();
+                    }
+
+                    long tmpVal = Convert.ToInt64(tmp);
+                    if (tmpVal < minVal || tmpVal > maxVal)
+                    {
+                        Console.WriteLine("option {0:G} should in range [{1:G}, {2:G}]", argName, minVal, maxVal);
+                        ExitProgram();
+                    }
+
+                    return tmpVal;
+                }
+            }
+
+            return defaultValue;
+        }
+
+        public String GetArgumentAsString(String[] argv, String argName, String defaultValue)
+        {
+            int argc = argv.Length;
+            for (int i = 0; i < argc; ++i)
+            {
+                if (argName != argv[i])
+                {
+                    continue;
+                }
+                if (i < argc - 1)
+                {
+                    String tmp = argv[i + 1];
+                    if (tmp[0] == '-')
+                    {
+                        Console.WriteLine("option {0:G} requires an argument", tmp);
+                        ExitProgram();
+                    }
+                    return tmp;
+                }
+            }
+
+            return defaultValue;
+        }
+
+        public void PrintHelp(String[] argv)
+        {
+            for (int i = 0; i < argv.Length; ++i)
+            {
+                if ("--help" == argv[i])
+                {
+                    String indent = "    ";
+                    Console.WriteLine("taosTest is simple example to operate TDengine use C# Language.\n");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-h");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "TDEngine server IP address to connect");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-u");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "The TDEngine user name to use when connecting to the server, default is root");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-p");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "The TDEngine user name to use when connecting to the server, default is taosdata");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-d");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "Database used to create table or import data, default is db");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-s");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "Super Tables used to create table, default is mt");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-t");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "Table prefixs, default is t");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-w");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "Whether to insert data");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-r");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "Whether to query data");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-n");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "How many Tables to create, default is 10");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-b");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "How many rows per insert batch, default is 10");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-i");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "How many rows to insert, default is 100");
+                    Console.WriteLine("{0:G}{1:G}", indent, "-c");
+                    Console.WriteLine("{0:G}{1:G}{2:G}", indent, indent, "Configuration directory");
+
+                    ExitProgram();
+                }
+            }
+        }
+
+        public void ReadArgument(String[] argv)
+        {
+            PrintHelp(argv);
+            host = this.GetArgumentAsString(argv, "-h", "127.0.0.1");
+            user = this.GetArgumentAsString(argv, "-u", "root");
+            password = this.GetArgumentAsString(argv, "-p", "taosdata");
+            dbName = this.GetArgumentAsString(argv, "-db", "test");
+            tbName = this.GetArgumentAsString(argv, "-s", "weather");
+
+            isInsertData = this.GetArgumentAsLong(argv, "-w", 0, 1, 1) != 0;
+            isQueryData = this.GetArgumentAsLong(argv, "-r", 0, 1, 1) != 0;
+            tableCount = this.GetArgumentAsLong(argv, "-n", 1, 10000, 10);
+            batchRows = this.GetArgumentAsLong(argv, "-b", 1, 1000, 500);
+            totalRows = this.GetArgumentAsLong(argv, "-i", 1, 10000000, 10000);
+            configDir = this.GetArgumentAsString(argv, "-c", "C:/TDengine/cfg");
+        }
+
+        public void InitTDengine()
+        {
+            TDengine.Options((int)TDengineInitOption.TDDB_OPTION_CONFIGDIR, this.configDir);
+            TDengine.Options((int)TDengineInitOption.TDDB_OPTION_SHELL_ACTIVITY_TIMER, "60");
+            TDengine.Init();
+            Console.WriteLine("get connection starting...");
+        }
+
+        public void ConnectTDengine()
+        {
+            string db = "";
+            this.conn = TDengine.Connect(this.host, this.user, this.password, db, this.port);
+            if (this.conn == IntPtr.Zero)
+            {
+                Console.WriteLine("connection failed: " + this.host);
+                ExitProgram();
+            }
+            else
+            {
+                Console.WriteLine("[ OK ] Connection established.");
+            }
+        }
+        public void createDatabase()
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("create database if not exists ").Append(this.dbName);
+            execute(sql.ToString());
+        }
+        public void useDatabase()
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("use ").Append(this.dbName);
+            execute(sql.ToString());
+        }
+        public void checkSelect()
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("select * from test.weather");
+            execute(sql.ToString());
+        }
+        public void createTable()
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("create table if not exists ").Append(this.dbName).Append(".").Append(this.tbName).Append("(ts timestamp, temperature float, humidity int)");
+            execute(sql.ToString());
+        }
+        public void checkInsert()
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("insert into test.weather (ts, temperature, humidity) values(now, 20.5, 34)");
+            execute(sql.ToString());
+        }
+        public void checkDropTable()
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Append("drop table if exists ").Append(this.dbName).Append(".").Append(this.tbName).Append("");
+            execute(sql.ToString());
+        }
+        public void execute(string sql)
+        {
+            DateTime dt1 = DateTime.Now;
+            IntPtr res = TDengine.Query(this.conn, sql.ToString());
+            DateTime dt2 = DateTime.Now;
+            TimeSpan span = dt2 - dt1;
+
+            if (res != IntPtr.Zero)
+            {
+                Console.WriteLine("[OK] time cost: " + span.ToString() + "ms, execute statement ====> " + sql.ToString());
+            }
+            else
+            {
+                Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(res));
+                ExitProgram();
+            }
+            TDengine.FreeResult(res);
+        }
+
+        public void ExecuteQuery(string sql)
+        {
+
+            DateTime dt1 = DateTime.Now;
+            long queryRows = 0;
+            IntPtr res = TDengine.Query(conn, sql);
+            if (res == IntPtr.Zero)
+            {
+                Console.WriteLine(sql + " failure, reason: " + TDengine.Error(res));
+                ExitProgram();
+            }
+            DateTime dt2 = DateTime.Now;
+            TimeSpan span = dt2 - dt1;
+            Console.WriteLine("[OK] time cost: " + span.ToString() + "ms, execute statement ====> " + sql.ToString());
+            int fieldCount = TDengine.FieldCount(res);
+
+            List<TDengineMeta> metas = TDengine.FetchFields(res);
+            for (int j = 0; j < metas.Count; j++)
+            {
+                TDengineMeta meta = (TDengineMeta)metas[j];
+            }
+
+            IntPtr rowdata;
+            StringBuilder builder = new StringBuilder();
+            while ((rowdata = TDengine.FetchRows(res)) != IntPtr.Zero)
+            {
+                queryRows++;
+                for (int fields = 0; fields < fieldCount; ++fields)
+                {
+                    TDengineMeta meta = metas[fields];
+                    int offset = IntPtr.Size * fields;
+                    IntPtr data = Marshal.ReadIntPtr(rowdata, offset);
+
+                    builder.Append("---");
+
+                    if (data == IntPtr.Zero)
+                    {
+                        builder.Append("NULL");
+                        continue;
+                    }
+
+                    switch ((TDengineDataType)meta.type)
+                    {
+                        case TDengineDataType.TSDB_DATA_TYPE_BOOL:
+                            bool v1 = Marshal.ReadByte(data) == 0 ? false : true;
+                            builder.Append(v1);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
+                            byte v2 = Marshal.ReadByte(data);
+                            builder.Append(v2);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
+                            short v3 = Marshal.ReadInt16(data);
+                            builder.Append(v3);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_INT:
+                            int v4 = Marshal.ReadInt32(data);
+                            builder.Append(v4);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
+                            long v5 = Marshal.ReadInt64(data);
+                            builder.Append(v5);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
+                            float v6 = (float)Marshal.PtrToStructure(data, typeof(float));
+                            builder.Append(v6);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
+                            double v7 = (double)Marshal.PtrToStructure(data, typeof(double));
+                            builder.Append(v7);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_BINARY:
+                            string v8 = Marshal.PtrToStringAnsi(data);
+                            builder.Append(v8);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
+                            long v9 = Marshal.ReadInt64(data);
+                            builder.Append(v9);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
+                            string v10 = Marshal.PtrToStringAnsi(data);
+                            builder.Append(v10);
+                            break;
+                    }
+                }
+                builder.Append("---");
+
+                if (queryRows <= 10)
+                {
+                    Console.WriteLine(builder.ToString());
+                }
+                builder.Clear();
+            }
+
+            if (TDengine.ErrorNo(res) != 0)
+            {
+                Console.Write("Query is not complete, Error {0:G}", TDengine.ErrorNo(res), TDengine.Error(res));
+            }
+
+            TDengine.FreeResult(res);
+
+        }
+
+        public void CloseConnection()
+        {
+            if (this.conn != IntPtr.Zero)
+            {
+                TDengine.Close(this.conn);
+                Console.WriteLine("connection closed.");
+            }
+        }
+
+        static void ExitProgram()
+        {
+            TDengine.Cleanup();
+            System.Environment.Exit(0);
+        }
+    }
+}

tests/examples/C#/C#checker/TDengineDriver.cs

@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace TDengineDriver
+{
+  enum TDengineDataType {
+    TSDB_DATA_TYPE_NULL = 0,     // 1 bytes
+    TSDB_DATA_TYPE_BOOL = 1,     // 1 bytes
+    TSDB_DATA_TYPE_TINYINT = 2,  // 1 bytes
+    TSDB_DATA_TYPE_SMALLINT = 3, // 2 bytes
+    TSDB_DATA_TYPE_INT = 4,      // 4 bytes
+    TSDB_DATA_TYPE_BIGINT = 5,   // 8 bytes
+    TSDB_DATA_TYPE_FLOAT = 6,    // 4 bytes
+    TSDB_DATA_TYPE_DOUBLE = 7,   // 8 bytes
+    TSDB_DATA_TYPE_BINARY = 8,   // string
+    TSDB_DATA_TYPE_TIMESTAMP = 9,// 8 bytes
+    TSDB_DATA_TYPE_NCHAR = 10    // unicode string
+  }
+
+  enum TDengineInitOption
+  {
+    TSDB_OPTION_LOCALE = 0,
+    TSDB_OPTION_CHARSET = 1,
+    TSDB_OPTION_TIMEZONE = 2,
+    TDDB_OPTION_CONFIGDIR = 3,
+    TDDB_OPTION_SHELL_ACTIVITY_TIMER = 4
+  }
+
+  class TDengineMeta
+  {
+    public string name;
+    public short size;
+    public byte type;
+    public string TypeName()
+    {
+      switch ((TDengineDataType)type)
+      {
+        case TDengineDataType.TSDB_DATA_TYPE_BOOL:
+          return "BOOLEAN";
+        case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
+          return "BYTE";
+        case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
+          return "SHORT";
+        case TDengineDataType.TSDB_DATA_TYPE_INT:
+          return "INT";
+        case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
+          return "LONG";
+        case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
+          return "FLOAT";
+        case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
+          return "DOUBLE";
+        case TDengineDataType.TSDB_DATA_TYPE_BINARY:
+          return "STRING";
+        case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
+          return "TIMESTAMP";
+        case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
+          return "NCHAR";
+        default:
+          return "undefine";
+      }
+    }
+  }
+
+  class TDengine
+  {
+    public const int TSDB_CODE_SUCCESS = 0;
+
+    [DllImport("taos.dll", EntryPoint = "taos_init", CallingConvention = CallingConvention.Cdecl)]
+    static extern public void Init();
+
+    [DllImport("taos.dll", EntryPoint = "taos_cleanup", CallingConvention = CallingConvention.Cdecl)]
+    static extern public void Cleanup();
+
+    [DllImport("taos.dll", EntryPoint = "taos_options", CallingConvention = CallingConvention.Cdecl)]
+    static extern public void Options(int option, string value);
+
+    [DllImport("taos.dll", EntryPoint = "taos_connect", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr Connect(string ip, string user, string password, string db, short port);
+
+    [DllImport("taos.dll", EntryPoint = "taos_errstr", CallingConvention = CallingConvention.Cdecl)]
+    static extern private IntPtr taos_errstr(IntPtr res);
+    static public string Error(IntPtr res)
+    {
+      IntPtr errPtr = taos_errstr(res);
+      return Marshal.PtrToStringAnsi(errPtr);
+    }
+
+    [DllImport("taos.dll", EntryPoint = "taos_errno", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int ErrorNo(IntPtr res);
+
+    [DllImport("taos.dll", EntryPoint = "taos_query", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr Query(IntPtr conn, string sqlstr);
+
+    [DllImport("taos.dll", EntryPoint = "taos_affected_rows", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int AffectRows(IntPtr res);
+
+    [DllImport("taos.dll", EntryPoint = "taos_field_count", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int FieldCount(IntPtr res);
+
+    [DllImport("taos.dll", EntryPoint = "taos_fetch_fields", CallingConvention = CallingConvention.Cdecl)]
+    static extern private IntPtr taos_fetch_fields(IntPtr res);
+    static public List<TDengineMeta> FetchFields(IntPtr res)
+    {
+      const int fieldSize = 68;
+
+      List<TDengineMeta> metas = new List<TDengineMeta>();
+      if (res == IntPtr.Zero)
+      {
+        return metas;
+      }
+
+      int fieldCount = FieldCount(res);
+      IntPtr fieldsPtr = taos_fetch_fields(res);
+  
+      for (int i = 0; i < fieldCount; ++i)
+      {
+        int offset = i * fieldSize;
+        
+        TDengineMeta meta = new TDengineMeta();
+        meta.name = Marshal.PtrToStringAnsi(fieldsPtr + offset);
+        meta.type = Marshal.ReadByte(fieldsPtr + offset + 65);
+        meta.size = Marshal.ReadInt16(fieldsPtr + offset + 66);
+        metas.Add(meta);
+      }
+
+      return metas;
+    }
+
+    [DllImport("taos.dll", EntryPoint = "taos_fetch_row", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr FetchRows(IntPtr res);
+
+    [DllImport("taos.dll", EntryPoint = "taos_free_result", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr FreeResult(IntPtr res);
+
+    [DllImport("taos.dll", EntryPoint = "taos_close", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int Close(IntPtr taos);
+  }
+}

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

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

tests/examples/python/PYTHONConnectorChecker/PythonChecker.py

@@ -0,0 +1,114 @@
+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

@@ -0,0 +1,17 @@
+@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

@@ -1,5 +1,18 @@
 #!/bin/bash
 
-bash ./case001/case001.sh
+echo "==== start Go connector test cases test ===="
-#bash ./case002/case002.sh
+
-#bash ./case003/case003.sh
+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

@@ -0,0 +1,9 @@
+@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

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-##################################################
+echo "==== start run cases001.go"
-# 
-# Do go test 
-#
-##################################################
 
 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=$0
-execName=`echo ${execName##*/}`
+#execName=`echo ${execName##*/}`
-goName=`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
-#
 
 ###### step 3: start build
 cd $script_dir
 rm -f go.*
-go mod init $goName
+go mod init demotest
 go build 
-sleep  1s
+sleep 1s
-sudo ./$goName
+./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)