apache-iotdb 2.0.1b0__py3-none-any.whl → 2.0.2__py3-none-any.whl

{apache_iotdb-2.0.1b0.dist-info → apache_iotdb-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: apache-iotdb
-Version: 2.0.1b0
+Version: 2.0.2
 Summary: Apache IoTDB client API
 Author-email: Apache IoTDB <dev@iotdb.apache.org>
 License: Apache License, Version 2.0

{apache_iotdb-2.0.1b0.dist-info → apache_iotdb-2.0.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-iotdb/Session.py,sha256=N7nTHKejA5pMnuC2dIN6zo6Te6bpv10eTfkexFBtFS0,101728
-iotdb/SessionPool.py,sha256=qsIDm1knn85PF9id44lBxfqT_ztpXUCsnC6pENuOJFg,6001
+iotdb/Session.py,sha256=x0vSwainD_xtL4uvYOBSEFcY5LofMaHH-HT57blCQTA,102965
+iotdb/SessionPool.py,sha256=-XXWDJ2Fpo1rceyc_Q-uv7XD5p69YdR1drD9tyBqUwQ,6621
 iotdb/__init__.py,sha256=vGVFsdMOp1iKaCQl5rfYcPVa0FV94d-a7MsMDQDhHMc,789
-iotdb/table_session.py,sha256=xxzIWBV5snp1SAvl6lnrF4vfVxjWq1ADa9jerCk7ro8,5781
-iotdb/table_session_pool.py,sha256=tNZTdtDQFZ4PrLCP5A-nvMHCyBJz8Huot2q4UgMg0QE,5099
+iotdb/table_session.py,sha256=Jav4TuvRl4PxOhNBaBqTvMGFWemu5YkAwRU_KXUy9wk,6173
+iotdb/table_session_pool.py,sha256=sqhceeGbr1bsLjYj6aEF_p3qzqiVhtXKAEjV9CY4pWI,5329
 iotdb/dbapi/Connection.py,sha256=t5CuwOTrMJxJ2YVxaEKi2fdaH9Vob-u7nQRCD_9vLcg,2569
 iotdb/dbapi/Cursor.py,sha256=CBFyHsk7cOxLJEwCWMJK0r4guXQ-OkNh39H54cyyH5k,9110
 iotdb/dbapi/Exceptions.py,sha256=X3qhGXQ_rNL7998DQwFeQc9cG5ByXlfhIQx2sBHOiuw,1278
@@ -20,11 +20,11 @@ iotdb/template/__init__.py,sha256=vGVFsdMOp1iKaCQl5rfYcPVa0FV94d-a7MsMDQDhHMc,78
 iotdb/thrift/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 iotdb/thrift/common/__init__.py,sha256=YFcZTT8Cm-6Y4oTiCaqq0DT1lw2W09WqoEc5_pTAwW0,34
 iotdb/thrift/common/constants.py,sha256=IKRM8SpfhYWXERWBgUbUhbdFpn363hmZjXDhEYnVRbw,366
-iotdb/thrift/common/ttypes.py,sha256=sINE2XOIW_A6L7QHsA9z_zWejljJL4jnLadoa91gRXs,115474
+iotdb/thrift/common/ttypes.py,sha256=L8cZ-biq0G2528LSKWNteVgFkWYTBMttyr6da_JXiIM,116582
 iotdb/thrift/rpc/IClientRPCService.py,sha256=gHrJArjwcFMkcKIR46CFiz_D5rhR-WetjQSI8jRLXeY,416186
 iotdb/thrift/rpc/__init__.py,sha256=69gRO2XxQu71SDeCRxiZFjK6Xw_61hdl5MdWceI-e1A,55
 iotdb/thrift/rpc/constants.py,sha256=IKRM8SpfhYWXERWBgUbUhbdFpn363hmZjXDhEYnVRbw,366
-iotdb/thrift/rpc/ttypes.py,sha256=KsZuh4H0ReVWUeKqcBsQczLp2G8_7vH_q_UhnUPV2XM,300653
+iotdb/thrift/rpc/ttypes.py,sha256=SBn1WHuSwmEoZrO6Ke2Ddcty6z52Hu1lGJp0uDJ1z8Y,301147
 iotdb/tsfile/__init__.py,sha256=vGVFsdMOp1iKaCQl5rfYcPVa0FV94d-a7MsMDQDhHMc,789
 iotdb/tsfile/common/__init__.py,sha256=vGVFsdMOp1iKaCQl5rfYcPVa0FV94d-a7MsMDQDhHMc,789
 iotdb/tsfile/common/constant/TsFileConstant.py,sha256=uLSw9vnQZ6objfyhO3b9bHTip8yUW5aapPHEsXC0e7s,1165
@@ -66,8 +66,8 @@ tests/integration/sqlalchemy/__init__.py,sha256=vGVFsdMOp1iKaCQl5rfYcPVa0FV94d-a
 tests/integration/sqlalchemy/test_dialect.py,sha256=QvhZ3h-gbXQHRLQglbIeBM-YaJxWjd8NFwCCtRZDCQg,3478
 tests/unit/__init__.py,sha256=vGVFsdMOp1iKaCQl5rfYcPVa0FV94d-a7MsMDQDhHMc,789
 tests/unit/test_numpy_tablet.py,sha256=w3lLK8Cft7lGsCj_6Z1Y7kDshltN0osSDJb-EESi6_Y,7235
-apache_iotdb-2.0.1b0.dist-info/METADATA,sha256=q8mXekKkl4rP2yJ9C6AcHEoL2o7PV0iAzXx6_bkc9ko,18794
-apache_iotdb-2.0.1b0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-apache_iotdb-2.0.1b0.dist-info/entry_points.txt,sha256=BmQWy6NHyWXorQcVm8-VWpt9MSqe46UFyV2hnsl4yok,73
-apache_iotdb-2.0.1b0.dist-info/top_level.txt,sha256=B9jGGOaAAqF1WrWw2jX2K-naWAZn2nhyrL-6hM1qwyM,12
-apache_iotdb-2.0.1b0.dist-info/RECORD,,
+apache_iotdb-2.0.2.dist-info/METADATA,sha256=FRHjfXTDRW5l9tzgjeGCXdnkpxuuzk_3dUwfahHxA6E,18792
+apache_iotdb-2.0.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+apache_iotdb-2.0.2.dist-info/entry_points.txt,sha256=BmQWy6NHyWXorQcVm8-VWpt9MSqe46UFyV2hnsl4yok,73
+apache_iotdb-2.0.2.dist-info/top_level.txt,sha256=B9jGGOaAAqF1WrWw2jX2K-naWAZn2nhyrL-6hM1qwyM,12
+apache_iotdb-2.0.2.dist-info/RECORD,,

{apache_iotdb-2.0.1b0.dist-info → apache_iotdb-2.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

iotdb/Session.py

@@ -18,6 +18,7 @@
 
 import logging
 import random
+import sys
 import struct
 import time
 import warnings
@@ -85,6 +86,9 @@ class Session(object):
         fetch_size=DEFAULT_FETCH_SIZE,
         zone_id=DEFAULT_ZONE_ID,
         enable_redirection=True,
+        use_ssl=False,
+        ca_certs=None,
+        connection_timeout_in_ms=None,
     ):
         self.__host = host
         self.__port = port
@@ -107,6 +111,9 @@ class Session(object):
         self.__endpoint_to_connection = None
         self.sql_dialect = self.SQL_DIALECT
         self.database = None
+        self.__use_ssl = use_ssl
+        self.__ca_certs = ca_certs
+        self.__connection_timeout_in_ms = connection_timeout_in_ms
 
     @classmethod
     def init_from_node_urls(
@@ -117,6 +124,9 @@ class Session(object):
         fetch_size=DEFAULT_FETCH_SIZE,
         zone_id=DEFAULT_ZONE_ID,
         enable_redirection=True,
+        use_ssl=False,
+        ca_certs=None,
+        connection_timeout_in_ms=None,
     ):
         if node_urls is None:
             raise RuntimeError("node urls is empty")
@@ -128,6 +138,9 @@ class Session(object):
             fetch_size,
             zone_id,
             enable_redirection,
+            use_ssl=use_ssl,
+            ca_certs=ca_certs,
+            connection_timeout_in_ms=connection_timeout_in_ms,
         )
         session.__hosts = []
         session.__ports = []
@@ -175,16 +188,7 @@ class Session(object):
             }
 
     def init_connection(self, endpoint):
