Merge branch 'develop' into hotfix/sangshuduo/TD-2984-combine-taosdemo-and-taosdemox

documentation20/cn/04.model/docs.md

@@ -43,7 +43,7 @@ CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAG
 ## <a class="anchor" id="create-table"></a>创建表
 
 TDengine对每个数据采集点需要独立建表。与标准的关系型数据一样，一张表有表名，Schema，但除此之外，还可以带有一到多个标签。创建时，需要使用超级表做模板，同时指定标签的具体值。以表一中的智能电表为例，可以使用如下的SQL命令建表：
-```cmd
+```mysql
 CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);
 ```
 其中d1001是表名，meters是超级表的表名，后面紧跟标签Location的具体标签值”Beijing.Chaoyang"，标签groupId的具体标签值2。虽然在创建表时，需要指定标签值，但可以事后修改。详细细则请见 [TAOS SQL 的表管理](https://www.taosdata.com/cn/documentation/taos-sql#table) 章节。
@@ -54,10 +54,12 @@ TDengine建议将数据采集点的全局唯一ID作为表名(比如设备序列
 
 **自动建表**：在某些特殊场景中，用户在写数据时并不确定某个数据采集点的表是否存在，此时可在写入数据时使用自动建表语法来创建不存在的表，若该表已存在则不会建立新表。比如：
 
-```cmd
+```mysql
 INSERT INTO d1001 USING METERS TAGS ("Beijng.Chaoyang", 2) VALUES (now, 10.2, 219, 0.32);
 ```
-上述SQL语句将记录(now, 10.2, 219, 0.32) 插入进表d1001。如果表d1001还未创建，则使用超级表meters做模板自动创建，同时打上标签值“Beijing.Chaoyang", 2。  
+上述SQL语句将记录 (now, 10.2, 219, 0.32) 插入表d1001。如果表d1001还未创建，则使用超级表meters做模板自动创建，同时打上标签值“Beijing.Chaoyang", 2。  
+
+关于自动建表的详细语法请参见 [插入记录时自动建表](https://www.taosdata.com/cn/documentation/taos-sql#auto_create_table) 章节。
 
 ## 多列模型 vs 单列模型
 

documentation20/cn/12.taos-sql/docs.md

@@ -152,6 +152,14 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
     ```
     以指定的超级表为模板，指定 tags 的值来创建数据表。
 
+- **以超级表为模板创建数据表，并指定具体的 tags 列**
+
+    ```mysql
+    CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...);
+    ```
+    以指定的超级表为模板，指定一部分 tags 列的值来创建数据表。（没被指定的 tags 列会设为空值。）  
+    说明：从 2.0.17 版本开始支持这种方式。在之前的版本中，不允许指定 tags 列，而必须显式给出所有 tags 列的取值。
+
 - **批量创建数据表**
 
     ```mysql
@@ -306,7 +314,7 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
 
 - **插入一条记录，数据对应到指定的列**
     ```mysql
-    INSERT INTO tb_name (field1_name, ...) VALUES (field1_value, ...)
+    INSERT INTO tb_name (field1_name, ...) VALUES (field1_value1, ...);
     ```
     向表tb_name中插入一条记录，数据对应到指定的列。SQL语句中没有出现的列，数据库将自动填充为NULL。主键（时间戳）不能为NULL。
 
@@ -340,25 +348,19 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
     1) 如果时间戳为0，系统将自动使用服务器当前时间作为该记录的时间戳；
     2) 允许插入的最老记录的时间戳，是相对于当前服务器时间，减去配置的keep值（数据保留的天数），允许插入的最新记录的时间戳，是相对于当前服务器时间，加上配置的days值（数据文件存储数据的时间跨度，单位为天）。keep和days都是可以在创建数据库时指定的，缺省值分别是3650天和10天。
 
-**历史记录写入**：可使用IMPORT或者INSERT命令，IMPORT的语法，功能与INSERT完全一样。
-
-## <a class="anchor" id="select"></a>数据查询
+- <a class="anchor" id="auto_create_table"></a>**插入记录时自动建表**
+    ```mysql
+    INSERT INTO tb_name USING stb_name TAGS (tag_value1, ...) VALUES (field_value1, ...);
+    ```
+    如果用户在写数据时并不确定某个表是否存在，此时可以在写入数据时使用自动建表语法来创建不存在的表，若该表已存在则不会建立新表。自动建表时，要求必须以超级表为模板，并写明数据表的 tags 取值。
 
