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

{apache-iotdb-1.3.4 → apache-iotdb-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-iotdb
-Version: 1.3.4
+Version: 2.0.2
 Summary: Apache IoTDB client API
 Author-email: Apache IoTDB <dev@iotdb.apache.org>
 License: Apache License, Version 2.0
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: thrift>=0.14.1
 Requires-Dist: pandas>=1.0.0
 Requires-Dist: numpy>=1.0.0
-Requires-Dist: sqlalchemy<1.5,>=1.4
+Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: sqlalchemy-utils>=0.37.8
 
 <!--
@@ -69,9 +69,9 @@ You have to install thrift (>=0.14.1) before using the package.
 
 First, download the latest package: `pip3 install apache-iotdb`
 
-You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/client-py/SessionExample.py)
+You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionExample.py)
 
-An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/client-py/SessionAlignedTimeseriesExample.py)
+An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionAlignedTimeseriesExample.py)
 
 (you need to add `import iotdb` in the head of the file)
 

{apache-iotdb-1.3.4 → apache-iotdb-2.0.2}/README.md

@@ -47,9 +47,9 @@ You have to install thrift (>=0.14.1) before using the package.
 
 First, download the latest package: `pip3 install apache-iotdb`
 
-You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/client-py/SessionExample.py)
+You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionExample.py)
 
-An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/client-py/SessionAlignedTimeseriesExample.py)
+An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionAlignedTimeseriesExample.py)
 
 (you need to add `import iotdb` in the head of the file)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-iotdb
-Version: 1.3.4
+Version: 2.0.2
 Summary: Apache IoTDB client API
 Author-email: Apache IoTDB <dev@iotdb.apache.org>
 License: Apache License, Version 2.0
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: thrift>=0.14.1
 Requires-Dist: pandas>=1.0.0
 Requires-Dist: numpy>=1.0.0
-Requires-Dist: sqlalchemy<1.5,>=1.4
+Requires-Dist: sqlalchemy>=1.4
 Requires-Dist: sqlalchemy-utils>=0.37.8
 
 <!--
@@ -69,9 +69,9 @@ You have to install thrift (>=0.14.1) before using the package.
 
 First, download the latest package: `pip3 install apache-iotdb`
 
-You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/client-py/SessionExample.py)
+You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionExample.py)
 
-An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/client-py/SessionAlignedTimeseriesExample.py)
+An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionAlignedTimeseriesExample.py)
 
 (you need to add `import iotdb` in the head of the file)
 

{apache-iotdb-1.3.4 → apache-iotdb-2.0.2}/apache_iotdb.egg-info/SOURCES.txt

@@ -6,24 +6,20 @@ apache_iotdb.egg-info/dependency_links.txt
 apache_iotdb.egg-info/entry_points.txt
 apache_iotdb.egg-info/requires.txt
 apache_iotdb.egg-info/top_level.txt
-iotdb/IoTDBContainer.py
 iotdb/Session.py
 iotdb/SessionPool.py
 iotdb/__init__.py
+iotdb/table_session.py
+iotdb/table_session_pool.py
 iotdb/dbapi/Connection.py
 iotdb/dbapi/Cursor.py
 iotdb/dbapi/Exceptions.py
 iotdb/dbapi/__init__.py
-iotdb/dbapi/tests/__init__.py
-iotdb/dbapi/tests/test_connection.py
-iotdb/dbapi/tests/test_cursor.py
 iotdb/sqlalchemy/IoTDBDialect.py
 iotdb/sqlalchemy/IoTDBIdentifierPreparer.py
 iotdb/sqlalchemy/IoTDBSQLCompiler.py
 iotdb/sqlalchemy/IoTDBTypeCompiler.py
 iotdb/sqlalchemy/__init__.py
-iotdb/sqlalchemy/tests/__init__.py
-iotdb/sqlalchemy/tests/test_dialect.py
 iotdb/template/MeasurementNode.py
 iotdb/template/Template.py
 iotdb/template/TemplateNode.py