-        transport = TTransport.TFramedTransport(
-            TSocket.TSocket(endpoint.ip, endpoint.port)
-        )
-
-        if not transport.isOpen():
-            try:
-                transport.open()
-            except TTransport.TTransportException as e:
-                raise IoTDBConnectionException(e) from None
-
+        transport = self.__get_transport(endpoint)
         if self.__enable_rpc_compression:
             client = Client(TCompactProtocol.TCompactProtocolAccelerated(transport))
         else:
@@ -234,6 +238,33 @@ class Session(object):
             self.__zone_id = self.get_time_zone()
         return SessionConnection(client, transport, session_id, statement_id)
 
+    def __get_transport(self, endpoint):
+        if self.__use_ssl:
+            import ssl
+            from thrift.transport import TSSLSocket
+
+            if sys.version_info >= (3, 10):
+                context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
+            else:
+                context = ssl.SSLContext(ssl.PROTOCOL_TLS)
+                context.verify_mode = ssl.CERT_REQUIRED
+                context.check_hostname = True
+            context.load_verify_locations(cafile=self.__ca_certs)
+            socket = TSSLSocket.TSSLSocket(
+                host=endpoint.ip, port=endpoint.port, ssl_context=context
+            )
+        else:
+            socket = TSocket.TSocket(endpoint.ip, endpoint.port)
+        socket.setTimeout(self.__connection_timeout_in_ms)
+        transport = TTransport.TFramedTransport(socket)
+
+        if not transport.isOpen():
+            try:
+                transport.open()
+            except TTransport.TTransportException as e:
+                raise IoTDBConnectionException(e) from None
+        return transport
+
     def is_open(self):
         return not self.__is_close
 

iotdb/SessionPool.py

@@ -44,6 +44,9 @@ class PoolConfig(object):
         max_retry: int = DEFAULT_MAX_RETRY,
         enable_compression: bool = False,
         enable_redirection: bool = True,
+        use_ssl: bool = False,
+        ca_certs: str = None,
+        connection_timeout_in_ms: int = None,
     ):
         self.host = host
         self.port = port
@@ -61,6 +64,9 @@ class PoolConfig(object):
         self.max_retry = max_retry
         self.enable_compression = enable_compression
         self.enable_redirection = enable_redirection
+        self.use_ssl = use_ssl
+        self.ca_certs = ca_certs
+        self.connection_timeout_in_ms = connection_timeout_in_ms
 
 
 class SessionPool(object):
@@ -86,6 +92,9 @@ class SessionPool(object):
                 self.__pool_config.fetch_size,
                 self.__pool_config.time_zone,
                 enable_redirection=self.__pool_config.enable_redirection,
+                use_ssl=self.__pool_config.use_ssl,
+                ca_certs=self.__pool_config.ca_certs,
+                connection_timeout_in_ms=self.__pool_config.connection_timeout_in_ms,
             )
             session.sql_dialect = self.sql_dialect
             session.database = self.database
@@ -99,6 +108,9 @@ class SessionPool(object):
                 self.__pool_config.fetch_size,
                 self.__pool_config.time_zone,
                 enable_redirection=self.__pool_config.enable_redirection,
+                use_ssl=self.__pool_config.use_ssl,
+                ca_certs=self.__pool_config.ca_certs,
+                connection_timeout_in_ms=self.__pool_config.connection_timeout_in_ms,
             )
             session.sql_dialect = self.sql_dialect
             session.database = self.database

iotdb/table_session.py

@@ -35,6 +35,9 @@ class TableSessionConfig(object):
         time_zone: str = Session.DEFAULT_ZONE_ID,
         enable_redirection: bool = True,
         enable_compression: bool = False,
