e6data-python-connector 2.1.10.dev1__tar.gz → 2.1.11__tar.gz

{e6data-python-connector-2.1.10.dev1/e6data_python_connector.egg-info → e6data-python-connector-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.10.dev1
+Version: 2.1.11
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.

{e6data-python-connector-2.1.10.dev1 → e6data-python-connector-2.1.11}/e6data_python_connector/datainputstream.py

@@ -174,7 +174,7 @@ def read_values_from_array(query_columns_description: list, dis: DataInputStream
     return value_array
 
 
-def reconstruct_chunk(buffer):
+def read_rows_from_chunk(query_columns_description: list, buffer):
     # Create a transport and protocol instance for deserialization
     transport = TTransport.TMemoryBuffer(buffer)
     protocol = TBinaryProtocol.TBinaryProtocolAccelerated(transport)
@@ -182,16 +182,8 @@ def reconstruct_chunk(buffer):
     # Create an instance of the Thrift struct and read from the protocol
     chunk = Chunk()
     chunk.read(protocol)
-    return chunk
-
-
-def read_rows_from_chunk(query_columns_description: list, buffer):
-    chunk = reconstruct_chunk(buffer)
-    return deserialize_chunk_to_rows(query_columns_description, chunk)
-
 
-def deserialize_chunk_to_rows(query_columns_description: list, chunk):
-    if chunk is None or chunk.size <= 0:
+    if chunk.size <= 0:
         return None
 
     rows = list()

{e6data-python-connector-2.1.10.dev1 → e6data-python-connector-2.1.11}/e6data_python_connector/e6data_grpc.py

@@ -19,8 +19,7 @@ import grpc
 
 from e6data_python_connector.common import DBAPITypeObject, ParamEscaper, DBAPICursor
 from e6data_python_connector.constants import *
-from e6data_python_connector.datainputstream import get_query_columns_info, read_rows_from_chunk, reconstruct_chunk, \
-    deserialize_chunk_to_rows
+from e6data_python_connector.datainputstream import get_query_columns_info, read_rows_from_chunk
 from e6data_python_connector.server import e6x_engine_pb2_grpc, e6x_engine_pb2
 from e6data_python_connector.typeId import *
 
@@ -73,11 +72,11 @@ class HiveParamEscaper(ParamEscaper):
             item = item.decode('utf-8')
         return "'{}'".format(
             item
-                .replace('\\', '\\\\')
-                .replace("'", "\\'")
-                .replace('\r', '\\r')
-                .replace('\n', '\\n')
-                .replace('\t', '\\t')
+            .replace('\\', '\\\\')
+            .replace("'", "\\'")
+            .replace('\r', '\\r')
+            .replace('\n', '\\n')
+            .replace('\t', '\\t')
         )
 
 
@@ -163,12 +162,14 @@ class Connection(object):
         self._keepalive_timeout_ms = 900000
         self._max_receive_message_length = -1
         self._max_send_message_length = 300 * 1024 * 1024  # mb
+        self._grpc_prepare_timeout = 10 * 60  # 10 minutes
 
         if type(grpc_options) == dict:
             self._keepalive_timeout_ms = grpc_options.get('keepalive_timeout_ms') or self._keepalive_timeout_ms
             self._max_receive_message_length = grpc_options.get(
                 'max_receive_message_length') or self._max_receive_message_length
             self._max_send_message_length = grpc_options.get('max_send_message_length') or self._max_send_message_length
+            self._grpc_prepare_timeout = grpc_options.get('grpc_prepare_timeout') or self._grpc_prepare_timeout
         self._create_client()
 
     def _create_client(self):
@@ -414,6 +415,10 @@ class Cursor(DBAPICursor):
     def close(self):
         """Close the operation handle"""
         # self.connection.close()
+        try:
+            self.clear()
+        except:
+            pass
         self._arraysize = None
         self.connection = None
         self._data = None
@@ -506,7 +511,8 @@ class Cursor(DBAPICursor):
             )
             prepare_statement_response = client.prepareStatementV2(
                 prepare_statement_request,
-                metadata=self.metadata
+                metadata=self.metadata,
+                timeout=self._grpc_prepare_timeout
             )
 
             self._query_id = prepare_statement_response.queryId
@@ -520,14 +526,15 @@ class Cursor(DBAPICursor):
                 execute_statement_request,
                 metadata=self.metadata
             )