@@ -57,15 +53,24 @@ iotdb/utils/Tablet.py
 iotdb/utils/__init__.py
 tests/__init__.py
 tests/integration/__init__.py
+tests/integration/iotdb_container.py
 tests/integration/tablet_performance_comparison.py
 tests/integration/test_aligned_timeseries.py
 tests/integration/test_dataframe.py
 tests/integration/test_delete_data.py
 tests/integration/test_new_data_types.py
 tests/integration/test_one_device.py
+tests/integration/test_relational_session.py
 tests/integration/test_session.py
 tests/integration/test_session_pool.py
+tests/integration/test_tablemodel_insert.py
 tests/integration/test_tablet.py
 tests/integration/test_todf.py
+tests/integration/test_treemodel_insert.py
+tests/integration/dbapi/__init__.py
+tests/integration/dbapi/test_connection.py
+tests/integration/dbapi/test_cursor.py
+tests/integration/sqlalchemy/__init__.py
+tests/integration/sqlalchemy/test_dialect.py
 tests/unit/__init__.py
 tests/unit/test_numpy_tablet.py

{apache-iotdb-1.3.4 → apache-iotdb-2.0.2}/apache_iotdb.egg-info/requires.txt

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

{apache-iotdb-1.3.4 → apache-iotdb-2.0.2}/iotdb/Session.py

@@ -70,11 +70,12 @@ class Session(object):
     SUCCESS_STATUS = 200
     MULTIPLE_ERROR = 302
     REDIRECTION_RECOMMEND = 400
-    DEFAULT_FETCH_SIZE = 10000
+    DEFAULT_FETCH_SIZE = 5000
     DEFAULT_USER = "root"
     DEFAULT_PASSWORD = "root"
     DEFAULT_ZONE_ID = time.strftime("%z")
     RETRY_NUM = 3