+        use_ssl: bool = False,
+        ca_certs: str = None,
+        connection_timeout_in_ms: int = None,
     ):
         """
         Initialize a TableSessionConfig object with the provided parameters.
@@ -66,6 +69,9 @@ class TableSessionConfig(object):
         self.time_zone = time_zone
         self.enable_redirection = enable_redirection
         self.enable_compression = enable_compression
+        self.use_ssl = use_ssl
+        self.ca_certs = ca_certs
+        self.connection_timeout_in_ms = connection_timeout_in_ms
 
 
 class TableSession(object):
@@ -82,6 +88,9 @@ class TableSession(object):
                 table_session_config.fetch_size,
                 table_session_config.time_zone,
                 table_session_config.enable_redirection,
+                table_session_config.use_ssl,
+                table_session_config.ca_certs,
+                table_session_config.connection_timeout_in_ms,
             )
             self.__session.sql_dialect = "table"
             self.__session.database = table_session_config.database

iotdb/table_session_pool.py

@@ -34,6 +34,9 @@ class TableSessionPoolConfig(object):
         enable_compression: bool = False,
         wait_timeout_in_ms: int = 10000,
         max_retry: int = 3,
+        use_ssl: bool = False,
+        ca_certs: str = None,
+        connection_timeout_in_ms: int = None,
     ):
         """
         Initialize a TableSessionPoolConfig object with the provided parameters.
@@ -71,6 +74,9 @@ class TableSessionPoolConfig(object):
             max_retry=max_retry,
             enable_redirection=enable_redirection,
             enable_compression=enable_compression,
+            use_ssl=use_ssl,
+            ca_certs=ca_certs,
+            connection_timeout_in_ms=connection_timeout_in_ms,
         )
         self.max_pool_size = max_pool_size
         self.wait_timeout_in_ms = wait_timeout_in_ms

iotdb/thrift/common/ttypes.py

@@ -160,6 +160,7 @@ class TAggregationType(object):
     LAST_BY = 26
     MIN = 27
     MAX = 28
+    COUNT_ALL = 29
 
     _VALUES_TO_NAMES = {
         0: "COUNT",
@@ -191,6 +192,7 @@ class TAggregationType(object):
         26: "LAST_BY",
         27: "MIN",
         28: "MAX",
+        29: "COUNT_ALL",
     }
 
     _NAMES_TO_VALUES = {
@@ -223,6 +225,7 @@ class TAggregationType(object):
         "LAST_BY": 26,
         "MIN": 27,
         "MAX": 28,
+        "COUNT_ALL": 29,
     }
 
 
@@ -1257,13 +1260,15 @@ class TFlushReq(object):
     Attributes:
      - isSeq
      - storageGroups
