apache-iotdb 2.0.3__tar.gz → 2.0.4__tar.gz

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-iotdb
-Version: 2.0.3
+Version: 2.0.4
 Summary: Apache IoTDB client API
 Author-email: Apache IoTDB <dev@iotdb.apache.org>
 License-Expression: Apache-2.0
@@ -18,6 +18,7 @@ Requires-Dist: pandas>=1.0.0
 Requires-Dist: numpy>=1.0.0
 Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: sqlalchemy-utils>=0.37.8
+Requires-Dist: tzlocal>=4.0
 
 <!--
 
@@ -94,7 +95,7 @@ session.close()
 * Initialize a Session
 
 ```python
-session = Session(ip, port_, username_, password_, fetch_size=1024, zone_id="UTC+8")
+session = Session(ip, port_, username_, password_, fetch_size=1024, zone_id="Asia/Shanghai")
 ```
 
 * Open a session, with a parameter to specify whether to enable RPC compression
@@ -396,7 +397,7 @@ ip = "127.0.0.1"
 port_ = "6667"
 username_ = "root"
 password_ = "root"
-conn = connect(ip, port_, username_, password_,fetch_size=1024,zone_id="UTC+8",sqlalchemy_mode=False)
+conn = connect(ip, port_, username_, password_,fetch_size=1024,zone_id="Asia/Shanghai",sqlalchemy_mode=False)
 cursor = conn.cursor()
 ```
 + simple SQL statement execution

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/README.md

@@ -73,7 +73,7 @@ session.close()
 * Initialize a Session
 
 ```python
-session = Session(ip, port_, username_, password_, fetch_size=1024, zone_id="UTC+8")
+session = Session(ip, port_, username_, password_, fetch_size=1024, zone_id="Asia/Shanghai")
 ```
 
 * Open a session, with a parameter to specify whether to enable RPC compression
@@ -375,7 +375,7 @@ ip = "127.0.0.1"
 port_ = "6667"
 username_ = "root"
 password_ = "root"
-conn = connect(ip, port_, username_, password_,fetch_size=1024,zone_id="UTC+8",sqlalchemy_mode=False)
+conn = connect(ip, port_, username_, password_,fetch_size=1024,zone_id="Asia/Shanghai",sqlalchemy_mode=False)
 cursor = conn.cursor()
 ```
 + simple SQL statement execution

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/apache_iotdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-iotdb
-Version: 2.0.3
+Version: 2.0.4
 Summary: Apache IoTDB client API
 Author-email: Apache IoTDB <dev@iotdb.apache.org>
 License-Expression: Apache-2.0
@@ -18,6 +18,7 @@ Requires-Dist: pandas>=1.0.0
 Requires-Dist: numpy>=1.0.0
 Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: sqlalchemy-utils>=0.37.8
+Requires-Dist: tzlocal>=4.0
 
 <!--
 
@@ -94,7 +95,7 @@ session.close()
 * Initialize a Session
 
 ```python
-session = Session(ip, port_, username_, password_, fetch_size=1024, zone_id="UTC+8")
+session = Session(ip, port_, username_, password_, fetch_size=1024, zone_id="Asia/Shanghai")
 ```
 
 * Open a session, with a parameter to specify whether to enable RPC compression
@@ -396,7 +397,7 @@ ip = "127.0.0.1"
 port_ = "6667"
 username_ = "root"
 password_ = "root"
