e6data-python-connector 2.0.0__tar.gz → 2.0.2__tar.gz

{e6data-python-connector-2.0.0/e6data_python_connector.egg-info → e6data-python-connector-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.0.0
+Version: 2.0.2
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,20 +27,27 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.0.0-blue.svg)
+![version](https://img.shields.io/badge/version-2.0.2-blue.svg)
 
 ## Introduction
 
 The e6data Connector for Python provides an interface for writing Python applications that can connect to e6data and perform operations.
 
-#### Amazon Linux dependency
-Make sure to install C compiler dependencies and wheel before install e6data-python-connector.
+### Dependencies
+Make sure to install below dependencies and wheel before install e6data-python-connector.
 ```shell
+# Amazon Linux / CentOS dependencies
 yum install python3-devel gcc-c++ -y
 
+# Ubuntu/Debian dependencies
+apt install python3-dev g++ -y
+
+
+# Pip dependencies
 pip install wheel
 ```
 
+
 To install the Python package, use the command below:
 ```shell
 pip install --no-cache-dir e6data-python-connector

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/README.md

@@ -1,19 +1,26 @@
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.0.0-blue.svg)
+![version](https://img.shields.io/badge/version-2.0.2-blue.svg)
 
 ## Introduction
 
 The e6data Connector for Python provides an interface for writing Python applications that can connect to e6data and perform operations.
 
-#### Amazon Linux dependency
-Make sure to install C compiler dependencies and wheel before install e6data-python-connector.
+### Dependencies
+Make sure to install below dependencies and wheel before install e6data-python-connector.
 ```shell
+# Amazon Linux / CentOS dependencies
 yum install python3-devel gcc-c++ -y
 
+# Ubuntu/Debian dependencies
+apt install python3-dev g++ -y
+
+
+# Pip dependencies
 pip install wheel
 ```
 
+
 To install the Python package, use the command below:
 ```shell
 pip install --no-cache-dir e6data-python-connector

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/e6data_python_connector/common.py

@@ -18,7 +18,7 @@ from builtins import str
 from future.utils import with_metaclass
 from past.builtins import basestring
 
-from e6xdb.exceptions import ProgrammingError
+from e6data_python_connector.exceptions import ProgrammingError
 
 _logger = logging.getLogger(__name__)
 

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/e6data_python_connector/datainputstream.py

@@ -7,8 +7,19 @@ from thrift.protocol import TBinaryProtocol
 from thrift.transport import TTransport
 
 from e6data_python_connector.e6x_vector.ttypes import Chunk, Vector, VectorType
-from e6xdb.constants import ZONE
-from e6xdb.date_time_utils import floor_div, floor_mod
+from e6data_python_connector.constants import ZONE
+from e6data_python_connector.date_time_utils import floor_div, floor_mod, get_zone
+
+try:
+    from thrift.protocol import fastbinary
+except ImportError:
+    raise Exception(
+        """
+        Failed to import fastbinary. 
+        Did you install system dependencies?
+        Please verify https://github.com/e6x-labs/e6data-python-connector#dependencies
+        """
+    )
 
 _logger = logging.getLogger(__name__)
 
@@ -195,13 +206,16 @@ def get_column_from_chunk(vector: Vector) -> list:
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.int64Data.data[row] if not vector.isConstantVector else vector.data.numericConstantData.data)
+                value_array.append(vector.data.int64Data.data[
+                                       row] if not vector.isConstantVector else vector.data.numericConstantData.data)
         elif d_type == VectorType.DATE:
             for row in range(vector.size):
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                epoch_seconds = floor_div(vector.data.dateData.data[row] if not vector.isConstantVector else vector.data.dateConstantData.data, 1000_000)
+                epoch_seconds = floor_div(vector.data.dateData.data[
+                                              row] if not vector.isConstantVector else vector.data.dateConstantData.data,
+                                          1000_000)
                 zone_offset = pytz.timezone('UTC') if vector.zoneOffset == 'Z' else pytz.timezone(vector.zoneOffset)
                 date = datetime.fromtimestamp(epoch_seconds, zone_offset)
                 value_array.append(date.strftime("%Y-%m-%d"))