-        self.update_meta_data()
+        self.update_mete_data()
         return self._query_id
 
     @property
     def rowcount(self):
+        self.update_mete_data()
         return self._rowcount
 
-    def update_meta_data(self):
+    def update_mete_data(self):
         result_meta_data_request = e6x_engine_pb2.GetResultMetadataRequest(
             engineIP=self._engine_ip,
             sessionId=self.connection.get_session_id,
@@ -571,7 +578,7 @@ class Cursor(DBAPICursor):
                 return
             yield rows
 
-    def get_next_batch(self):
+    def fetch_batch(self):
         client = self.connection.client
         get_next_result_batch_request = e6x_engine_pb2.GetNextResultBatchRequest(
             engineIP=self._engine_ip,
@@ -584,32 +591,17 @@ class Cursor(DBAPICursor):
         )
         buffer = get_next_result_batch_response.resultBatch
         if not self._is_metadata_updated:
-            self.update_meta_data()
+            self.update_mete_data()
         if not buffer or len(buffer) == 0:
             return None
-        return buffer
-
-    def fetch_batch(self):
-        buffer = self.get_next_batch()
         # one batch retrieves the predefined set of rows
         return read_rows_from_chunk(self._query_columns_description, buffer)
 
-    def fetch_all_columnar(self):
-        list_chunk = list()
-        while True:
-            buffer = self.get_next_batch()
-            if buffer is None:
-                break
-            chunk = reconstruct_chunk(buffer)
-            list_chunk.append(chunk)
-        result = ColumnarResult(list_chunk, self._query_columns_description)
-        return result
-
     def fetchall(self):
         return self._fetch_all()
 
     def fetchmany(self, size: int = None):
-        # _logger.info("fetching all from overridden method")
+        # _logger.info("fetching all from overriden method")
         if size is None:
             size = self.arraysize
         if self._data is None:
@@ -689,41 +681,6 @@ class Error(Exception):
     pass
 
 
-class ColumnarResult:
-    def __init__(self, list_chunk, list_column_description):
-        self.rows = None
-        self._list_chunk = list_chunk
-        self._cur_chunk = None
-        self._list_column_description = list_column_description
-        self._cur_chunk_index = 0
-        self._cur_chunk_row_idx = 0
-
-    def get_next_row(self):
-        if self._cur_chunk is None or self._cur_chunk_row_idx >= self._cur_chunk.size:
-            self.move_to_next_chunk()
-            self.rows = deserialize_chunk_to_rows(self._list_column_description, self._cur_chunk)
-            _cur_chunk_row_idx = 0
-        if self._cur_chunk is None:
-            return None
-        row = self.rows[self._cur_chunk_row_idx]
-        self._cur_chunk_row_idx += 1
-        return row
-
-    def move_to_next_chunk(self):
-        if self._cur_chunk_index >= len(self._list_chunk):
-            self._cur_chunk = None
-
-        else:
-            self._cur_chunk = self._list_chunk[self._cur_chunk_index]
-            self._cur_chunk_index += 1
-
-    def size(self):
-        size = 0
-        for chunk in self._list_chunk:
-            size += chunk.size
-        return size
-
-
 #
 # Type Objects and Constructors
 #

{e6data-python-connector-2.1.10.dev1 → e6data-python-connector-2.1.11/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.10.dev1
+Version: 2.1.11
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.

{e6data-python-connector-2.1.10.dev1 → e6data-python-connector-2.1.11}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = [2, 1, 10, 'dev1']
+VERSION = [2, 1, 11]
 
 
 def get_long_desc():