+     - regionIds
 
     """
 
 
-    def __init__(self, isSeq=None, storageGroups=None,):
+    def __init__(self, isSeq=None, storageGroups=None, regionIds=None,):
         self.isSeq = isSeq
         self.storageGroups = storageGroups
+        self.regionIds = regionIds
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -1289,6 +1294,16 @@ class TFlushReq(object):
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.LIST:
+                    self.regionIds = []
+                    (_etype23, _size20) = iprot.readListBegin()
+                    for _i24 in range(_size20):
+                        _elem25 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.regionIds.append(_elem25)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -1306,8 +1321,15 @@ class TFlushReq(object):
         if self.storageGroups is not None:
             oprot.writeFieldBegin('storageGroups', TType.LIST, 2)
             oprot.writeListBegin(TType.STRING, len(self.storageGroups))
-            for iter20 in self.storageGroups:
-                oprot.writeString(iter20.encode('utf-8') if sys.version_info[0] == 2 else iter20)
+            for iter26 in self.storageGroups:
+                oprot.writeString(iter26.encode('utf-8') if sys.version_info[0] == 2 else iter26)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.regionIds is not None:
+            oprot.writeFieldBegin('regionIds', TType.LIST, 3)
+            oprot.writeListBegin(TType.STRING, len(self.regionIds))
+            for iter27 in self.regionIds:
+                oprot.writeString(iter27.encode('utf-8') if sys.version_info[0] == 2 else iter27)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -1351,10 +1373,10 @@ class TSettleReq(object):
             if fid == 1:
                 if ftype == TType.LIST:
                     self.paths = []
-                    (_etype24, _size21) = iprot.readListBegin()
-                    for _i25 in range(_size21):
-                        _elem26 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
-                        self.paths.append(_elem26)
+                    (_etype31, _size28) = iprot.readListBegin()
+                    for _i32 in range(_size28):
+                        _elem33 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.paths.append(_elem33)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -1371,8 +1393,8 @@ class TSettleReq(object):
         if self.paths is not None:
             oprot.writeFieldBegin('paths', TType.LIST, 1)
             oprot.writeListBegin(TType.STRING, len(self.paths))
-            for iter27 in self.paths:
-                oprot.writeString(iter27.encode('utf-8') if sys.version_info[0] == 2 else iter27)
+            for iter34 in self.paths:
+                oprot.writeString(iter34.encode('utf-8') if sys.version_info[0] == 2 else iter34)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -1492,11 +1514,11 @@ class TSetConfigurationReq(object):
             if fid == 1:
                 if ftype == TType.MAP:
                     self.configs = {}
-                    (_ktype29, _vtype30, _size28) = iprot.readMapBegin()
-                    for _i32 in range(_size28):
-                        _key33 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
-                        _val34 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
-                        self.configs[_key33] = _val34
+                    (_ktype36, _vtype37, _size35) = iprot.readMapBegin()
+                    for _i39 in range(_size35):
+                        _key40 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        _val41 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.configs[_key40] = _val41
                     iprot.readMapEnd()
                 else:
                     iprot.skip(ftype)
@@ -1518,9 +1540,9 @@ class TSetConfigurationReq(object):
         if self.configs is not None:
             oprot.writeFieldBegin('configs', TType.MAP, 1)
             oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.configs))
-            for kiter35, viter36 in self.configs.items():
-                oprot.writeString(kiter35.encode('utf-8') if sys.version_info[0] == 2 else kiter35)
-                oprot.writeString(viter36.encode('utf-8') if sys.version_info[0] == 2 else viter36)
+            for kiter42, viter43 in self.configs.items():
+                oprot.writeString(kiter42.encode('utf-8') if sys.version_info[0] == 2 else kiter42)
+                oprot.writeString(viter43.encode('utf-8') if sys.version_info[0] == 2 else viter43)
             oprot.writeMapEnd()
             oprot.writeFieldEnd()
         if self.nodeId is not None:
@@ -1576,10 +1598,10 @@ class TSetTTLReq(object):
             if fid == 1:
                 if ftype == TType.LIST:
                     self.pathPattern = []
-                    (_etype40, _size37) = iprot.readListBegin()
-                    for _i41 in range(_size37):
-                        _elem42 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
-                        self.pathPattern.append(_elem42)
+                    (_etype47, _size44) = iprot.readListBegin()
+                    for _i48 in range(_size44):
+                        _elem49 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.pathPattern.append(_elem49)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -1606,8 +1628,8 @@ class TSetTTLReq(object):
         if self.pathPattern is not None:
             oprot.writeFieldBegin('pathPattern', TType.LIST, 1)
             oprot.writeListBegin(TType.STRING, len(self.pathPattern))
-            for iter43 in self.pathPattern:
-                oprot.writeString(iter43.encode('utf-8') if sys.version_info[0] == 2 else iter43)
+            for iter50 in self.pathPattern:
+                oprot.writeString(iter50.encode('utf-8') if sys.version_info[0] == 2 else iter50)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.TTL is not None:
@@ -1665,10 +1687,10 @@ class TShowTTLReq(object):
             if fid == 1:
                 if ftype == TType.LIST:
                     self.pathPattern = []
-                    (_etype47, _size44) = iprot.readListBegin()
-                    for _i48 in range(_size44):
-                        _elem49 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
-                        self.pathPattern.append(_elem49)
+                    (_etype54, _size51) = iprot.readListBegin()
+                    for _i55 in range(_size51):
+                        _elem56 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.pathPattern.append(_elem56)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -1685,8 +1707,8 @@ class TShowTTLReq(object):
         if self.pathPattern is not None:
             oprot.writeFieldBegin('pathPattern', TType.LIST, 1)
             oprot.writeListBegin(TType.STRING, len(self.pathPattern))
-            for iter50 in self.pathPattern:
-                oprot.writeString(iter50.encode('utf-8') if sys.version_info[0] == 2 else iter50)
+            for iter57 in self.pathPattern:
+                oprot.writeString(iter57.encode('utf-8') if sys.version_info[0] == 2 else iter57)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -1812,11 +1834,11 @@ class TFilesResp(object):
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.files = []
-                    (_etype54, _size51) = iprot.readListBegin()
-                    for _i55 in range(_size51):
-                        _elem56 = TFile()
-                        _elem56.read(iprot)
-                        self.files.append(_elem56)
+                    (_etype61, _size58) = iprot.readListBegin()
+                    for _i62 in range(_size58):
+                        _elem63 = TFile()
+                        _elem63.read(iprot)
+                        self.files.append(_elem63)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -1837,8 +1859,8 @@ class TFilesResp(object):
         if self.files is not None:
             oprot.writeFieldBegin('files', TType.LIST, 2)
             oprot.writeListBegin(TType.STRUCT, len(self.files))
-            for iter57 in self.files:
-                iter57.write(oprot)
+            for iter64 in self.files:
+                iter64.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -2041,12 +2063,12 @@ class TThrottleQuota(object):
             if fid == 1:
                 if ftype == TType.MAP:
                     self.throttleLimit = {}
-                    (_ktype59, _vtype60, _size58) = iprot.readMapBegin()
-                    for _i62 in range(_size58):
-                        _key63 = iprot.readI32()
-                        _val64 = TTimedQuota()
-                        _val64.read(iprot)
-                        self.throttleLimit[_key63] = _val64
+                    (_ktype66, _vtype67, _size65) = iprot.readMapBegin()
+                    for _i69 in range(_size65):
+                        _key70 = iprot.readI32()
+                        _val71 = TTimedQuota()
+                        _val71.read(iprot)
+                        self.throttleLimit[_key70] = _val71
                     iprot.readMapEnd()
                 else:
                     iprot.skip(ftype)
@@ -2073,9 +2095,9 @@ class TThrottleQuota(object):
         if self.throttleLimit is not None:
             oprot.writeFieldBegin('throttleLimit', TType.MAP, 1)
             oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.throttleLimit))
-            for kiter65, viter66 in self.throttleLimit.items():
-                oprot.writeI32(kiter65)
-                viter66.write(oprot)
+            for kiter72, viter73 in self.throttleLimit.items():
+                oprot.writeI32(kiter72)
+                viter73.write(oprot)
             oprot.writeMapEnd()
             oprot.writeFieldEnd()
         if self.memLimit is not None:
@@ -2129,10 +2151,10 @@ class TSetSpaceQuotaReq(object):
             if fid == 1:
                 if ftype == TType.LIST:
                     self.database = []
-                    (_etype70, _size67) = iprot.readListBegin()
-                    for _i71 in range(_size67):
-                        _elem72 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
-                        self.database.append(_elem72)
+                    (_etype77, _size74) = iprot.readListBegin()
+                    for _i78 in range(_size74):
+                        _elem79 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.database.append(_elem79)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -2155,8 +2177,8 @@ class TSetSpaceQuotaReq(object):
         if self.database is not None:
             oprot.writeFieldBegin('database', TType.LIST, 1)
             oprot.writeListBegin(TType.STRING, len(self.database))
-            for iter73 in self.database:
-                oprot.writeString(iter73.encode('utf-8') if sys.version_info[0] == 2 else iter73)
+            for iter80 in self.database:
+                oprot.writeString(iter80.encode('utf-8') if sys.version_info[0] == 2 else iter80)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.spaceLimit is not None:
@@ -2778,11 +2800,11 @@ class TTestConnectionResp(object):
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.resultList = []
-                    (_etype77, _size74) = iprot.readListBegin()
-                    for _i78 in range(_size74):
-                        _elem79 = TTestConnectionResult()
-                        _elem79.read(iprot)
-                        self.resultList.append(_elem79)
+                    (_etype84, _size81) = iprot.readListBegin()
+                    for _i85 in range(_size81):
+                        _elem86 = TTestConnectionResult()
+                        _elem86.read(iprot)
+                        self.resultList.append(_elem86)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -2803,8 +2825,8 @@ class TTestConnectionResp(object):
         if self.resultList is not None:
             oprot.writeFieldBegin('resultList', TType.LIST, 2)
             oprot.writeListBegin(TType.STRUCT, len(self.resultList))
-            for iter80 in self.resultList:
-                iter80.write(oprot)
+            for iter87 in self.resultList:
+                iter87.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -2854,22 +2876,22 @@ class TNodeLocations(object):
             if fid == 1:
                 if ftype == TType.LIST:
                     self.configNodeLocations = []
-                    (_etype84, _size81) = iprot.readListBegin()
-                    for _i85 in range(_size81):
-                        _elem86 = TConfigNodeLocation()
-                        _elem86.read(iprot)
-                        self.configNodeLocations.append(_elem86)
+                    (_etype91, _size88) = iprot.readListBegin()
+                    for _i92 in range(_size88):
+                        _elem93 = TConfigNodeLocation()
+                        _elem93.read(iprot)
+                        self.configNodeLocations.append(_elem93)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.dataNodeLocations = []
-                    (_etype90, _size87) = iprot.readListBegin()
-                    for _i91 in range(_size87):
-                        _elem92 = TDataNodeLocation()
-                        _elem92.read(iprot)
-                        self.dataNodeLocations.append(_elem92)
+                    (_etype97, _size94) = iprot.readListBegin()
+                    for _i98 in range(_size94):
+                        _elem99 = TDataNodeLocation()
+                        _elem99.read(iprot)
+                        self.dataNodeLocations.append(_elem99)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -2886,15 +2908,15 @@ class TNodeLocations(object):
         if self.configNodeLocations is not None:
             oprot.writeFieldBegin('configNodeLocations', TType.LIST, 1)
             oprot.writeListBegin(TType.STRUCT, len(self.configNodeLocations))
-            for iter93 in self.configNodeLocations:
-                iter93.write(oprot)
+            for iter100 in self.configNodeLocations:
+                iter100.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.dataNodeLocations is not None:
             oprot.writeFieldBegin('dataNodeLocations', TType.LIST, 2)
             oprot.writeListBegin(TType.STRUCT, len(self.dataNodeLocations))
-            for iter94 in self.dataNodeLocations:
-                iter94.write(oprot)
+            for iter101 in self.dataNodeLocations:
+                iter101.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -3142,6 +3164,7 @@ TFlushReq.thrift_spec = (
     None,  # 0
     (1, TType.STRING, 'isSeq', 'UTF8', None, ),  # 1
     (2, TType.LIST, 'storageGroups', (TType.STRING, 'UTF8', False), None, ),  # 2
+    (3, TType.LIST, 'regionIds', (TType.STRING, 'UTF8', False), None, ),  # 3
 )
 all_structs.append(TSettleReq)
 TSettleReq.thrift_spec = (

iotdb/thrift/rpc/ttypes.py

@@ -1453,17 +1453,19 @@ class TSFetchResultsReq(object):
      - queryId
      - isAlign
      - timeout
+     - statementId
 
     """
 
 
-    def __init__(self, sessionId=None, statement=None, fetchSize=None, queryId=None, isAlign=None, timeout=None,):
+    def __init__(self, sessionId=None, statement=None, fetchSize=None, queryId=None, isAlign=None, timeout=None, statementId=None,):
         self.sessionId = sessionId
         self.statement = statement
         self.fetchSize = fetchSize
         self.queryId = queryId
         self.isAlign = isAlign
         self.timeout = timeout
+        self.statementId = statementId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -1504,6 +1506,11 @@ class TSFetchResultsReq(object):
                     self.timeout = iprot.readI64()
                 else:
                     iprot.skip(ftype)
+            elif fid == 7:
+                if ftype == TType.I64:
+                    self.statementId = iprot.readI64()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -1538,6 +1545,10 @@ class TSFetchResultsReq(object):
             oprot.writeFieldBegin('timeout', TType.I64, 6)
             oprot.writeI64(self.timeout)
             oprot.writeFieldEnd()
+        if self.statementId is not None:
+            oprot.writeFieldBegin('statementId', TType.I64, 7)
+            oprot.writeI64(self.statementId)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -6967,6 +6978,7 @@ TSFetchResultsReq.thrift_spec = (
     (4, TType.I64, 'queryId', None, None, ),  # 4
     (5, TType.BOOL, 'isAlign', None, None, ),  # 5
     (6, TType.I64, 'timeout', None, None, ),  # 6
+    (7, TType.I64, 'statementId', None, None, ),  # 7
 )
 all_structs.append(TSFetchResultsResp)
 TSFetchResultsResp.thrift_spec = (