@@ -213,7 +227,7 @@ def get_column_from_chunk(vector: Vector) -> list:
                 epoch_micros = vector.data.timeData.data[row] if not vector.isConstantVector else vector.data.timeConstantData.data
                 epoch_seconds = floor_div(epoch_micros, 1000_000)
                 micros_of_the_day = floor_mod(epoch_micros, 1000_000)
-                zone_offset = pytz.timezone('UTC') if vector.zoneOffset == 'Z' else pytz.timezone(vector.zoneOffset)
+                zone_offset = pytz.timezone('UTC') if vector.zoneOffset == 'Z' else pytz.timezone(get_zone(vector.zoneOffset))
                 date_time = datetime.fromtimestamp(epoch_seconds, zone_offset)
                 date_time = date_time + timedelta(microseconds=micros_of_the_day)
                 value_array.append(date_time.strftime("%Y-%m-%d %H:%M:%S"))
@@ -222,37 +236,43 @@ def get_column_from_chunk(vector: Vector) -> list:
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.varcharData.data[row] if not vector.isConstantVector else vector.data.varcharConstantData.data)
+                value_array.append(vector.data.varcharData.data[
+                                       row] if not vector.isConstantVector else vector.data.varcharConstantData.data)
         elif d_type == VectorType.DOUBLE:
             for row in range(vector.size):
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.float64Data.data[row] if not vector.isConstantVector else vector.data.numericDecimalConstantData.data)
+                value_array.append(vector.data.float64Data.data[
+                                       row] if not vector.isConstantVector else vector.data.numericDecimalConstantData.data)
         elif d_type == VectorType.BINARY:
             for row in range(vector.size):
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.varcharData.data[row] if not vector.isConstantVector else vector.data.varcharConstantData.data)
+                value_array.append(vector.data.varcharData.data[
+                                       row] if not vector.isConstantVector else vector.data.varcharConstantData.data)
         elif d_type == VectorType.FLOAT:
             for row in range(vector.size):
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.float32Data.data[row] if not vector.isConstantVector else vector.data.numericDecimalConstantData.data)
+                value_array.append(vector.data.float32Data.data[
+                                       row] if not vector.isConstantVector else vector.data.numericDecimalConstantData.data)
         elif d_type == VectorType.BOOLEAN:
             for row in range(vector.size):
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.boolData.data[row] if not vector.isConstantVector else vector.data.boolConstantData.data)
+                value_array.append(vector.data.boolData.data[
+                                       row] if not vector.isConstantVector else vector.data.boolConstantData.data)
         elif d_type == VectorType.INTEGER:
             for row in range(vector.size):
                 if vector.nullSet[row]:
                     value_array.append(None)
                     continue
-                value_array.append(vector.data.int32Data.data[row] if not vector.isConstantVector else vector.data.numericConstantData.data)
+                value_array.append(vector.data.int32Data.data[
+                                       row] if not vector.isConstantVector else vector.data.numericConstantData.data)
         else:
             value_array.append(None)
     except Exception as e:

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/e6data_python_connector/e6data_grpc.py

@@ -395,6 +395,7 @@ class Cursor(DBAPICursor):
         """
         Semicolon is now not supported. So removing it from query end.
         """