-conn = connect(ip, port_, username_, password_,fetch_size=1024,zone_id="UTC+8",sqlalchemy_mode=False)
+conn = connect(ip, port_, username_, password_,fetch_size=1024,zone_id="Asia/Shanghai",sqlalchemy_mode=False)
 cursor = conn.cursor()
 ```
 + simple SQL statement execution

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/apache_iotdb.egg-info/requires.txt

@@ -3,3 +3,4 @@ pandas>=1.0.0
 numpy>=1.0.0
 sqlalchemy>=1.4
 sqlalchemy-utils>=0.37.8
+tzlocal>=4.0

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/iotdb/Session.py

@@ -20,10 +20,10 @@ import logging
 import random
 import sys
 import struct
-import time
 import warnings
 from thrift.protocol import TBinaryProtocol, TCompactProtocol
 from thrift.transport import TSocket, TTransport
+from tzlocal import get_localzone_name
 
 from iotdb.utils.SessionDataSet import SessionDataSet
 from .template.Template import Template
@@ -71,7 +71,7 @@ class Session(object):
     DEFAULT_FETCH_SIZE = 5000
     DEFAULT_USER = "root"
     DEFAULT_PASSWORD = "root"
-    DEFAULT_ZONE_ID = time.strftime("%z")
+    DEFAULT_ZONE_ID = get_localzone_name()
     RETRY_NUM = 3
     SQL_DIALECT = "tree"
 
@@ -112,6 +112,7 @@ class Session(object):
         self.__use_ssl = use_ssl
         self.__ca_certs = ca_certs
         self.__connection_timeout_in_ms = connection_timeout_in_ms
+        self.__time_precision = "ms"
 
     @classmethod
     def init_from_node_urls(
@@ -206,6 +207,11 @@ class Session(object):
         try:
             open_resp = client.openSession(open_req)
             rpc_utils.verify_success(open_resp.status)
+            if open_resp.configuration is not None:
+                if "timestamp_precision" in open_resp.configuration:
+                    self.__time_precision = open_resp.configuration[
+                        "timestamp_precision"
+                    ]
 
             if self.protocol_version != open_resp.serverProtocolVersion:
                 logger.exception(
@@ -1518,6 +1524,8 @@ class Session(object):
             timeout,
             resp.moreData,
             self.__fetch_size,
+            self.__zone_id,
+            self.__time_precision,
             resp.columnIndex2TsBlockColumnIndexList,
         )
 
@@ -1587,6 +1595,8 @@ class Session(object):
                 timeout,
                 resp.moreData,
                 self.__fetch_size,
+                self.__zone_id,
+                self.__time_precision,
                 resp.columnIndex2TsBlockColumnIndexList,
             )
         else:
@@ -1748,6 +1758,8 @@ class Session(object):
             0,
             resp.moreData,
             self.__fetch_size,
+            self.__zone_id,
+            self.__time_precision,
             resp.columnIndex2TsBlockColumnIndexList,
         )
 
@@ -1793,6 +1805,8 @@ class Session(object):
             0,
             resp.moreData,
             self.__fetch_size,
+            self.__zone_id,
+            self.__time_precision,
             resp.columnIndex2TsBlockColumnIndexList,
         )
 

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/iotdb/SessionPool.py

@@ -21,12 +21,14 @@ import time
 from queue import Queue
 from threading import Lock
 
+from tzlocal import get_localzone_name
+
 from iotdb.Session import Session
 
 DEFAULT_MULTIPIE = 5
 DEFAULT_FETCH_SIZE = 5000
 DEFAULT_MAX_RETRY = 3
-DEFAULT_TIME_ZONE = "UTC+8"
+DEFAULT_TIME_ZONE = get_localzone_name()
 SQL_DIALECT = "tree"
 logger = logging.getLogger("IoTDB")
 

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/iotdb/thrift/common/ttypes.py

@@ -161,6 +161,7 @@ class TAggregationType(object):
     MIN = 27
     MAX = 28
     COUNT_ALL = 29
+    APPROX_COUNT_DISTINCT = 30
 
     _VALUES_TO_NAMES = {
         0: "COUNT",
@@ -193,6 +194,7 @@ class TAggregationType(object):
         27: "MIN",
         28: "MAX",
         29: "COUNT_ALL",
+        30: "APPROX_COUNT_DISTINCT",
     }
 
     _NAMES_TO_VALUES = {
@@ -226,6 +228,7 @@ class TAggregationType(object):
         "MIN": 27,
         "MAX": 28,
         "COUNT_ALL": 29,
+        "APPROX_COUNT_DISTINCT": 30,
     }
 
 

{apache_iotdb-2.0.3 → apache_iotdb-2.0.4}/iotdb/thrift/confignode/IConfigNodeRPCService.py

@@ -1245,7 +1245,17 @@ class Iface(object):
 
     def dropSubscription(self, req):
         """
-        Close subscription
+        Close subscription by consumer
+
+        Parameters:
+         - req
+
+        """
+        pass
+
+    def dropSubscriptionById(self, req):
+        """
+        Close subscription by session
 
         Parameters:
          - req
@@ -5626,7 +5636,7 @@ class Client(Iface):
 
     def dropSubscription(self, req):
         """
-        Close subscription
+        Close subscription by consumer
 
         Parameters:
          - req
@@ -5658,6 +5668,40 @@ class Client(Iface):
             return result.success
         raise TApplicationException(TApplicationException.MISSING_RESULT, "dropSubscription failed: unknown result")
 
+    def dropSubscriptionById(self, req):
+        """
+        Close subscription by session
+
+        Parameters:
+         - req
+
+        """
+        self.send_dropSubscriptionById(req)
+        return self.recv_dropSubscriptionById()
+
+    def send_dropSubscriptionById(self, req):
+        self._oprot.writeMessageBegin('dropSubscriptionById', TMessageType.CALL, self._seqid)
+        args = dropSubscriptionById_args()
+        args.req = req
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_dropSubscriptionById(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = dropSubscriptionById_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "dropSubscriptionById failed: unknown result")
+
     def showSubscription(self, req):
         """
         Show Subscription on topic name, if name is empty, show all subscriptions
@@ -6735,6 +6779,7 @@ class Processor(Iface, TProcessor):
         self._processMap["closeConsumer"] = Processor.process_closeConsumer
         self._processMap["createSubscription"] = Processor.process_createSubscription
         self._processMap["dropSubscription"] = Processor.process_dropSubscription
+        self._processMap["dropSubscriptionById"] = Processor.process_dropSubscriptionById
         self._processMap["showSubscription"] = Processor.process_showSubscription
         self._processMap["getAllSubscriptionInfo"] = Processor.process_getAllSubscriptionInfo
         self._processMap["getRegionId"] = Processor.process_getRegionId
@@ -9592,6 +9637,29 @@ class Processor(Iface, TProcessor):
         oprot.writeMessageEnd()
         oprot.trans.flush()
 
+    def process_dropSubscriptionById(self, seqid, iprot, oprot):
+        args = dropSubscriptionById_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = dropSubscriptionById_result()
+        try:
+            result.success = self._handler.dropSubscriptionById(args.req)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("dropSubscriptionById", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
     def process_showSubscription(self, seqid, iprot, oprot):
         args = showSubscription_args()
         args.read(iprot)
@@ -24798,6 +24866,128 @@ dropSubscription_result.thrift_spec = (
 )
 
 
+class dropSubscriptionById_args(object):
+    """
+    Attributes:
+     - req
+
+    """
+
+
+    def __init__(self, req=None,):
+        self.req = req
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == -1:
+                if ftype == TType.STRUCT:
+                    self.req = TDropSubscriptionReq()
+                    self.req.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('dropSubscriptionById_args')
+        if self.req is not None:
+            oprot.writeFieldBegin('req', TType.STRUCT, -1)
+            self.req.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(dropSubscriptionById_args)
+dropSubscriptionById_args.thrift_spec = ()
+
+
+class dropSubscriptionById_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+
+
+    def __init__(self, success=None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRUCT:
+                    self.success = iotdb.thrift.common.ttypes.TSStatus()
+                    self.success.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('dropSubscriptionById_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(dropSubscriptionById_result)
+dropSubscriptionById_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [iotdb.thrift.common.ttypes.TSStatus, None], None, ),  # 0
+)
+
+
 class showSubscription_args(object):
     """
     Attributes: