apache-iotdb 1.2.1__tar.gz → 1.3.2__tar.gz

{apache-iotdb-1.2.1 → apache_iotdb-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-iotdb
-Version: 1.2.1
+Version: 1.3.2
 Summary: Apache IoTDB client API
 Home-page: https://github.com/apache/iotdb
 Author:  Apache Software Foundation
@@ -13,6 +13,11 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+Requires-Dist: thrift>=0.14.1
+Requires-Dist: pandas>=1.3.5
+Requires-Dist: numpy>=1.21.4
+Requires-Dist: sqlalchemy<1.5,>=1.4
+Requires-Dist: sqlalchemy-utils>=0.37.8
 
 <!--
 
@@ -328,12 +333,12 @@ session.execute_non_query_statement(sql)
 session.execute_statement(sql)
 ```
 
-### Schema Template
-#### Create Schema Template
+### Device Template
+#### Create Device Template
 The step for creating a metadata template is as follows
 1. Create the template class
 2. Adding child Node，InternalNode and MeasurementNode can be chose
-3. Execute create schema template function
+3. Execute create device template function
 
 ```python
 template = Template(name=template_name, share_time=True)
@@ -351,7 +356,7 @@ template.add_template(m_node_x)
 
 session.create_schema_template(template)
 ```
-#### Modify Schema Template nodes
+#### Modify Device Template nodes
 Modify nodes in a template, the template must be already created. These are functions that add or delete some measurement nodes.
 * add node in template
 ```python
@@ -363,18 +368,18 @@ session.add_measurements_in_template(template_name, measurements_path, data_type
 session.delete_node_in_template(template_name, path)
 ```
 
-#### Set Schema Template
+#### Set Device Template
 ```python
 session.set_schema_template(template_name, prefix_path)
 ```
 
-#### Uset Schema Template
+#### Uset Device Template
 ```python
 session.unset_schema_template(template_name, prefix_path)
 ```
 
-#### Show Schema Template
-* Show all schema templates
+#### Show Device Template
+* Show all device templates
 ```python
 session.show_all_templates()
 ```
@@ -393,22 +398,22 @@ session.count_measurements_in_template(template_name, path)
 session.is_path_exist_in_template(template_name, path)
 ```
 
-* Show nodes under in schema template
+* Show nodes under in device template
 ```python
 session.show_measurements_in_template(template_name)
 ```
 
-* Show the path prefix where a schema template is set
+* Show the path prefix where a device template is set
 ```python
 session.show_paths_template_set_on(template_name)
 ```
 
-* Show the path prefix where a schema template is used (i.e. the time series has been created)
+* Show the path prefix where a device template is used (i.e. the time series has been created)
 ```python
 session.show_paths_template_using_on(template_name)
 ```
 
-#### Drop Schema Template
+#### Drop Device Template
 Delete an existing metadata template，dropping an already set template is not supported
 ```python
 session.drop_schema_template("template_python")

{apache-iotdb-1.2.1 → apache_iotdb-1.3.2}/README.md

@@ -312,12 +312,12 @@ session.execute_non_query_statement(sql)
 session.execute_statement(sql)
 ```
 
-### Schema Template
-#### Create Schema Template
+### Device Template
+#### Create Device Template
 The step for creating a metadata template is as follows
 1. Create the template class
 2. Adding child Node，InternalNode and MeasurementNode can be chose
-3. Execute create schema template function
+3. Execute create device template function
 
 ```python
 template = Template(name=template_name, share_time=True)
@@ -335,7 +335,7 @@ template.add_template(m_node_x)
 
 session.create_schema_template(template)
 ```
-#### Modify Schema Template nodes
+#### Modify Device Template nodes
 Modify nodes in a template, the template must be already created. These are functions that add or delete some measurement nodes.
 * add node in template
 ```python
@@ -347,18 +347,18 @@ session.add_measurements_in_template(template_name, measurements_path, data_type
 session.delete_node_in_template(template_name, path)
 ```
 
-#### Set Schema Template
+#### Set Device Template
 ```python
 session.set_schema_template(template_name, prefix_path)
 ```
 
-#### Uset Schema Template
+#### Uset Device Template
 ```python
 session.unset_schema_template(template_name, prefix_path)
 ```
 
-#### Show Schema Template
-* Show all schema templates
+#### Show Device Template
+* Show all device templates
 ```python
 session.show_all_templates()
 ```
@@ -377,22 +377,22 @@ session.count_measurements_in_template(template_name, path)
 session.is_path_exist_in_template(template_name, path)
 ```
 
-* Show nodes under in schema template
+* Show nodes under in device template
 ```python
 session.show_measurements_in_template(template_name)
 ```
 
-* Show the path prefix where a schema template is set
+* Show the path prefix where a device template is set
 ```python
 session.show_paths_template_set_on(template_name)
 ```
 
-* Show the path prefix where a schema template is used (i.e. the time series has been created)
+* Show the path prefix where a device template is used (i.e. the time series has been created)
 ```python
 session.show_paths_template_using_on(template_name)
 ```
 
-#### Drop Schema Template
+#### Drop Device Template
 Delete an existing metadata template，dropping an already set template is not supported
 ```python
 session.drop_schema_template("template_python")

{apache-iotdb-1.2.1 → apache_iotdb-1.3.2}/apache_iotdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-iotdb
-Version: 1.2.1
+Version: 1.3.2
 Summary: Apache IoTDB client API
 Home-page: https://github.com/apache/iotdb
 Author:  Apache Software Foundation
@@ -13,6 +13,11 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+Requires-Dist: thrift>=0.14.1
+Requires-Dist: pandas>=1.3.5
+Requires-Dist: numpy>=1.21.4
+Requires-Dist: sqlalchemy<1.5,>=1.4
+Requires-Dist: sqlalchemy-utils>=0.37.8
 
 <!--
 
@@ -328,12 +333,12 @@ session.execute_non_query_statement(sql)
 session.execute_statement(sql)
 ```
 
-### Schema Template
-#### Create Schema Template
+### Device Template
+#### Create Device Template
 The step for creating a metadata template is as follows
 1. Create the template class
 2. Adding child Node，InternalNode and MeasurementNode can be chose
-3. Execute create schema template function
+3. Execute create device template function
 
 ```python
 template = Template(name=template_name, share_time=True)
@@ -351,7 +356,7 @@ template.add_template(m_node_x)
 
 session.create_schema_template(template)
 ```
-#### Modify Schema Template nodes
+#### Modify Device Template nodes
 Modify nodes in a template, the template must be already created. These are functions that add or delete some measurement nodes.
 * add node in template
 ```python
@@ -363,18 +368,18 @@ session.add_measurements_in_template(template_name, measurements_path, data_type
 session.delete_node_in_template(template_name, path)
 ```
 
-#### Set Schema Template
+#### Set Device Template
 ```python
 session.set_schema_template(template_name, prefix_path)
 ```
 
-#### Uset Schema Template
+#### Uset Device Template
 ```python
 session.unset_schema_template(template_name, prefix_path)
 ```
 
-#### Show Schema Template
-* Show all schema templates
+#### Show Device Template
+* Show all device templates
 ```python
 session.show_all_templates()
 ```
@@ -393,22 +398,22 @@ session.count_measurements_in_template(template_name, path)
 session.is_path_exist_in_template(template_name, path)
 ```
 
-* Show nodes under in schema template
+* Show nodes under in device template
 ```python
 session.show_measurements_in_template(template_name)
 ```
 
-* Show the path prefix where a schema template is set
+* Show the path prefix where a device template is set
 ```python
 session.show_paths_template_set_on(template_name)
 ```
 
-* Show the path prefix where a schema template is used (i.e. the time series has been created)
+* Show the path prefix where a device template is used (i.e. the time series has been created)
 ```python
 session.show_paths_template_using_on(template_name)
 ```
 
-#### Drop Schema Template
+#### Drop Device Template
 Delete an existing metadata template，dropping an already set template is not supported
 ```python
 session.drop_schema_template("template_python")

apache_iotdb-1.3.2/apache_iotdb.egg-info/requires.txt

@@ -0,0 +1,5 @@
+thrift>=0.14.1
+pandas>=1.3.5
+numpy>=1.21.4
+sqlalchemy<1.5,>=1.4
+sqlalchemy-utils>=0.37.8

{apache-iotdb-1.2.1 → apache_iotdb-1.3.2}/iotdb/IoTDBContainer.py

@@ -20,6 +20,7 @@ import time
 from os import environ
 
 from testcontainers.core.container import DockerContainer
+from testcontainers.core.exceptions import ContainerStartException
 from testcontainers.core.utils import setup_logger
 from testcontainers.core.waiting_utils import wait_container_is_ready
 
@@ -41,6 +42,13 @@ class IoTDBContainer(DockerContainer):
             self.get_container_host_ip(), self.get_exposed_port(6667), "root", "root"
         )
         session.open(False)
+        with session.execute_statement("SHOW CLUSTER") as session_data_set:
+            while session_data_set.has_next():
+                if (
+                    session_data_set.next().get_fields()[2].get_string_value()
+                    != "Running"
+                ):
+                    raise ContainerStartException("IoTDB is not started")
         session.close()
 
     def __init__(self, image="apache/iotdb:latest", **kwargs):

{apache-iotdb-1.2.1 → apache_iotdb-1.3.2}/iotdb/Session.py

@@ -59,8 +59,6 @@ from .thrift.rpc.ttypes import (
 )
 from .utils.IoTDBConnectionException import IoTDBConnectionException
 
-from .utils.IoTDBConstants import TSDataType
-
 logger = logging.getLogger("IoTDB")
 
 
@@ -176,9 +174,9 @@ class Session(object):
                 raise IoTDBConnectionException(e) from None
 
         if self.__enable_rpc_compression:
-            client = Client(TCompactProtocol.TCompactProtocol(transport))
+            client = Client(TCompactProtocol.TCompactProtocolAccelerated(transport))
         else:
-            client = Client(TBinaryProtocol.TBinaryProtocol(transport))
+            client = Client(TBinaryProtocol.TBinaryProtocolAccelerated(transport))
 
         open_req = TSOpenSessionReq(
             client_protocol=self.protocol_version,
@@ -310,9 +308,6 @@ class Session(object):
         :param attributes: Dictionary, attribute map for time series
         :param alias: String, measurement alias for time series
         """
-        data_type = data_type.value
-        encoding = encoding.value
-        compressor = compressor.value
         request = TSCreateTimeseriesReq(
             self.__session_id,
             ts_path,
@@ -349,9 +344,6 @@ class Session(object):
         :param encoding_lst: List of TSEncoding, encodings for time series
         :param compressor_lst: List of Compressor, compressing types for time series
         """
-        data_type_lst = [data_type.value for data_type in data_type_lst]
-        encoding_lst = [encoding.value for encoding in encoding_lst]
-        compressor_lst = [compressor.value for compressor in compressor_lst]
 
         request = TSCreateAlignedTimeseriesReq(
             self.__session_id,
@@ -399,9 +391,6 @@ class Session(object):
         :param attributes_lst: List of attribute Dictionary, attribute maps for time series
         :param alias_lst: List of alias, measurement alias for time series
         """
-        data_type_lst = [data_type.value for data_type in data_type_lst]
-        encoding_lst = [encoding.value for encoding in encoding_lst]
-        compressor_lst = [compressor.value for compressor in compressor_lst]
 
         request = TSCreateMultiTimeseriesReq(
             self.__session_id,
@@ -572,7 +561,6 @@ class Session(object):
         :param data_types: List of TSDataType, indicate the data type for each sensor
         :param values: List, values to be inserted, for each sensor
         """
-        data_types = [data_type.value for data_type in data_types]
         request = self.gen_insert_record_req(
             device_id, timestamp, measurements, data_types, values
         )
@@ -606,10 +594,6 @@ class Session(object):
         :param types_lst: 2-D List of TSDataType, each element of outer list indicates sensor data types of a device
         :param values_lst: 2-D List, values to be inserted, for each device
         """
-        type_values_lst = []
-        for types in types_lst:
-            data_types = [data_type.value for data_type in types]
-            type_values_lst.append(data_types)
         if self.__enable_redirection:
             request_group = {}
             for i in range(len(device_ids)):
@@ -622,7 +606,7 @@ class Session(object):
                 request.timestamps.append(times[i])
                 request.measurementsList.append(measurements_lst[i])
                 request.valuesList.append(
-                    Session.value_to_bytes(type_values_lst[i], values_lst[i])
+                    Session.value_to_bytes(types_lst[i], values_lst[i])
                 )
             for client, request in request_group.items():
                 try:
@@ -647,7 +631,7 @@ class Session(object):
             return 0
         else:
             request = self.gen_insert_records_req(
-                device_ids, times, measurements_lst, type_values_lst, values_lst
+                device_ids, times, measurements_lst, types_lst, values_lst
             )
             try:
                 return Session.verify_success(self.__client.insertRecords(request))
@@ -679,7 +663,6 @@ class Session(object):
         :param data_types: List of TSDataType, indicate the data type for each sensor
         :param values: List, values to be inserted, for each sensor
         """
-        data_types = [data_type.value for data_type in data_types]
         request = self.gen_insert_record_req(
             device_id, timestamp, measurements, data_types, values, True
         )
@@ -713,10 +696,6 @@ class Session(object):
         :param types_lst: 2-D List of TSDataType, each element of outer list indicates sensor data types of a device
         :param values_lst: 2-D List, values to be inserted, for each device
         """
-        type_values_lst = []
-        for types in types_lst:
-            data_types = [data_type.value for data_type in types]
-            type_values_lst.append(data_types)
         if self.__enable_redirection:
             request_group = {}
             for i in range(len(device_ids)):
@@ -729,7 +708,7 @@ class Session(object):
                 request.timestamps.append(times[i])
                 request.measurementsList.append(measurements_lst[i])
                 request.valuesList.append(
-                    Session.value_to_bytes(type_values_lst[i], values_lst[i])
+                    Session.value_to_bytes(types_lst[i], values_lst[i])
                 )
             for client, request in request_group.items():
                 try:
@@ -754,7 +733,7 @@ class Session(object):
             return 0
         else:
             request = self.gen_insert_records_req(
-                device_ids, times, measurements_lst, type_values_lst, values_lst, True
+                device_ids, times, measurements_lst, types_lst, values_lst, True
             )
             try:
                 return Session.verify_success(self.__client.insertRecords(request))
@@ -784,7 +763,6 @@ class Session(object):
         :param data_types: List of TSDataType, indicate the data type for each sensor
         :param values: List, values to be inserted, for each sensor
         """
-        data_types = [data_type.value for data_type in data_types]
         request = self.gen_insert_record_req(
             device_id, timestamp, measurements, data_types, values
         )
@@ -813,12 +791,8 @@ class Session(object):
         :param types_lst: 2-D List of TSDataType, each element of outer list indicates sensor data types of a device
         :param values_lst: 2-D List, values to be inserted, for each device
         """
-        type_values_lst = []
-        for types in types_lst:
-            data_types = [data_type.value for data_type in types]
-            type_values_lst.append(data_types)
         request = self.gen_insert_records_req(
-            device_ids, times, measurements_lst, type_values_lst, values_lst
+            device_ids, times, measurements_lst, types_lst, values_lst
         )
         try:
             return Session.verify_success(self.__client.testInsertRecords(request))
@@ -951,10 +925,7 @@ class Session(object):
                 request.measurementsList.append(tablet_lst[i].get_measurements())
                 request.valuesList.append(tablet_lst[i].get_binary_values())
                 request.sizeList.append(tablet_lst[i].get_row_number())
-                data_type_values = [
-                    data_type.value for data_type in tablet_lst[i].get_data_types()
-                ]
-                request.typesList.append(data_type_values)
+                request.typesList.append(tablet_lst[i].get_data_types())
             for client, request in request_group.items():
                 try:
                     Session.verify_success_with_redirection_for_multi_devices(
@@ -1045,10 +1016,7 @@ class Session(object):
                 request.measurementsList.append(tablet_lst[i].get_measurements())
                 request.valuesList.append(tablet_lst[i].get_binary_values())
                 request.sizeList.append(tablet_lst[i].get_row_number())
-                data_type_values = [
-                    data_type.value for data_type in tablet_lst[i].get_data_types()
-                ]
-                request.typesList.append(data_type_values)
+                request.typesList.append(tablet_lst[i].get_data_types())
             for client, request in request_group.items():
                 try:
                     Session.verify_success_with_redirection_for_multi_devices(
@@ -1243,7 +1211,6 @@ class Session(object):
         for values, data_types, measurements in zip(
             values_list, types_list, measurements_list
         ):
-            data_types = [data_type.value for data_type in data_types]
             if (len(values) != len(data_types)) or (len(values) != len(measurements)):
                 raise RuntimeError(
                     "insert records of one device error: deviceIds, times, measurementsList and valuesList's size should be equal"
@@ -1303,14 +1270,13 @@ class Session(object):
                 raise IoTDBConnectionException(self.connection_error_msg()) from None
 
     def gen_insert_tablet_req(self, tablet, is_aligned=False):
-        data_type_values = [data_type.value for data_type in tablet.get_data_types()]
         return TSInsertTabletReq(
             self.__session_id,
             tablet.get_device_id(),
             tablet.get_measurements(),
             tablet.get_binary_values(),
             tablet.get_binary_timestamps(),
-            data_type_values,
+            tablet.get_data_types(),
             tablet.get_row_number(),
             is_aligned,
         )
@@ -1323,14 +1289,11 @@ class Session(object):
         type_lst = []
         size_lst = []
         for tablet in tablet_lst:
-            data_type_values = [
-                data_type.value for data_type in tablet.get_data_types()
-            ]
             device_id_lst.append(tablet.get_device_id())
             measurements_lst.append(tablet.get_measurements())
             values_lst.append(tablet.get_binary_values())
             timestamps_lst.append(tablet.get_binary_timestamps())
-            type_lst.append(data_type_values)
+            type_lst.append(tablet.get_data_types())
             size_lst.append(tablet.get_row_number())
         return TSInsertTabletsReq(
             self.__session_id,
@@ -1440,41 +1403,41 @@ class Session(object):
         format_str_list = [">"]
         values_tobe_packed = []
         for data_type, value in zip(data_types, values):
-            if data_type == TSDataType.BOOLEAN.value:
-                format_str_list.append("c")
-                format_str_list.append("?")
-                values_tobe_packed.append(bytes([TSDataType.BOOLEAN.value]))
+            # BOOLEAN
+            if data_type == 0:
+                format_str_list.append("c?")
+                values_tobe_packed.append(b"\x00")
                 values_tobe_packed.append(value)
-            elif data_type == TSDataType.INT32.value:
-                format_str_list.append("c")
-                format_str_list.append("i")
-                values_tobe_packed.append(bytes([TSDataType.INT32.value]))
+            # INT32
+            elif data_type == 1:
+                format_str_list.append("ci")
+                values_tobe_packed.append(b"\x01")
                 values_tobe_packed.append(value)
-            elif data_type == TSDataType.INT64.value:
-                format_str_list.append("c")
-                format_str_list.append("q")
-                values_tobe_packed.append(bytes([TSDataType.INT64.value]))
+            # INT64
+            elif data_type == 2:
+                format_str_list.append("cq")
+                values_tobe_packed.append(b"\x02")
                 values_tobe_packed.append(value)
-            elif data_type == TSDataType.FLOAT.value:
-                format_str_list.append("c")
-                format_str_list.append("f")
-                values_tobe_packed.append(bytes([TSDataType.FLOAT.value]))
+            # FLOAT
+            elif data_type == 3:
+                format_str_list.append("cf")
+                values_tobe_packed.append(b"\x03")
                 values_tobe_packed.append(value)
-            elif data_type == TSDataType.DOUBLE.value:
-                format_str_list.append("c")
-                format_str_list.append("d")
-                values_tobe_packed.append(bytes([TSDataType.DOUBLE.value]))
+            # DOUBLE
+            elif data_type == 4:
+                format_str_list.append("cd")
+                values_tobe_packed.append(b"\x04")
                 values_tobe_packed.append(value)
-            elif data_type == TSDataType.TEXT.value:
+            # TEXT
+            elif data_type == 5:
                 if isinstance(value, str):
                     value_bytes = bytes(value, "utf-8")
                 else:
                     value_bytes = value
-                format_str_list.append("c")
-                format_str_list.append("i")
+                format_str_list.append("ci")
                 format_str_list.append(str(len(value_bytes)))
                 format_str_list.append("s")
-                values_tobe_packed.append(bytes([TSDataType.TEXT.value]))
+                values_tobe_packed.append(b"\x05")
                 values_tobe_packed.append(len(value_bytes))
                 values_tobe_packed.append(value_bytes)
             else:
@@ -1848,7 +1811,7 @@ class Session(object):
 
     def create_schema_template(self, template: Template):
         """
-        create schema template, users using this method should use the template class as an argument
+        create device template, users using this method should use the template class as an argument
         :param template: The template contains multiple child node(see Template.py)
         """
         bytes_array = template.serialize
@@ -1871,7 +1834,7 @@ class Session(object):
 
     def drop_schema_template(self, template_name: str):
         """
-        drop schema template, this method should be used to the template unset anything
+        drop device template, this method should be used to the template unset anything
         :param template_name: template name
         """
         request = TSDropSchemaTemplateReq(self.__session_id, template_name)
@@ -1913,9 +1876,9 @@ class Session(object):
             template_name,
             is_aligned,
             measurements_path,
-            list(map(lambda x: x.value, data_types)),
-            list(map(lambda x: x.value, encodings)),
-            list(map(lambda x: x.value, compressors)),
+            data_types,
+            encodings,
+            compressors,
         )
         try:
             return Session.verify_success(self.__client.appendSchemaTemplate(request))
@@ -1975,7 +1938,7 @@ class Session(object):
 
     def unset_schema_template(self, template_name, prefix_path):
         """
-        unset schema template from prefix path, this method unsetting the template from entities,
+        unset device template from prefix path, this method unsetting the template from entities,
         which have already inserted records using the template, is not supported.
         :param template_name: template name
         :param prefix_path:
@@ -1999,7 +1962,7 @@ class Session(object):
 
     def count_measurements_in_template(self, template_name: str):
         """
-        drop schema template, this method should be used to the template unset anything
+        drop device template, this method should be used to the template unset anything
         :param template_name: template name
         """
         request = TSQueryTemplateReq(
@@ -2105,7 +2068,7 @@ class Session(object):
 
     def show_all_templates(self):
         """
-        show all schema templates
+        show all device templates
         """
         request = TSQueryTemplateReq(
             self.__session_id,
@@ -2130,7 +2093,7 @@ class Session(object):
 
     def show_paths_template_set_on(self, template_name):
         """
-        show the path prefix where a schema template is set
+        show the path prefix where a device template is set
         :param template_name:
         """
         request = TSQueryTemplateReq(
@@ -2154,7 +2117,7 @@ class Session(object):
 
     def show_paths_template_using_on(self, template_name):
         """
-        show the path prefix where a schema template is used
+        show the path prefix where a device template is used
         :param template_name:
         """
         request = TSQueryTemplateReq(