+        operation = operation.strip()  # Remove leading and trailing whitespaces.
         if operation.endswith(';'):
             operation = operation[:-1]
 

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.0.0
+Version: 2.0.2
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,20 +27,27 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.0.0-blue.svg)
+![version](https://img.shields.io/badge/version-2.0.2-blue.svg)
 
 ## Introduction
 
 The e6data Connector for Python provides an interface for writing Python applications that can connect to e6data and perform operations.
 
-#### Amazon Linux dependency
-Make sure to install C compiler dependencies and wheel before install e6data-python-connector.
+### Dependencies
+Make sure to install below dependencies and wheel before install e6data-python-connector.
 ```shell
+# Amazon Linux / CentOS dependencies
 yum install python3-devel gcc-c++ -y
 
+# Ubuntu/Debian dependencies
+apt install python3-dev g++ -y
+
+
+# Pip dependencies
 pip install wheel
 ```
 
+
 To install the Python package, use the command below:
 ```shell
 pip install --no-cache-dir e6data-python-connector

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/e6data_python_connector.egg-info/SOURCES.txt

@@ -28,13 +28,4 @@ e6data_python_connector/server/constants.py
 e6data_python_connector/server/e6x_engine_pb2.py
 e6data_python_connector/server/e6x_engine_pb2.pyi
 e6data_python_connector/server/e6x_engine_pb2_grpc.py
-e6data_python_connector/server/ttypes.py
-e6xdb/__init__.py
-e6xdb/common.py
-e6xdb/constants.py
-e6xdb/datainputstream.py
-e6xdb/date_time_utils.py
-e6xdb/e6x.py
-e6xdb/exceptions.py
-e6xdb/sqlalchemy_e6x.py
-e6xdb/typeId.py
+e6data_python_connector/server/ttypes.py

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/e6data_python_connector.egg-info/top_level.txt

@@ -1,2 +1 @@
 e6data_python_connector
-e6xdb

{e6data-python-connector-2.0.0 → e6data-python-connector-2.0.2}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = [2, 0, 0]
+VERSION = [2, 0, 2]
 
 
 def get_long_desc():

e6data-python-connector-2.0.0/e6xdb/__init__.py

@@ -1,10 +0,0 @@
-"""
-THIS SPECIFIC FILE IS DISTRIBUTED UNDER THE UNLICENSE: http://unlicense.org.
-
-THIS MEANS YOU CAN USE THIS CODE EXAMPLE TO KICKSTART A PROJECT YOUR OWN.
-AFTER YOU CREATED YOUR OWN ORIGINAL WORK, YOU CAN REPLACE THIS HEADER :)
-"""
-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-__version__ = '0.0.1'

e6data-python-connector-2.0.0/e6xdb/common.py

@@ -1,269 +0,0 @@
-"""Package private common utilities. Do not use directly.
-Many docstrings in this file are based on PEP-249, which is in the public domain.
-"""
-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import abc
-import collections
-import datetime
-import logging
-import time
-from builtins import bytes
-from builtins import int
-from builtins import object
-from builtins import str
-
-from future.utils import with_metaclass
-from past.builtins import basestring
-
-from e6xdb.exceptions import ProgrammingError
-
-_logger = logging.getLogger(__name__)
-
-
-class DBAPICursor(with_metaclass(abc.ABCMeta, object)):
-    """Base class for some common DB-API logic"""
-
-    _STATE_NONE = 0
-    _STATE_RUNNING = 1
-    _STATE_FINISHED = 2
-
-    def __init__(self, poll_interval=1):
-        self._poll_interval = poll_interval
-        self._reset_state()
-        self.lastrowid = None
-        self._data = None
-
-    def _reset_state(self):
-        """Reset state about the previous query in preparation for running another query"""
-        # State to return as part of DB-API
-        self._rownumber = 0
-
-        # Internal helper state
-        self._data = collections.deque()
-        self._columns = None
-
-    def _fetch_while(self, fn):
-        _logger.info("Commons - fetch while.... fn type - {}".format(type(fn)))
-        while fn():
-            _logger.info("fetching next fetch more from fetch while")
-            self._fetch_more()
-            if fn():
-                time.sleep(self._poll_interval)
-
-    @abc.abstractmethod
-    def description(self):
-        raise NotImplementedError  # pragma: no cover
-
-    def close(self):
-        """By default, do nothing"""
-        pass
-
-    @abc.abstractmethod
-    def _fetch_more(self):
-        """Get more results, append it to ``self._data``, and update ``self._state``."""
-        raise NotImplementedError  # pragma: no cover
-
-    @property
-    def rowcount(self):
-        """By default, return -1 to indicate that this is not supported."""
-        return self.rowcount
-
-    @abc.abstractmethod
-    def execute(self, operation, parameters=None):
-        """Prepare and execute a database operation (query or command).
-        Parameters may be provided as sequence or mapping and will be bound to variables in the
-        operation. Variables are specified in a database-specific notation (see the e6xdb's
-        ``paramstyle`` attribute for details).
-        Return values are not defined.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def executemany(self, operation, seq_of_parameters):
-        """Prepare a database operation (query or command) and then execute it against all parameter
-        sequences or mappings found in the sequence ``seq_of_parameters``.
-        Only the final result set is retained.
-        Return values are not defined.
-        """
-        for parameters in seq_of_parameters[:-1]:
-            self.execute(operation, parameters)
-            # while self._state != self._STATE_FINISHED:
-            #     self._fetch_more()
-        if seq_of_parameters:
-            self.execute(operation, seq_of_parameters[-1])
-
-    def fetchone(self):
-        """Fetch the next row of a query result set, returning a single sequence, or ``None`` when
-        no more data is available.
-        An :py:class:`~pyhive.exc.Error` (or subclass) exception is raised if the previous call to
-        :py:meth:`execute` did not produce any result set or no call was issued yet.
-        """
-        # if self._state == self._STATE_NONE:
-        #     raise ProgrammingError("No query yet")
-        #
-        # # Sleep until we're done or we have some data to return
-        # self._fetch_while(lambda: not self._data and self._state != self._STATE_FINISHED)
-
-        # Sleep until we're done or we have some data to return
-        # self._fetch_while(lambda: not self._data and self._state != self._STATE_FINISHED)
-        if not self._data:
-            return None
-        else:
-            # if self._rownumber <= 1000:
-            #     _logger.info("Commons - Breaking the loop after 1000Commons - fetch many records")
-            #     return None
-            self._rownumber += 1
-            return self._data.popleft()
-
-    def fetchmany(self, size=None):
-        """Fetch the next set of rows of a query result, returning a sequence of sequences (e.g. a
-        list of tuples). An empty sequence is returned when no more rows are available.
-        The number of rows to fetch per call is specified by the parameter. If it is not given, the
-        cursor's arraysize determines the number of rows to be fetched. The method should try to
-        fetch as many rows as indicated by the size parameter. If this is not possible due to the
-        specified number of rows not being available, fewer rows may be returned.
-        An :py:class:`~pyhive.exc.Error` (or subclass) exception is raised if the previous call to
-        :py:meth:`execute` did not produce any result set or no call was issued yet.
-        """
-        _logger.info("Commons - fetch many.... size - {}".format(size))
-        rowsToReturn = self.fetchone()
-
-        if rowsToReturn is None:
-            return list()
-        return list(rowsToReturn)
-
-    def fetchall(self):
-        """Fetch all (remaining) rows of a query result, returning them as a sequence of sequences
-        (e.g. a list of tuples).
-        An :py:class:`~pyhive.exc.Error` (or subclass) exception is raised if the previous call to
-        :py:meth:`execute` did not produce any result set or no call was issued yet.
-        """
-        _logger.info("Commons - fetch all")
-        return list(iter(self.fetchone, None))
-
-    @property
-    def arraysize(self):
-        """This read/write attribute specifies the number of rows to fetch at a time with
-        :py:meth:`fetchmany`. It defaults to 1 meaning to fetch a single row at a time.
-        """
-        return self._arraysize
-
-    @arraysize.setter
-    def arraysize(self, value):
-        self._arraysize = value
-
-    def setinputsizes(self, sizes):
-        """Does nothing by default"""
-        pass
-
-    def setoutputsize(self, size, column=None):
-        """Does nothing by default"""
-        pass
-
-    #
-    # Optional DB API Extensions
-    #
-
-    @property
-    def rownumber(self):
-        """This read-only attribute should provide the current 0-based index of the cursor in the
-        result set.
-        The index can be seen as index of the cursor in a sequence (the result set). The next fetch
-        operation will fetch the row indexed by ``rownumber`` in that sequence.
-        """
-        return self._rownumber
-
-    def __next__(self):
-        """Return the next row from the currently executing SQL statement using the same semantics
-        as :py:meth:`fetchone`. A ``StopIteration`` exception is raised when the result set is
-        exhausted.
-        """
-        _logger.info("Commons - fetching the next row")
-        one = self.fetchone()
-        if one is None:
-            raise StopIteration
-        else:
-            return one
-
-    next = __next__
-
-    def __iter__(self):
-        """Return self to make cursors compatible to the iteration protocol."""
-        return self
-
-
-class DBAPITypeObject(object):
-    # Taken from http://www.python.org/dev/peps/pep-0249/#implementation-hints
-    def __init__(self, *values):
-        self.values = values
-
-    def __cmp__(self, other):
-        if other in self.values:
-            return 0
-        if other < self.values:
-            return 1
-        else:
-            return -1
-
-
-class ParamEscaper(object):
-    _DATE_FORMAT = "%Y-%m-%d"
-    _TIME_FORMAT = "%H:%M:%S.%f"
-    _DATETIME_FORMAT = "{} {}".format(_DATE_FORMAT, _TIME_FORMAT)
-
-    def escape_args(self, parameters):
-        if isinstance(parameters, dict):
-            return {k: self.escape_item(v) for k, v in parameters.items()}
-        elif isinstance(parameters, (list, tuple)):
-            return tuple(self.escape_item(x) for x in parameters)
-        else:
-            raise ProgrammingError("Unsupported param format: {}".format(parameters))
-
-    def escape_number(self, item):
-        return item
-
-    def escape_string(self, item):
-        # Need to decode UTF-8 because of old sqlalchemy.
-        # Newer SQLAlchemy checks dialect.supports_unicode_binds before encoding Unicode strings
-        # as byte strings. The old version always encodes Unicode as byte strings, which breaks
-        # string formatting here.
-        if isinstance(item, bytes):
-            item = item.decode('utf-8')
-        # This is good enough when backslashes are literal, newlines are just followed, and the way
-        # to escape a single quote is to put two single quotes.
-        # (i.e. only special character is single quote)
-        return "'{}'".format(item.replace("'", "''"))
-
-    def escape_sequence(self, item):
-        l = map(str, map(self.escape_item, item))
-        return '(' + ','.join(l) + ')'
-
-    def escape_datetime(self, item, format, cutoff=0):
-        dt_str = item.strftime(format)
-        formatted = dt_str[:-cutoff] if cutoff and format.endswith(".%f") else dt_str
-        return "'{}'".format(formatted)
-
-    def escape_item(self, item):
-        if item is None:
-            return 'NULL'
-        elif isinstance(item, (int, float)):
-            return self.escape_number(item)
-        elif isinstance(item, basestring):
-            return self.escape_string(item)
-        elif isinstance(item, collections.Iterable):
-            return self.escape_sequence(item)
-        elif isinstance(item, datetime.datetime):
-            return self.escape_datetime(item, self._DATETIME_FORMAT)
-        elif isinstance(item, datetime.date):
-            return self.escape_datetime(item, self._DATE_FORMAT)
-        else:
-            raise ProgrammingError("Unsupported object {}".format(item))
-
-
-class UniversalSet(object):
-    """set containing everything"""
-
-    def __contains__(self, item):
-        return True

e6data-python-connector-2.0.0/e6xdb/constants.py

@@ -1,32 +0,0 @@
-import pytz
-
-PRIMITIVE_TYPES = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15, 16, 17, 18, 19, 20, 21}
-COMPLEX_TYPES = {10, 11, 12, 13, 14}
-COLLECTION_TYPES = {10, 11}
-TYPE_NAMES = {
-    0: "BOOLEAN",
-    1: "TINYINT",
-    2: "SMALLINT",
-    3: "INT",
-    4: "BIGINT",
-    5: "FLOAT",
-    6: "DOUBLE",
-    7: "STRING",
-    8: "TIMESTAMP",
-    9: "BINARY",
-    10: "ARRAY",
-    11: "MAP",
-    12: "STRUCT",
-    13: "UNIONTYPE",
-    15: "DECIMAL",
-    16: "NULL",
-    17: "DATE",
-    18: "VARCHAR",
-    19: "CHAR",
-    20: "INTERVAL_YEAR_MONTH",
-    21: "INTERVAL_DAY_TIME",
-}
-CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength"
-PRECISION = "precision"
-SCALE = "scale"
-ZONE = pytz.timezone('UTC')