+    SQL_DIALECT = "tree"
 
     def __init__(
         self,
@@ -108,6 +109,8 @@ class Session(object):
         self.__enable_redirection = enable_redirection
         self.__device_id_to_endpoint = None
         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
@@ -191,12 +194,15 @@ class Session(object):
         else:
             client = Client(TBinaryProtocol.TBinaryProtocolAccelerated(transport))
 
+        configuration = {"version": "V_1_0", "sql_dialect": self.sql_dialect}
+        if self.database is not None:
+            configuration["db"] = self.database
         open_req = TSOpenSessionReq(
             client_protocol=self.protocol_version,
             username=self.__user,
             password=self.__password,
             zoneId=self.__zone_id,
-            configuration={"version": "V_1_0"},
+            configuration=configuration,
         )
 
         try:
@@ -535,6 +541,15 @@ class Session(object):
             string_values = [string_values]
         if type(measurements) == str:
             measurements = [measurements]
+        if self.__has_none_value(string_values):
+            filtered_measurements, filtered_values = zip(
+                *[(m, v) for m, v in zip(measurements, string_values) if v is not None]
+            )
+            measurements = list(filtered_measurements)
+            values = list(filtered_values)
+            if len(measurements) == 0 or len(values) == 0:
+                logger.info("All inserting values are none!")
+                return
         request = self.gen_insert_str_record_req(
             device_id, timestamp, measurements, string_values
         )
@@ -566,6 +581,15 @@ class Session(object):
             string_values = [string_values]
         if type(measurements) == str:
             measurements = [measurements]
+        if self.__has_none_value(string_values):
+            filtered_measurements, filtered_values = zip(
+                *[(m, v) for m, v in zip(measurements, string_values) if v is not None]
+            )
+            measurements = list(filtered_measurements)
+            values = list(filtered_values)
+            if len(measurements) == 0 or len(values) == 0:
+                logger.info("All inserting values are none!")
+                return
         request = self.gen_insert_str_record_req(
             device_id, timestamp, measurements, string_values, True
         )
@@ -601,6 +625,20 @@ 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
         """
+        if self.__has_none_value(values):
+            filtered_measurements, filtered_data_types, filtered_values = zip(
+                *[
+                    (m, d, v)
+                    for m, d, v in zip(measurements, data_types, values)
+                    if v is not None
+                ]
+            )
+            measurements = list(filtered_measurements)
+            data_types = list(filtered_data_types)
+            values = list(filtered_values)
+            if len(measurements) == 0 or len(data_types) == 0 or len(values) == 0:
+                logger.info("All inserting values are none!")
+                return
         request = self.gen_insert_record_req(
             device_id, timestamp, measurements, data_types, values
         )
@@ -634,6 +672,19 @@ 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
         """
+        if self.__has_none_value(values_lst):
+            (
+                device_ids,
+                times,
+                measurements_lst,
+                types_lst,
+                values_lst,
+            ) = self.__filter_lists_by_values(
+                device_ids, times, measurements_lst, types_lst, values_lst
+            )
+            if len(device_ids) == 0:
+                logger.info("All inserting values are none!")
+                return
         if self.__enable_redirection:
             request_group = {}
             for i in range(len(device_ids)):
@@ -703,6 +754,20 @@ 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
         """
+        if self.__has_none_value(values):
+            filtered_measurements, filtered_data_types, filtered_values = zip(
+                *[
+                    (m, d, v)
+                    for m, d, v in zip(measurements, data_types, values)
+                    if v is not None
+                ]
+            )
+            measurements = list(filtered_measurements)
+            data_types = list(filtered_data_types)
+            values = list(filtered_values)
+            if len(measurements) == 0 or len(data_types) == 0 or len(values) == 0:
+                logger.info("All inserting values are none!")
+                return
         request = self.gen_insert_record_req(
             device_id, timestamp, measurements, data_types, values, True
         )
@@ -736,6 +801,19 @@ 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
         """
+        if self.__has_none_value(values_lst):
+            (
+                device_ids,
+                times,
+                measurements_lst,
+                types_lst,
+                values_lst,
+            ) = self.__filter_lists_by_values(
+                device_ids, times, measurements_lst, types_lst, values_lst
+            )
+            if len(device_ids) == 0:
+                logger.info("All inserting values are none!")
+                return
         if self.__enable_redirection:
             request_group = {}
             for i in range(len(device_ids)):
@@ -928,13 +1006,15 @@ class Session(object):
         """
         request = self.gen_insert_tablet_req(tablet)
         try:
-            connection = self.get_connection(tablet.get_device_id())
+            connection = self.get_connection(tablet.get_insert_target_name())
             request.sessionId = connection.session_id
             return Session.verify_success_with_redirection(
                 connection.client.insertTablet(request)
             )
         except RedirectException as e:
-            return self.handle_redirection(tablet.get_device_id(), e.redirect_node)
+            return self.handle_redirection(
+                tablet.get_insert_target_name(), e.redirect_node
+            )
         except TTransport.TException as e:
             if self.reconnect():
                 try:
@@ -953,14 +1033,14 @@ class Session(object):
         if self.__enable_redirection:
             request_group = {}
             for i in range(len(tablet_lst)):
-                connection = self.get_connection(tablet_lst[i].get_device_id())
+                connection = self.get_connection(tablet_lst[i].get_insert_target_name())
                 request = request_group.setdefault(
                     connection.client,
                     TSInsertTabletsReq(
                         connection.session_id, [], [], [], [], [], [], False
                     ),
                 )
-                request.prefixPaths.append(tablet_lst[i].get_device_id())
+                request.prefixPaths.append(tablet_lst[i].get_insert_target_name())
                 request.timestampsList.append(tablet_lst[i].get_binary_timestamps())
                 request.measurementsList.append(tablet_lst[i].get_measurements())
                 request.valuesList.append(tablet_lst[i].get_binary_values())
@@ -1019,13 +1099,15 @@ class Session(object):
         """
         request = self.gen_insert_tablet_req(tablet, True)
         try:
-            connection = self.get_connection(tablet.get_device_id())
+            connection = self.get_connection(tablet.get_insert_target_name())
             request.sessionId = connection.session_id
             return Session.verify_success_with_redirection(
                 connection.client.insertTablet(request)
             )
         except RedirectException as e:
-            return self.handle_redirection(tablet.get_device_id(), e.redirect_node)
+            return self.handle_redirection(
+                tablet.get_insert_target_name(), e.redirect_node
+            )
         except TTransport.TException as e:
             if self.reconnect():
                 try:
@@ -1044,14 +1126,14 @@ class Session(object):
         if self.__enable_redirection:
             request_group = {}
             for i in range(len(tablet_lst)):
-                connection = self.get_connection(tablet_lst[i].get_device_id())
+                connection = self.get_connection(tablet_lst[i].get_insert_target_name())
                 request = request_group.setdefault(
                     connection.client,
                     TSInsertTabletsReq(
                         connection.session_id, [], [], [], [], [], [], True
                     ),
                 )
-                request.prefixPaths.append(tablet_lst[i].get_device_id())
+                request.prefixPaths.append(tablet_lst[i].get_insert_target_name())
                 request.timestampsList.append(tablet_lst[i].get_binary_timestamps())
                 request.measurementsList.append(tablet_lst[i].get_measurements())
                 request.valuesList.append(tablet_lst[i].get_binary_values())
@@ -1096,6 +1178,36 @@ class Session(object):
                         self.connection_error_msg()
                     ) from None
 
+    def insert_relational_tablet(self, tablet):
+        """
+        insert one tablet, for example three column in the table1 can form a tablet:
+            timestamps,    id1,  attr1,    m1
+                     1,  id:1,  attr:1,   1.0
+                     2,  id:1,  attr:1,   2.0
+                     3,  id:2,  attr:2,   3.0
+        :param tablet: a tablet specified above
+        """
+        request = self.gen_insert_relational_tablet_req(tablet)
+        try:
+            connection = self.get_connection(tablet.get_insert_target_name())
+            request.sessionId = connection.session_id
+            return Session.verify_success_with_redirection(
+                connection.client.insertTablet(request)
+            )
+        except RedirectException as e:
+            return self.handle_redirection(
+                tablet.get_insert_target_name(), e.redirect_node
+            )
+        except TTransport.TException as e:
+            if self.reconnect():
+                try:
+                    request.sessionId = self.__session_id
+                    return Session.verify_success(self.__client.insertTablet(request))
+                except TTransport.TException as e1:
+                    raise IoTDBConnectionException(e1) from None
+            else:
+                raise IoTDBConnectionException(self.connection_error_msg()) from None
+
     def insert_records_of_one_device(
         self, device_id, times_list, measurements_list, types_list, values_list
     ):
@@ -1312,13 +1424,27 @@ class Session(object):
     def gen_insert_tablet_req(self, tablet, is_aligned=False):
         return TSInsertTabletReq(
             self.__session_id,
-            tablet.get_device_id(),
+            tablet.get_insert_target_name(),
+            tablet.get_measurements(),
+            tablet.get_binary_values(),
+            tablet.get_binary_timestamps(),
+            tablet.get_data_types(),
+            tablet.get_row_number(),
+            is_aligned,
+        )
+
+    def gen_insert_relational_tablet_req(self, tablet, is_aligned=False):
+        return TSInsertTabletReq(
+            self.__session_id,
+            tablet.get_insert_target_name(),
             tablet.get_measurements(),
             tablet.get_binary_values(),
             tablet.get_binary_timestamps(),
             tablet.get_data_types(),
             tablet.get_row_number(),
             is_aligned,
+            True,
+            tablet.get_column_categories(),
         )
 
     def gen_insert_tablets_req(self, tablet_lst, is_aligned=False):
@@ -1329,7 +1455,7 @@ class Session(object):
         type_lst = []
         size_lst = []
         for tablet in tablet_lst:
-            device_id_lst.append(tablet.get_device_id())
+            device_id_lst.append(tablet.get_insert_target_name())
             measurements_lst.append(tablet.get_measurements())
             values_lst.append(tablet.get_binary_values())
             timestamps_lst.append(tablet.get_binary_timestamps())
@@ -1402,6 +1528,18 @@ class Session(object):
             else:
                 raise IoTDBConnectionException(self.connection_error_msg()) from None
 
+        previous_db = self.database
+        if resp.database is not None:
+            self.database = resp.database
+        if previous_db != self.database and self.__endpoint_to_connection is not None:
+            iterator = iter(self.__endpoint_to_connection.items())
+            for entry in list(iterator):
+                endpoint, connection = entry
+                if connection != self.__default_connection:
+                    try:
+                        connection.change_database(sql)
+                    except Exception as e:
+                        self.__endpoint_to_connection.pop(endpoint)
         return Session.verify_success(resp.status)
 
     def execute_statement(self, sql: str, timeout=0):
@@ -1563,7 +1701,7 @@ class Session(object):
         ):
             return 0
 
-        raise RuntimeError(str(status.code) + ": " + status.message)
+        raise RuntimeError(f"{status.code}: {status.message}")
 
     @staticmethod
     def verify_success_by_list(status_list: list):
@@ -1571,14 +1709,15 @@ class Session(object):
         verify success of operation
         :param status_list: execution result status
         """
-        message = str(Session.MULTIPLE_ERROR) + ": "
-        for status in status_list:
-            if (
-                status.code != Session.SUCCESS_STATUS
-                and status.code != Session.REDIRECTION_RECOMMEND
-            ):
-                message += status.message + "; "
-        raise RuntimeError(message)
+        error_messages = [
+            status.message
+            for status in status_list
+            if status.code
+            not in {Session.SUCCESS_STATUS, Session.REDIRECTION_RECOMMEND}
+        ]
+        if error_messages:
+            message = f"{Session.MULTIPLE_ERROR}: {'; '.join(error_messages)}"
+            raise RuntimeError(message)
 
     @staticmethod
     def verify_success_with_redirection(status: TSStatus):
@@ -1879,6 +2018,49 @@ class Session(object):
         )
         return request
 
+    def __has_none_value(self, values_list) -> bool:
+        for item in values_list:
+            if isinstance(item, list):
+                if self.__has_none_value(item):
+                    return True
+            elif item is None:
+                return True
+        return False
+
+    @staticmethod
+    def __filter_lists_by_values(
+        device_lst, time_lst, measurements_lst, types_lst, values_lst
+    ):
+        filtered_devices = []
+        filtered_times = []
+        filtered_measurements = []
+        filtered_types = []
+        filtered_values = []
+
+        for device, time_, measurements, types, values in zip(
+            device_lst, time_lst, measurements_lst, types_lst, values_lst
+        ):
+            filtered_row = [
+                (m, t, v)
+                for m, t, v in zip(measurements, types, values)
+                if v is not None
+            ]
+            if filtered_row:
+                f_measurements, f_types, f_values = zip(*filtered_row)
+                filtered_measurements.append(list(f_measurements))
+                filtered_types.append(list(f_types))
+                filtered_values.append(list(f_values))
+                filtered_devices.append(device)
+                filtered_times.append(time_)
+
+        return (
+            filtered_devices,
+            filtered_times,
+            filtered_measurements,
+            filtered_types,
+            filtered_values,
+        )
+
     def create_schema_template(self, template: Template):
         warnings.warn(
             "The APIs about template are deprecated and will be removed in future versions. Use sql instead.",
@@ -2290,6 +2472,17 @@ class SessionConnection(object):
         self.session_id = session_id
         self.statement_id = statement_id
 
+    def change_database(self, sql):
+        try:
+            self.client.executeUpdateStatement(
+                TSExecuteStatementReq(self.session_id, sql, self.statement_id)
+            )
+        except TTransport.TException as e:
+            raise IoTDBConnectionException(
+                "failed to change database",
+                e,
+            ) from None
+
     def close_connection(self, req):
         try:
             self.client.closeSession(req)

{apache-iotdb-1.3.4 → apache-iotdb-2.0.2}/iotdb/SessionPool.py

@@ -27,6 +27,7 @@ DEFAULT_MULTIPIE = 5
 DEFAULT_FETCH_SIZE = 5000
 DEFAULT_MAX_RETRY = 3
 DEFAULT_TIME_ZONE = "UTC+8"
+SQL_DIALECT = "tree"
 logger = logging.getLogger("IoTDB")
 
 
@@ -42,6 +43,7 @@ class PoolConfig(object):
         time_zone: str = DEFAULT_TIME_ZONE,
         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,
@@ -61,6 +63,7 @@ class PoolConfig(object):
         self.time_zone = time_zone
         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
@@ -77,6 +80,8 @@ class SessionPool(object):
         self.__queue = Queue(max_pool_size)
         self.__lock = Lock()
         self.__closed = False
+        self.sql_dialect = SQL_DIALECT
+        self.database = None
 
     def __construct_session(self) -> Session:
         if len(self.__pool_config.node_urls) > 0:
@@ -86,10 +91,13 @@ class SessionPool(object):
                 self.__pool_config.password,
                 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
 
         else:
             session = Session(
@@ -99,10 +107,13 @@ class SessionPool(object):
                 self.__pool_config.password,
                 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
 
         session.open(self.__pool_config.enable_compression)
         return session
@@ -114,6 +125,7 @@ class SessionPool(object):
         return q
 
     def get_session(self) -> Session:
+
         if self.__closed:
             raise ConnectionError("SessionPool has already been closed.")
 
@@ -148,6 +160,7 @@ 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."
@@ -160,6 +173,7 @@ 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.4 → apache-iotdb-2.0.2}/iotdb/sqlalchemy/IoTDBDialect.py

@@ -18,13 +18,14 @@
 
 from sqlalchemy import types, util
 from sqlalchemy.engine import default
+from sqlalchemy.sql import text
 from sqlalchemy.sql.sqltypes import String
 
 from iotdb import dbapi
 
+from .IoTDBIdentifierPreparer import IoTDBIdentifierPreparer
 from .IoTDBSQLCompiler import IoTDBSQLCompiler
 from .IoTDBTypeCompiler import IoTDBTypeCompiler
-from .IoTDBIdentifierPreparer import IoTDBIdentifierPreparer
 
 TYPES_MAP = {
     "BOOLEAN": types.Boolean,
@@ -68,6 +69,10 @@ class IoTDBDialect(default.DefaultDialect):
         opts.update({"sqlalchemy_mode": True})
         return [[], opts]
 
+    @classmethod
+    def import_dbapi(cls):
+        return dbapi
+
     @classmethod
     def dbapi(cls):
         return dbapi
@@ -79,17 +84,19 @@ class IoTDBDialect(default.DefaultDialect):
         return table_name in self.get_table_names(connection, schema=schema)
 
     def get_schema_names(self, connection, **kw):
-        cursor = connection.execute("SHOW DATABASES")
+        cursor = connection.execute(text("SHOW DATABASES"))
         return [row[0] for row in cursor.fetchall()]
 
     def get_table_names(self, connection, schema=None, **kw):
         cursor = connection.execute(
-            "SHOW DEVICES %s.**" % (schema or self.default_schema_name)
+            text("SHOW DEVICES %s.**" % (schema or self.default_schema_name))
         )
         return [row[0].replace(schema + ".", "", 1) for row in cursor.fetchall()]
 
     def get_columns(self, connection, table_name, schema=None, **kw):
-        cursor = connection.execute("SHOW TIMESERIES %s.%s.*" % (schema, table_name))
+        cursor = connection.execute(
+            text("SHOW TIMESERIES %s.%s.*" % (schema, table_name))
+        )
         columns = [self._general_time_column_info()]
         for row in cursor.fetchall():
             columns.append(self._create_column_info(row, schema, table_name))