apache-iotdb 1.3.3__tar.gz → 1.3.4__tar.gz

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/PKG-INFO

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

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/apache_iotdb.egg-info/PKG-INFO

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

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/iotdb/Session.py

@@ -18,6 +18,7 @@
 
 import logging
 import random
+import sys
 import struct
 import time
 import warnings
@@ -84,6 +85,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
@@ -104,6 +108,9 @@ class Session(object):
         self.__enable_redirection = enable_redirection
         self.__device_id_to_endpoint = None
         self.__endpoint_to_connection = 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(
@@ -114,11 +121,23 @@ 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")
         session = Session(
-            None, None, user, password, fetch_size, zone_id, enable_redirection
+            None,
+            None,
+            user,
+            password,
+            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 = []
@@ -166,16 +185,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:
@@ -222,6 +232,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
 

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/iotdb/SessionPool.py

@@ -42,6 +42,9 @@ class PoolConfig(object):
         time_zone: str = DEFAULT_TIME_ZONE,
         max_retry: int = DEFAULT_MAX_RETRY,
         enable_compression: bool = False,
+        use_ssl: bool = False,
+        ca_certs: str = None,
+        connection_timeout_in_ms: int = None,
     ):
         self.host = host
         self.port = port
@@ -58,6 +61,9 @@ class PoolConfig(object):
         self.time_zone = time_zone
         self.max_retry = max_retry
         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 SessionPool(object):
@@ -80,6 +86,9 @@ class SessionPool(object):
                 self.__pool_config.password,
                 self.__pool_config.fetch_size,
                 self.__pool_config.time_zone,
+                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,
             )
 
         else:
@@ -90,6 +99,9 @@ class SessionPool(object):
                 self.__pool_config.password,
                 self.__pool_config.fetch_size,
                 self.__pool_config.time_zone,
+                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.open(self.__pool_config.enable_compression)
@@ -102,7 +114,6 @@ class SessionPool(object):
         return q
 
     def get_session(self) -> Session:
-
         if self.__closed:
             raise ConnectionError("SessionPool has already been closed.")
 
@@ -137,7 +148,6 @@ class SessionPool(object):
         return session
 
     def put_back(self, session: Session):
-
         if self.__closed:
             raise ConnectionError(
                 "SessionPool has already been closed, please close the session manually."
@@ -150,7 +160,6 @@ class SessionPool(object):
                 self.__pool_size -= 1
 
     def close(self):
-
         with self.__lock:
             while not self.__queue.empty():
                 session = self.__queue.get(block=False)

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/iotdb/thrift/common/ttypes.py

@@ -1203,13 +1203,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:
@@ -1235,6 +1237,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()
@@ -1252,8 +1264,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()
@@ -1297,10 +1316,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)
@@ -1317,8 +1336,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()
@@ -1438,11 +1457,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)
@@ -1464,9 +1483,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:
@@ -1522,10 +1541,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)
@@ -1552,8 +1571,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:
@@ -1611,10 +1630,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)
@@ -1631,8 +1650,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()
@@ -1758,11 +1777,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)
@@ -1783,8 +1802,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()
@@ -1987,12 +2006,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)
@@ -2019,9 +2038,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:
@@ -2075,10 +2094,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)
@@ -2101,8 +2120,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:
@@ -2724,11 +2743,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)
@@ -2749,8 +2768,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()
@@ -2800,22 +2819,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)
@@ -2832,15 +2851,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()
@@ -3088,6 +3107,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 = (

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/iotdb/thrift/rpc/ttypes.py

@@ -4536,11 +4536,12 @@ class TSGroupByQueryIntervalReq(object):
      - interval
      - fetchSize
      - timeout
+     - isAligned
 
     """
 
 
-    def __init__(self, sessionId=None, statementId=None, device=None, measurement=None, dataType=None, aggregationType=None, database=None, startTime=None, endTime=None, interval=None, fetchSize=None, timeout=None,):
+    def __init__(self, sessionId=None, statementId=None, device=None, measurement=None, dataType=None, aggregationType=None, database=None, startTime=None, endTime=None, interval=None, fetchSize=None, timeout=None, isAligned=None,):
         self.sessionId = sessionId
         self.statementId = statementId
         self.device = device
@@ -4553,6 +4554,7 @@ class TSGroupByQueryIntervalReq(object):
         self.interval = interval
         self.fetchSize = fetchSize
         self.timeout = timeout
+        self.isAligned = isAligned
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -4623,6 +4625,11 @@ class TSGroupByQueryIntervalReq(object):
                     self.timeout = iprot.readI64()
                 else:
                     iprot.skip(ftype)
+            elif fid == 13:
+                if ftype == TType.BOOL:
+                    self.isAligned = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -4681,6 +4688,10 @@ class TSGroupByQueryIntervalReq(object):
             oprot.writeFieldBegin('timeout', TType.I64, 12)
             oprot.writeI64(self.timeout)
             oprot.writeFieldEnd()
+        if self.isAligned is not None:
+            oprot.writeFieldBegin('isAligned', TType.BOOL, 13)
+            oprot.writeBool(self.isAligned)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -7092,6 +7103,7 @@ TSGroupByQueryIntervalReq.thrift_spec = (
     (10, TType.I64, 'interval', None, None, ),  # 10
     (11, TType.I32, 'fetchSize', None, None, ),  # 11
     (12, TType.I64, 'timeout', None, None, ),  # 12
+    (13, TType.BOOL, 'isAligned', None, None, ),  # 13
 )
 all_structs.append(TSCreateMultiTimeseriesReq)
 TSCreateMultiTimeseriesReq.thrift_spec = (

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/iotdb/utils/IoTDBRpcDataSet.py

@@ -25,6 +25,7 @@ import pandas as pd
 from thrift.transport import TTransport
 from iotdb.thrift.rpc.IClientRPCService import TSFetchResultsReq, TSCloseOperationReq
 from iotdb.tsfile.utils.DateUtils import parse_int_to_date
+from iotdb.utils.IoTDBConnectionException import IoTDBConnectionException
 from iotdb.utils.IoTDBConstants import TSDataType
 
 logger = logging.getLogger("IoTDB")
@@ -417,6 +418,8 @@ class IoTDBRpcDataSet(object):
         return df
 
     def fetch_results(self):
+        if self.__is_closed:
+            raise IoTDBConnectionException("This DataSet is already closed")
         self.__rows_index = 0
         request = TSFetchResultsReq(
             self.__session_id,

{apache_iotdb-1.3.3 → apache-iotdb-1.3.4}/pyproject.toml

@@ -17,12 +17,12 @@
 #
 
 [build-system]
-requires = ["setuptools>=42", "wheel"]
+requires = ["setuptools>=42,<69", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "apache-iotdb"
-version = "1.3.3"
+version = "1.3.4"
 description = "Apache IoTDB client API"
 readme = "README.md"
 authors = [
@@ -81,4 +81,4 @@ exclude = '''
   | foo.py           # also separately exclude a file named foo.py in
                      # the root of the project
 )
-'''
+'''