-### 查询语法：
+- **插入记录时自动建表，并指定具体的 tags 列**
+    ```mysql
+    INSERT INTO tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...) VALUES (field_value1, ...);
+    ```
+    在自动建表时，可以只是指定部分 tags 列的取值，未被指定的 tags 列将取为空值。
 
-```mysql
-SELECT select_expr [, select_expr ...]
-    FROM {tb_name_list}
-    [WHERE where_condition]
-    [INTERVAL (interval_val [, interval_offset])]
-    [FILL fill_val]
-    [SLIDING fill_val]
-    [GROUP BY col_list]
-    [ORDER BY col_list { DESC | ASC }]
-    [SLIMIT limit_val [, SOFFSET offset_val]]
-    [LIMIT limit_val [, OFFSET offset_val]]
-    [>> export_file]
-```
+**历史记录写入**：可使用IMPORT或者INSERT命令，IMPORT的语法，功能与INSERT完全一样。
 
 说明：针对 insert 类型的 SQL 语句，我们采用的流式解析策略，在发现后面的错误之前，前面正确的部分SQL仍会执行。下面的sql中，insert语句是无效的，但是d1001仍会被创建。
 
@@ -386,6 +388,24 @@ taos> SHOW TABLES;
 Query OK, 1 row(s) in set (0.001091s)
 ```
 
+## <a class="anchor" id="select"></a>数据查询
+
+### 查询语法：
+
+```mysql
+SELECT select_expr [, select_expr ...]
+    FROM {tb_name_list}
+    [WHERE where_condition]
+    [INTERVAL (interval_val [, interval_offset])]
+    [FILL fill_val]
+    [SLIDING fill_val]
+    [GROUP BY col_list]
+    [ORDER BY col_list { DESC | ASC }]
+    [SLIMIT limit_val [, SOFFSET offset_val]]
+    [LIMIT limit_val [, OFFSET offset_val]]
+    [>> export_file];
+```
+
 #### SELECT子句
 
 一个选择子句可以是联合查询（UNION）和另一个查询的子查询（SUBQUERY）。

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

@@ -67,13 +67,13 @@ def _crow_tinyint_unsigned_to_python(
         return [
             None if ele == FieldType.C_TINYINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_byte))[
+                    ctypes.c_ubyte))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_TINYINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_byte))[
+                    ctypes.c_ubyte))[
                 :abs(num_of_rows)]]
 
 
@@ -102,13 +102,13 @@ def _crow_smallint_unsigned_to_python(
         return [
             None if ele == FieldType.C_SMALLINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_short))[
+                    ctypes.c_ushort))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_SMALLINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_short))[
+                    ctypes.c_ushort))[
                 :abs(num_of_rows)]]
 
 
@@ -130,13 +130,13 @@ def _crow_int_unsigned_to_python(data, num_of_rows, nbytes=None, micro=False):
         return [
             None if ele == FieldType.C_INT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_int))[
+                    ctypes.c_uint))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_INT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_int))[
+                    ctypes.c_uint))[
                 :abs(num_of_rows)]]
 
 
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_long))[
+                    ctypes.c_ulong))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_long))[
+                    ctypes.c_ulong))[
                 :abs(num_of_rows)]]
 
 

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

@@ -19,10 +19,10 @@ class FieldType(object):
     C_BINARY = 8
     C_TIMESTAMP = 9
     C_NCHAR = 10
-    C_TINYINT_UNSIGNED = 12
-    C_SMALLINT_UNSIGNED = 13
-    C_INT_UNSIGNED = 14
-    C_BIGINT_UNSIGNED = 15
+    C_TINYINT_UNSIGNED = 11
+    C_SMALLINT_UNSIGNED = 12
+    C_INT_UNSIGNED = 13
+    C_BIGINT_UNSIGNED = 14
     # NULL value definition
     # NOTE: These values should change according to C definition in tsdb.h
     C_BOOL_NULL = 0x02

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

@@ -67,13 +67,13 @@ def _crow_tinyint_unsigned_to_python(
         return [
             None if ele == FieldType.C_TINYINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_byte))[
+                    ctypes.c_ubyte))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_TINYINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_byte))[
+                    ctypes.c_ubyte))[
                 :abs(num_of_rows)]]
 
 
@@ -102,13 +102,13 @@ def _crow_smallint_unsigned_to_python(
         return [
             None if ele == FieldType.C_SMALLINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_short))[
+                    ctypes.c_ushort))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_SMALLINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_short))[
+                    ctypes.c_ushort))[
                 :abs(num_of_rows)]]
 
 
@@ -130,13 +130,13 @@ def _crow_int_unsigned_to_python(data, num_of_rows, nbytes=None, micro=False):
         return [
             None if ele == FieldType.C_INT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_int))[
+                    ctypes.c_uint))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_INT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_int))[
+                    ctypes.c_uint))[
                 :abs(num_of_rows)]]
 
 
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_long))[
+                    ctypes.c_ulong))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_long))[
+                    ctypes.c_ulong))[
                 :abs(num_of_rows)]]
 
 

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

@@ -19,10 +19,10 @@ class FieldType(object):
     C_BINARY = 8
     C_TIMESTAMP = 9
     C_NCHAR = 10
-    C_TINYINT_UNSIGNED = 12
-    C_SMALLINT_UNSIGNED = 13
-    C_INT_UNSIGNED = 14
-    C_BIGINT_UNSIGNED = 15
+    C_TINYINT_UNSIGNED = 11
+    C_SMALLINT_UNSIGNED = 12
+    C_INT_UNSIGNED = 13
+    C_BIGINT_UNSIGNED = 14
     # NULL value definition
     # NOTE: These values should change according to C definition in tsdb.h
     C_BOOL_NULL = 0x02

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

@@ -67,13 +67,13 @@ def _crow_tinyint_unsigned_to_python(
         return [
             None if ele == FieldType.C_TINYINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_byte))[
+                    ctypes.c_ubyte))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_TINYINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_byte))[
+                    ctypes.c_ubyte))[
                 :abs(num_of_rows)]]
 
 
@@ -102,13 +102,13 @@ def _crow_smallint_unsigned_to_python(
         return [
             None if ele == FieldType.C_SMALLINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_short))[
+                    ctypes.c_ushort))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_SMALLINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_short))[
+                    ctypes.c_ushort))[
                 :abs(num_of_rows)]]
 
 
@@ -130,13 +130,13 @@ def _crow_int_unsigned_to_python(data, num_of_rows, nbytes=None, micro=False):
         return [
             None if ele == FieldType.C_INT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_int))[
+                    ctypes.c_uint))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_INT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_int))[
+                    ctypes.c_uint))[
                 :abs(num_of_rows)]]
 
 
@@ -162,13 +162,13 @@ def _crow_bigint_unsigned_to_python(
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_long))[
+                    ctypes.c_ulong))[
                 :abs(num_of_rows)]]
     else:
         return [
             None if ele == FieldType.C_BIGINT_UNSIGNED_NULL else ele for ele in ctypes.cast(
                 data, ctypes.POINTER(
-                    ctypes.c_long))[
+                    ctypes.c_ulong))[
                 :abs(num_of_rows)]]
 
 

src/connector/python/osx/python3/taos/constants.py

@@ -19,10 +19,10 @@ class FieldType(object):
     C_BINARY = 8
     C_TIMESTAMP = 9
     C_NCHAR = 10
-    C_TINYINT_UNSIGNED = 12
-    C_SMALLINT_UNSIGNED = 13
-    C_INT_UNSIGNED = 14
-    C_BIGINT_UNSIGNED = 15
+    C_TINYINT_UNSIGNED = 11
+    C_SMALLINT_UNSIGNED = 12
+    C_INT_UNSIGNED = 13
+    C_BIGINT_UNSIGNED = 14
     # NULL value definition
     # NOTE: These values should change according to C definition in tsdb.h
     C_BOOL_NULL = 0x02

src/connector/python/windows/python2/taos/__init__.py

@@ -8,6 +8,7 @@ paramstyle = 'pyformat'
 
 __all__ = ['connection', 'cursor']
 
+
 def connect(*args, **kwargs):
     """ Function to return a TDengine connector object
 

src/connector/python/windows/python2/taos/connection.py

@@ -2,9 +2,11 @@ from .cursor import TDengineCursor
 from .subscription import TDengineSubscription
 from .cinterface import CTaosInterface
 
+
 class TDengineConnection(object):
     """ TDengine connection object
     """
+
     def __init__(self, *args, **kwargs):
         self._conn = None
         self._host = None
@@ -44,7 +46,12 @@ class TDengineConnection(object):
             self._config = kwargs['config']
 
         self._chandle = CTaosInterface(self._config)
-        self._conn = self._chandle.connect(self._host, self._user, self._password, self._database, self._port)
+        self._conn = self._chandle.connect(
+            self._host,
+            self._user,
+            self._password,
+            self._database,
+            self._port)
 
     def close(self):
         """Close current connection.
@@ -56,7 +63,8 @@ class TDengineConnection(object):
         """
         if self._conn is None:
             return None
-        sub = CTaosInterface.subscribe(self._conn, restart, topic, sql, interval)
+        sub = CTaosInterface.subscribe(
+            self._conn, restart, topic, sql, interval)
         return TDengineSubscription(sub)
 
     def cursor(self):
@@ -81,6 +89,7 @@ class TDengineConnection(object):
         """
         pass
 
+
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
     conn.close()

src/connector/python/windows/python2/taos/constants.py

@@ -3,6 +3,7 @@
 
 from .dbapi import *
 
+
 class FieldType(object):
     """TDengine Field Types
     """
@@ -18,13 +19,21 @@ class FieldType(object):
     C_BINARY = 8
     C_TIMESTAMP = 9
     C_NCHAR = 10
+    C_TINYINT_UNSIGNED = 11
+    C_SMALLINT_UNSIGNED = 12
+    C_INT_UNSIGNED = 13
+    C_BIGINT_UNSIGNED = 14
     # NULL value definition
     # NOTE: These values should change according to C definition in tsdb.h
     C_BOOL_NULL = 0x02
     C_TINYINT_NULL = -128
+    C_TINYINT_UNSIGNED_NULL = 255
     C_SMALLINT_NULL = -32768
+    C_SMALLINT_UNSIGNED_NULL = 65535
     C_INT_NULL = -2147483648
+    C_INT_UNSIGNED_NULL = 4294967295
     C_BIGINT_NULL = -9223372036854775808
+    C_BIGINT_UNSIGNED_NULL = 18446744073709551615
     C_FLOAT_NULL = float('nan')
     C_DOUBLE_NULL = float('nan')
     C_BINARY_NULL = bytearray([int('0xff', 16)])

src/connector/python/windows/python2/taos/cursor.py

@@ -5,6 +5,7 @@ import threading
 
 # querySeqNum = 0
 
+
 class TDengineCursor(object):
     """Database cursor which is used to manage the context of a fetch operation.
 
@@ -50,7 +51,8 @@ class TDengineCursor(object):
             raise OperationalError("Invalid use of fetch iterator")
 
         if self._block_rows <= self._block_iter:
-            block, self._block_rows = CTaosInterface.fetchRow(self._result, self._fields)
+            block, self._block_rows = CTaosInterface.fetchRow(
+                self._result, self._fields)
             if self._block_rows == 0:
                 raise StopIteration
             self._block = list(map(tuple, zip(*block)))
@@ -117,8 +119,9 @@ class TDengineCursor(object):
         errno = CTaosInterface.libtaos.taos_errno(self._result)
         if errno == 0:
             if CTaosInterface.fieldsCount(self._result) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._result)
-                return CTaosInterface.affectedRows(self._result )
+                self._affected_rows += CTaosInterface.affectedRows(
+                    self._result)
+                return CTaosInterface.affectedRows(self._result)
             else:
                 self._fields = CTaosInterface.useResult(self._result)
                 return self._handle_result()
@@ -147,10 +150,13 @@ class TDengineCursor(object):
         buffer = [[] for i in range(len(self._fields))]
         self._rowcount = 0
         while True:
-            block, num_of_fields = CTaosInterface.fetchRow(self._result, self._fields)
+            block, num_of_fields = CTaosInterface.fetchRow(
+                self._result, self._fields)
             errno = CTaosInterface.libtaos.taos_errno(self._result)
             if errno != 0:
-                raise ProgrammingError(CTaosInterface.errStr(self._result), errno)
+                raise ProgrammingError(
+                    CTaosInterface.errStr(
+                        self._result), errno)
             if num_of_fields == 0:
                 break
             self._rowcount += num_of_fields
@@ -165,20 +171,21 @@ class TDengineCursor(object):
         buffer = [[] for i in range(len(self._fields))]
         self._rowcount = 0
         while True:
-            block, num_of_fields = CTaosInterface.fetchBlock(self._result, self._fields)
+            block, num_of_fields = CTaosInterface.fetchBlock(
+                self._result, self._fields)
             errno = CTaosInterface.libtaos.taos_errno(self._result)
             if errno != 0:
-                raise ProgrammingError(CTaosInterface.errStr(self._result), errno)
-            if num_of_fields == 0: break
+                raise ProgrammingError(
+                    CTaosInterface.errStr(
+                        self._result), errno)
+            if num_of_fields == 0:
+                break
             self._rowcount += num_of_fields
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
 
-        
         return list(map(tuple, zip(*buffer)))
 
-
-
     def nextset(self):
         """
         """
@@ -209,6 +216,7 @@ class TDengineCursor(object):
         """
         self._description = []
         for ele in self._fields:
-            self._description.append((ele['name'], ele['type'], None, None, None, None, False))
+            self._description.append(
+                (ele['name'], ele['type'], None, None, None, None, False))
 
         return self._result

src/connector/python/windows/python2/taos/dbapi.py

@@ -4,6 +4,7 @@
 import time
 import datetime
 
+
 class DBAPITypeObject(object):
     def __init__(self, *values):
         self.values = values
@@ -16,19 +17,24 @@ class DBAPITypeObject(object):
         else:
             return -1
 
+
 Date = datetime.date
 Time = datetime.time
 Timestamp = datetime.datetime
 
+
 def DataFromTicks(ticks):
     return Date(*time.localtime(ticks)[:3])
 
+
 def TimeFromTicks(ticks):
     return Time(*time.localtime(ticks)[3:6])
 
+
 def TimestampFromTicks(ticks):
     return Timestamp(*time.localtime(ticks)[:6])
 
+
 Binary = bytes
 
 # STRING = DBAPITypeObject(*constants.FieldType.get_string_types())

src/connector/python/windows/python2/taos/error.py

 """Python exceptions
 """
 
+
 class Error(Exception):
     def __init__(self, msg=None, errno=None):
         self.msg = msg
@@ -10,26 +11,31 @@ class Error(Exception):
     def __str__(self):
         return self._full_msg
 
+
 class Warning(Exception):
     """Exception raised for important warnings like data truncations while inserting.
     """
     pass
 
+
 class InterfaceError(Error):
     """Exception raised for errors that are related to the database interface rather than the database itself.
     """
     pass
 
+
 class DatabaseError(Error):
     """Exception raised for errors that are related to the database.
     """
     pass
 
+
 class DataError(DatabaseError):
     """Exception raised for errors that are due to problems with the processed data like division by zero, numeric value out of range.
     """
     pass
 
+
 class OperationalError(DatabaseError):
     """Exception raised for errors that are related to the database's operation and not necessarily under the control of the programmer
     """
@@ -41,16 +47,19 @@ class IntegrityError(DatabaseError):
     """
     pass
 
+
 class InternalError(DatabaseError):
     """Exception raised when the database encounters an internal error.
     """
     pass
 
+
 class ProgrammingError(DatabaseError):
     """Exception raised for programming errors.
     """
     pass
 
+
 class NotSupportedError(DatabaseError):
     """Exception raised in case a method or database API was used which is not supported by the database,.
     """

src/connector/python/windows/python2/taos/subscription.py

 from .cinterface import CTaosInterface
 from .error import *
 
+
 class TDengineSubscription(object):
     """TDengine subscription object
     """
+
     def __init__(self, sub):
         self._sub = sub
 
-
     def consume(self):
         """Consume rows of a subscription
         """
@@ -18,15 +19,15 @@ class TDengineSubscription(object):
         buffer = [[] for i in range(len(fields))]
         while True:
             block, num_of_fields = CTaosInterface.fetchBlock(result, fields)
-            if num_of_fields == 0: break
+            if num_of_fields == 0:
+                break
             for i in range(len(fields)):
                 buffer[i].extend(block[i])
 
         self.fields = fields
         return list(map(tuple, zip(*buffer)))
 
-
-    def close(self, keepProgress = True):
+    def close(self, keepProgress=True):
         """Close the Subscription.
         """
         if self._sub is None:
@@ -38,12 +39,16 @@ class TDengineSubscription(object):
 
 if __name__ == '__main__':
     from .connection import TDengineConnection
-    conn = TDengineConnection(host="127.0.0.1", user="root", password="taosdata", database="test")
+    conn = TDengineConnection(
+        host="127.0.0.1",
+        user="root",
+        password="taosdata",
+        database="test")
 
     # Generate a cursor object to run SQL commands
     sub = conn.subscribe(True, "test", "select * from meters;", 1000)
 
-    for i in range(0,10):
+    for i in range(0, 10):
         data = sub.consume()
         for d in data:
             print(d)

src/connector/python/windows/python3/taos/__init__.py

@@ -8,6 +8,7 @@ paramstyle = 'pyformat'
 
 __all__ = ['connection', 'cursor']
 
+
 def connect(*args, **kwargs):
     """ Function to return a TDengine connector object
 

src/connector/python/windows/python3/taos/connection.py

@@ -2,9 +2,11 @@ from .cursor import TDengineCursor
 from .subscription import TDengineSubscription
 from .cinterface import CTaosInterface
 
+
 class TDengineConnection(object):
     """ TDengine connection object
     """
+
     def __init__(self, *args, **kwargs):
         self._conn = None
         self._host = None
@@ -44,7 +46,12 @@ class TDengineConnection(object):
             self._config = kwargs['config']
 
         self._chandle = CTaosInterface(self._config)
-        self._conn = self._chandle.connect(self._host, self._user, self._password, self._database, self._port)
+        self._conn = self._chandle.connect(
+            self._host,
+            self._user,
+            self._password,
+            self._database,
+            self._port)
 
     def close(self):
         """Close current connection.
@@ -56,7 +63,8 @@ class TDengineConnection(object):
         """
         if self._conn is None:
             return None
-        sub = CTaosInterface.subscribe(self._conn, restart, topic, sql, interval)
+        sub = CTaosInterface.subscribe(
+            self._conn, restart, topic, sql, interval)
         return TDengineSubscription(sub)
 
     def cursor(self):
@@ -81,6 +89,7 @@ class TDengineConnection(object):
         """
         pass
 
+
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
     conn.close()

src/connector/python/windows/python3/taos/constants.py

@@ -3,6 +3,7 @@
 
 from .dbapi import *
 
+
 class FieldType(object):
     """TDengine Field Types
     """
@@ -18,13 +19,21 @@ class FieldType(object):
     C_BINARY = 8
     C_TIMESTAMP = 9
     C_NCHAR = 10
+    C_TINYINT_UNSIGNED = 11
+    C_SMALLINT_UNSIGNED = 12
+    C_INT_UNSIGNED = 13
+    C_BIGINT_UNSIGNED = 14
     # NULL value definition
     # NOTE: These values should change according to C definition in tsdb.h
     C_BOOL_NULL = 0x02
     C_TINYINT_NULL = -128
+    C_TINYINT_UNSIGNED_NULL = 255
     C_SMALLINT_NULL = -32768
+    C_SMALLINT_UNSIGNED_NULL = 65535
     C_INT_NULL = -2147483648
+    C_INT_UNSIGNED_NULL = 4294967295
     C_BIGINT_NULL = -9223372036854775808
+    C_BIGINT_UNSIGNED_NULL = 18446744073709551615
     C_FLOAT_NULL = float('nan')
     C_DOUBLE_NULL = float('nan')
     C_BINARY_NULL = bytearray([int('0xff', 16)])

src/connector/python/windows/python3/taos/cursor.py

@@ -51,7 +51,8 @@ class TDengineCursor(object):
             raise OperationalError("Invalid use of fetch iterator")
 
         if self._block_rows <= self._block_iter:
-            block, self._block_rows = CTaosInterface.fetchRow(self._result, self._fields)
+            block, self._block_rows = CTaosInterface.fetchRow(
+                self._result, self._fields)
             if self._block_rows == 0:
                 raise StopIteration
             self._block = list(map(tuple, zip(*block)))
@@ -118,13 +119,14 @@ class TDengineCursor(object):
         errno = CTaosInterface.libtaos.taos_errno(self._result)
         if errno == 0:
             if CTaosInterface.fieldsCount(self._result) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._result )
-                return CTaosInterface.affectedRows(self._result )
+                self._affected_rows += CTaosInterface.affectedRows(
+                    self._result)
+                return CTaosInterface.affectedRows(self._result)
             else:
-                self._fields = CTaosInterface.useResult(self._result )
+                self._fields = CTaosInterface.useResult(self._result)
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._result ), errno)
+            raise ProgrammingError(CTaosInterface.errStr(self._result), errno)
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
@@ -148,10 +150,13 @@ class TDengineCursor(object):
         buffer = [[] for i in range(len(self._fields))]
         self._rowcount = 0
         while True:
-            block, num_of_fields = CTaosInterface.fetchRow(self._result, self._fields)
+            block, num_of_fields = CTaosInterface.fetchRow(
+                self._result, self._fields)
             errno = CTaosInterface.libtaos.taos_errno(self._result)
             if errno != 0:
-                raise ProgrammingError(CTaosInterface.errStr(self._result), errno)
+                raise ProgrammingError(
+                    CTaosInterface.errStr(
+                        self._result), errno)
             if num_of_fields == 0:
                 break
             self._rowcount += num_of_fields
@@ -166,20 +171,21 @@ class TDengineCursor(object):
         buffer = [[] for i in range(len(self._fields))]
         self._rowcount = 0
         while True:
-            block, num_of_fields = CTaosInterface.fetchBlock(self._result, self._fields)
+            block, num_of_fields = CTaosInterface.fetchBlock(
+                self._result, self._fields)
             errno = CTaosInterface.libtaos.taos_errno(self._result)
             if errno != 0:
-                raise ProgrammingError(CTaosInterface.errStr(self._result), errno)
-            if num_of_fields == 0: break
+                raise ProgrammingError(
+                    CTaosInterface.errStr(
+                        self._result), errno)
+            if num_of_fields == 0:
+                break
             self._rowcount += num_of_fields
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
 
-        
         return list(map(tuple, zip(*buffer)))
 
-
-
     def nextset(self):
         """
         """
@@ -210,6 +216,7 @@ class TDengineCursor(object):
         """
         self._description = []
         for ele in self._fields:
-            self._description.append((ele['name'], ele['type'], None, None, None, None, False))
+            self._description.append(
+                (ele['name'], ele['type'], None, None, None, None, False))
 
         return self._result

src/connector/python/windows/python3/taos/dbapi.py

@@ -4,6 +4,7 @@
 import time
 import datetime
 
+
 class DBAPITypeObject(object):
     def __init__(self, *values):
         self.values = values
@@ -16,19 +17,24 @@ class DBAPITypeObject(object):
         else:
             return -1
 
+
 Date = datetime.date
 Time = datetime.time
 Timestamp = datetime.datetime
 
+
 def DataFromTicks(ticks):
     return Date(*time.localtime(ticks)[:3])
 
+
 def TimeFromTicks(ticks):
     return Time(*time.localtime(ticks)[3:6])
 
+
 def TimestampFromTicks(ticks):
     return Timestamp(*time.localtime(ticks)[:6])
 
+
 Binary = bytes
 
 # STRING = DBAPITypeObject(*constants.FieldType.get_string_types())

src/connector/python/windows/python3/taos/error.py

 """Python exceptions
 """
 
+
 class Error(Exception):
     def __init__(self, msg=None, errno=None):
         self.msg = msg
@@ -10,26 +11,31 @@ class Error(Exception):
     def __str__(self):
         return self._full_msg
 
+
 class Warning(Exception):
     """Exception raised for important warnings like data truncations while inserting.
     """
     pass
 
+
 class InterfaceError(Error):
     """Exception raised for errors that are related to the database interface rather than the database itself.
     """
     pass
 
+
 class DatabaseError(Error):
     """Exception raised for errors that are related to the database.
     """
     pass
 
+
 class DataError(DatabaseError):
     """Exception raised for errors that are due to problems with the processed data like division by zero, numeric value out of range.
     """
     pass
 
+
 class OperationalError(DatabaseError):
     """Exception raised for errors that are related to the database's operation and not necessarily under the control of the programmer
     """
@@ -41,16 +47,19 @@ class IntegrityError(DatabaseError):
     """
     pass
 
+
 class InternalError(DatabaseError):
     """Exception raised when the database encounters an internal error.
     """
     pass
 
+
 class ProgrammingError(DatabaseError):
     """Exception raised for programming errors.
     """
     pass
 
+
 class NotSupportedError(DatabaseError):
     """Exception raised in case a method or database API was used which is not supported by the database,.
     """

src/connector/python/windows/python3/taos/subscription.py

 from .cinterface import CTaosInterface
 from .error import *
 
+
 class TDengineSubscription(object):
     """TDengine subscription object
     """
+
     def __init__(self, sub):
         self._sub = sub
 
-
     def consume(self):
         """Consume rows of a subscription
         """
@@ -18,15 +19,15 @@ class TDengineSubscription(object):
         buffer = [[] for i in range(len(fields))]
         while True:
             block, num_of_fields = CTaosInterface.fetchBlock(result, fields)
-            if num_of_fields == 0: break
+            if num_of_fields == 0:
+                break
             for i in range(len(fields)):
                 buffer[i].extend(block[i])
 
         self.fields = fields
         return list(map(tuple, zip(*buffer)))
 
-
-    def close(self, keepProgress = True):
+    def close(self, keepProgress=True):
         """Close the Subscription.
         """
         if self._sub is None:
@@ -38,12 +39,16 @@ class TDengineSubscription(object):
 
 if __name__ == '__main__':
     from .connection import TDengineConnection
-    conn = TDengineConnection(host="127.0.0.1", user="root", password="taosdata", database="test")
+    conn = TDengineConnection(
+        host="127.0.0.1",
+        user="root",
+        password="taosdata",
+        database="test")
 
     # Generate a cursor object to run SQL commands
     sub = conn.subscribe(True, "test", "select * from meters;", 1000)
 
-    for i in range(0,10):
+    for i in range(0, 10):
         data = sub.consume()
         for d in data:
             print(d)

tests/pytest/insert/basic_unsigned.py

@@ -26,7 +26,7 @@ class TDTestCase:
         tdSql.prepare()
 
         ret = tdSql.execute(
-            'create table tb (ts timestamp, speed int unsigned)')
+            'create table tb (ts timestamp, speed tinyint unsigned)')
 
         insertRows = 10
         tdLog.info("insert %d rows" % (insertRows))
@@ -38,11 +38,11 @@ class TDTestCase:
         tdLog.info("insert earlier data")
         tdSql.execute('insert into tb values (now - 5m , 10)')
         tdSql.execute('insert into tb values (now - 6m , 10)')
-        tdSql.execute('insert into tb values (now - 7m , 10)')
-        tdSql.execute('insert into tb values (now - 8m , 4294967294)')
+        tdSql.execute('insert into tb values (now - 7m , NULL)')
+        tdSql.execute('insert into tb values (now - 8m , 254)')
 
         tdSql.error('insert into tb values (now - 9m, -1)')
-        tdSql.error('insert into tb values (now - 9m, 4294967295)')
+        tdSql.error('insert into tb values (now - 9m, 255)')
 
         tdSql.query("select * from tb")
         tdSql.checkRows(insertRows + 4)

tests/pytest/pytest_1.sh

@@ -16,7 +16,7 @@ python3 ./test.py -f insert/nchar.py
 python3 ./test.py -f insert/nchar-unicode.py
 python3 ./test.py -f insert/multi.py
 python3 ./test.py -f insert/randomNullCommit.py
-#python3 insert/retentionpolicy.py
+python3 insert/retentionpolicy.py
 python3 ./test.py -f insert/alterTableAndInsert.py
 python3 ./test.py -f insert/insertIntoTwoTables.py
 python3 ./test.py -f insert/before_1970.py

tests/pytest/pytest_4.sh

@@ -23,4 +23,11 @@ python3 ./test.py -f functions/function_sum.py -r 1
 python3 ./test.py -f functions/function_top.py -r 1
 python3 ./test.py -f functions/function_twa.py -r 1
 python3 ./test.py -f functions/function_twa_test2.py
-python3 ./test.py -f functions/function_stddev_td2555.pyhao
\ No newline at end of file
+python3 ./test.py -f functions/function_stddev_td2555.py
+python3 ./test.py -f insert/metadataUpdate.py
+python3 ./test.py -f tools/taosdemoTest2.py
+python3 ./test.py -f query/last_cache.py
+python3 ./test.py -f query/last_row_cache.py
+python3 ./test.py -f account/account_create.py
+python3 ./test.py -f alter/alter_table.py
+python3 ./test.py -f query/queryGroupbySort.py
\ No newline at end of file

tests/script/jenkins/basic_4.txt

@@ -38,3 +38,9 @@
 ./test.sh -f general/stable/vnode3.sim
 
 ./test.sh -f unique/column/replica3.sim
+./test.sh -f issue/TD-2713.sim
+./test.sh -f general/parser/select_distinct_tag.sim
+./test.sh -f unique/mnode/mgmt30.sim
+./test.sh -f issue/TD-2677.sim
+./test.sh -f issue/TD-2680.sim
+./test.sh -f unique/dnode/lossdata.sim
\ No newline at end of file