clickhouse-driver 0.2.1__cp39-cp39-win_amd64.whl → 0.2.10__cp39-cp39-win_amd64.whl

clickhouse_driver/columns/enumcolumn.py

@@ -1,119 +1,129 @@
-from enum import Enum
-
-from .. import errors
-from .intcolumn import IntColumn
-
-
-class EnumColumn(IntColumn):
-    py_types = (Enum, int, str)
-
-    def __init__(self, enum_cls, **kwargs):
-        self.enum_cls = enum_cls
-        super(EnumColumn, self).__init__(**kwargs)
-
-    def before_write_items(self, items, nulls_map=None):
-        null_value = self.null_value
-
-        enum_cls = self.enum_cls
-
-        for i, item in enumerate(items):
-            if nulls_map and nulls_map[i]:
-                items[i] = null_value
-                continue
-
-            source_value = item.name if isinstance(item, Enum) else item
-
-            # Check real enum value
-            try:
-                if isinstance(source_value, str):
-                    items[i] = enum_cls[source_value].value
-                else:
-                    items[i] = enum_cls(source_value).value
-            except (ValueError, KeyError):
-                choices = ', '.join(
-                    "'{}' = {}".format(x.name.replace("'", r"\'"), x.value)
-                    for x in enum_cls
-                )
-                enum_str = '{}({})'.format(enum_cls.__name__, choices)
-
-                raise errors.LogicalError(
-                    "Unknown element '{}' for type {}"
-                    .format(source_value, enum_str)
-                )
-
-    def after_read_items(self, items, nulls_map=None):
-        enum_cls = self.enum_cls
-
-        if nulls_map is None:
-            return tuple(enum_cls(item).name for item in items)
-        else:
-            return tuple(
-                (None if is_null else enum_cls(items[i]).name)
-                for i, is_null in enumerate(nulls_map)
-            )
-
-
-class Enum8Column(EnumColumn):
-    ch_type = 'Enum8'
-    format = 'b'
-    int_size = 1
-
-
-class Enum16Column(EnumColumn):
-    ch_type = 'Enum16'
-    format = 'h'
-    int_size = 2
-
-
-def create_enum_column(spec, column_options):
-    if spec.startswith('Enum8'):
-        params = spec[6:-1]
-        cls = Enum8Column
-    else:
-        params = spec[7:-1]
-        cls = Enum16Column
-
-    return cls(Enum(cls.ch_type, _parse_options(params)), **column_options)
-
-
-def _parse_options(option_string):
-    options = dict()
-    after_name = False
-    escaped = False
-    quote_character = None
-    name = ''
-    value = ''
-
-    for ch in option_string:
-        if escaped:
-            name += ch
-            escaped = False  # accepting escaped character
-
-        elif after_name:
-            if ch in (' ', '='):
-                pass
-            elif ch == ',':
-                options[name] = int(value)
-                after_name = False
-                name = ''
-                value = ''  # reset before collecting new option
-            else:
-                value += ch
-
-        elif quote_character:
-            if ch == '\\':
-                escaped = True
-            elif ch == quote_character:
-                quote_character = None
-                after_name = True  # start collecting option value
-            else:
-                name += ch
-
-        else:
-            if ch == "'":
-                quote_character = ch
-
-    if after_name:
-        options.setdefault(name, int(value))  # append word after last comma
-
-    return options
+from enum import Enum
+from collections import OrderedDict
+
+from .. import errors
+from .intcolumn import IntColumn
+
+invalid_names_for_python_enum = frozenset(['mro', ''])
+
+
+class EnumColumn(IntColumn):
+    py_types = (Enum, int, str)
+
+    def __init__(self, name_by_value, value_by_name, **kwargs):
+        self.name_by_value = name_by_value
+        self.value_by_name = value_by_name
+        super(EnumColumn, self).__init__(**kwargs)
+
+    def before_write_items(self, items, nulls_map=None):
+        null_value = self.null_value
+        name_by_value = self.name_by_value
+        value_by_name = self.value_by_name
+
+        for i, item in enumerate(items):
+            if nulls_map and nulls_map[i]:
+                items[i] = null_value
+                continue
+
+            source_value = item.name if isinstance(item, Enum) else item
+
+            # Check real enum value
+            try:
+                if isinstance(source_value, str):
+                    items[i] = value_by_name[source_value]
+                else:
+                    items[i] = value_by_name[name_by_value[source_value]]
+            except (ValueError, KeyError):
+                choices = ', '.join(
+                    "'{}' = {}".format(name.replace("'", r"\'"), value)
+                    for name, value in value_by_name.items()
+                )
+                enum_str = '{}({})'.format(self.ch_type, choices)
+
+                raise errors.LogicalError(
+                    "Unknown element '{}' for type {}"
+                    .format(source_value, enum_str)
+                )
+
+    def after_read_items(self, items, nulls_map=None):
+        name_by_value = self.name_by_value
+
+        if nulls_map is None:
+            return tuple(name_by_value[item] for item in items)
+        else:
+            return tuple(
+                (None if is_null else name_by_value[items[i]])
+                for i, is_null in enumerate(nulls_map)
+            )
+
+
+class Enum8Column(EnumColumn):
+    ch_type = 'Enum8'
+    format = 'b'
+    int_size = 1
+
+
+class Enum16Column(EnumColumn):
+    ch_type = 'Enum16'
+    format = 'h'
+    int_size = 2
+
+
+def create_enum_column(spec, column_options):
+    if spec.startswith('Enum8'):
+        params = spec[6:-1]
+        cls = Enum8Column
+    else:
+        params = spec[7:-1]
+        cls = Enum16Column
+
+    name_by_value, value_by_name = _parse_options(params)
+
+    return cls(name_by_value, value_by_name, **column_options)
+
+
+def _parse_options(option_string):
+    name_by_value, value_by_name = {}, OrderedDict()
+    after_name = False
+    escaped = False
+    quote_character = None
+    name = ''
+    value = ''
+
+    for ch in option_string:
+        if escaped:
+            name += ch
+            escaped = False  # accepting escaped character
+
+        elif after_name:
+            if ch in (' ', '='):
+                pass
+            elif ch == ',':
+                value = int(value)
+                name_by_value[value] = name
+                value_by_name[name] = value
+                after_name = False
+                name = ''
+                value = ''  # reset before collecting new option
+            else:
+                value += ch
+
+        elif quote_character:
+            if ch == '\\':
+                escaped = True
+            elif ch == quote_character:
+                quote_character = None
+                after_name = True  # start collecting option value
+            else:
+                name += ch
+
+        else:
+            if ch == "'":
+                quote_character = ch
+
+    if after_name:
+        value = int(value)
+        name_by_value[value] = name
+        value_by_name[name] = value
+
+    return name_by_value, value_by_name

clickhouse_driver/columns/exceptions.py

@@ -1,12 +1,12 @@
-
-
-class ColumnException(Exception):
-    pass
-
-
-class ColumnTypeMismatchException(ColumnException):
-    pass
-
-
-class StructPackException(ColumnException):
-    pass
+
+
+class ColumnException(Exception):
+    pass
+
+
+class ColumnTypeMismatchException(ColumnException):
+    pass
+
+
+class StructPackException(ColumnException):
+    pass

clickhouse_driver/columns/floatcolumn.py

@@ -1,34 +1,34 @@
-from ctypes import c_float
-
-from .base import FormatColumn
-
-
-class FloatColumn(FormatColumn):
-    py_types = (float, int)
-
-
-class Float32Column(FloatColumn):
-    ch_type = 'Float32'
-    format = 'f'
-
-    def __init__(self, types_check=False, **kwargs):
-        super(Float32Column, self).__init__(types_check=types_check, **kwargs)
-
-        if types_check:
-            # Chop only bytes that fit current type.
-            # Cast to -nan or nan if overflows.
-            def before_write_items(items, nulls_map=None):
-                null_value = self.null_value
-
-                for i, item in enumerate(items):
-                    if nulls_map and nulls_map[i]:
-                        items[i] = null_value
-                    else:
-                        items[i] = c_float(item).value
-
-            self.before_write_items = before_write_items
-
-
-class Float64Column(FloatColumn):
-    ch_type = 'Float64'
-    format = 'd'
+from ctypes import c_float
+
+from .base import FormatColumn
+
+
+class FloatColumn(FormatColumn):
+    py_types = (float, int)
+
+
+class Float32Column(FloatColumn):
+    ch_type = 'Float32'
+    format = 'f'
+
+    def __init__(self, types_check=False, **kwargs):
+        super(Float32Column, self).__init__(types_check=types_check, **kwargs)
+
+        if types_check:
+            # Chop only bytes that fit current type.
+            # Cast to -nan or nan if overflows.
+            def before_write_items(items, nulls_map=None):
+                null_value = self.null_value
+
+                for i, item in enumerate(items):
+                    if nulls_map and nulls_map[i]:
+                        items[i] = null_value
+                    else:
+                        items[i] = c_float(item).value
+
+            self.before_write_items = before_write_items
+
+
+class Float64Column(FloatColumn):
+    ch_type = 'Float64'
+    format = 'd'

clickhouse_driver/columns/intcolumn.py

@@ -1,157 +1,157 @@
-
-from .exceptions import ColumnTypeMismatchException
-from .base import FormatColumn
-from .largeint import (
-    int128_from_quads, int128_to_quads, uint128_from_quads, uint128_to_quads,
-    int256_from_quads, int256_to_quads, uint256_from_quads, uint256_to_quads
-)
-
-
-class IntColumn(FormatColumn):
-    py_types = (int, )
-    int_size = None
-
-    def __init__(self, types_check=False, **kwargs):
-        super(IntColumn, self).__init__(types_check=types_check, **kwargs)
-
-        if types_check:
-            self.mask = (1 << 8 * self.int_size) - 1
-
-            # Chop only bytes that fit current type.
-            # ctypes.c_intXX is slower.
-            def before_write_items(items, nulls_map=None):
-                # TODO: cythonize
-                null_value = self.null_value
-
-                for i, item in enumerate(items):
-                    if nulls_map and nulls_map[i]:
-                        items[i] = null_value
-                        continue
-
-                    if item >= 0:
-                        sign = 1
-                    else:
-                        sign = -1
-                        item = -item
-
-                    items[i] = sign * (item & self.mask)
-
-            self.before_write_items = before_write_items
-
-
-class UIntColumn(IntColumn):
-    def __init__(self, types_check=False, **kwargs):
-        super(UIntColumn, self).__init__(types_check=types_check, **kwargs)
-
-        if types_check:
-            def check_item(value):
-                if value < 0:
-                    raise ColumnTypeMismatchException(value)
-
-            self.check_item = check_item
-
-
-class Int8Column(IntColumn):
-    ch_type = 'Int8'
-    format = 'b'
-    int_size = 1
-
-
-class Int16Column(IntColumn):
-    ch_type = 'Int16'
-    format = 'h'
-    int_size = 2
-
-
-class Int32Column(IntColumn):
-    ch_type = 'Int32'
-    format = 'i'
-    int_size = 4
-
-
-class Int64Column(IntColumn):
-    ch_type = 'Int64'
-    format = 'q'
-    int_size = 8
-
-
-class UInt8Column(UIntColumn):
-    ch_type = 'UInt8'
-    format = 'B'
-    int_size = 1
-
-
-class UInt16Column(UIntColumn):
-    ch_type = 'UInt16'
-    format = 'H'
-    int_size = 2
-
-
-class UInt32Column(UIntColumn):
-    ch_type = 'UInt32'
-    format = 'I'
-    int_size = 4
-
-
-class UInt64Column(UIntColumn):
-    ch_type = 'UInt64'
-    format = 'Q'
-    int_size = 8
-
-
-class LargeIntColumn(IntColumn):
-    format = 'Q'  # We manually deal with sign in read/write.
-    factor = None
-
-    to_quads = None
-    from_quads = None
-
-    def write_items(self, items, buf):
-        n_items = len(items)
-
-        s = self.make_struct(self.factor * n_items)
-        uint_64_pairs = self.to_quads(items, n_items)
-
-        buf.write(s.pack(*uint_64_pairs))
-
-    def read_items(self, n_items, buf):
-        s = self.make_struct(self.factor * n_items)
-        items = s.unpack(buf.read(s.size))
-
-        return self.from_quads(items, n_items)
-
-
-class Int128Column(LargeIntColumn):
-    ch_type = 'Int128'
-    int_size = 16
-    factor = 2
-
-    to_quads = int128_to_quads
-    from_quads = int128_from_quads
-
-
-class UInt128Column(LargeIntColumn):
-    ch_type = 'UInt128'
-    int_size = 16
-    factor = 2
-
-    to_quads = uint128_to_quads
-    from_quads = uint128_from_quads
-
-
-class Int256Column(LargeIntColumn):
-    ch_type = 'Int256'
-    int_size = 32
-    factor = 4
-
-    to_quads = int256_to_quads
-    from_quads = int256_from_quads
-
-
-class UInt256Column(LargeIntColumn):
-    ch_type = 'UInt256'
-    int_size = 32
-    factor = 4
-
-    to_quads = uint256_to_quads
-    from_quads = uint256_from_quads
+
+from .exceptions import ColumnTypeMismatchException
+from .base import FormatColumn
+from .largeint import (
+    int128_from_quads, int128_to_quads, uint128_from_quads, uint128_to_quads,
+    int256_from_quads, int256_to_quads, uint256_from_quads, uint256_to_quads
+)
+
+
+class IntColumn(FormatColumn):
+    py_types = (int, )
+    int_size = None
+
+    def __init__(self, types_check=False, **kwargs):
+        super(IntColumn, self).__init__(types_check=types_check, **kwargs)
+
+        if types_check:
+            self.mask = (1 << 8 * self.int_size) - 1
+
+            # Chop only bytes that fit current type.
+            # ctypes.c_intXX is slower.
+            def before_write_items(items, nulls_map=None):
+                # TODO: cythonize
+                null_value = self.null_value
+
+                for i, item in enumerate(items):
+                    if nulls_map and nulls_map[i]:
+                        items[i] = null_value
+                        continue
+
+                    if item >= 0:
+                        sign = 1
+                    else:
+                        sign = -1
+                        item = -item
+
+                    items[i] = sign * (item & self.mask)
+
+            self.before_write_items = before_write_items
+
+
+class UIntColumn(IntColumn):
+    def __init__(self, types_check=False, **kwargs):
+        super(UIntColumn, self).__init__(types_check=types_check, **kwargs)
+
+        if types_check:
+            def check_item(value):
+                if value < 0:
+                    raise ColumnTypeMismatchException(value)
+
+            self.check_item = check_item
+
+
+class Int8Column(IntColumn):
+    ch_type = 'Int8'
+    format = 'b'
+    int_size = 1
+
+
+class Int16Column(IntColumn):
+    ch_type = 'Int16'
+    format = 'h'
+    int_size = 2
+
+
+class Int32Column(IntColumn):
+    ch_type = 'Int32'
+    format = 'i'
+    int_size = 4
+
+
+class Int64Column(IntColumn):
+    ch_type = 'Int64'
+    format = 'q'
+    int_size = 8
+
+
+class UInt8Column(UIntColumn):
+    ch_type = 'UInt8'
+    format = 'B'
+    int_size = 1
+
+
+class UInt16Column(UIntColumn):
+    ch_type = 'UInt16'
+    format = 'H'
+    int_size = 2
+
+
+class UInt32Column(UIntColumn):
+    ch_type = 'UInt32'
+    format = 'I'
+    int_size = 4
+
+
+class UInt64Column(UIntColumn):
+    ch_type = 'UInt64'
+    format = 'Q'
+    int_size = 8
+
+
+class LargeIntColumn(IntColumn):
+    format = 'Q'  # We manually deal with sign in read/write.
+    factor = None
+
+    to_quads = None
+    from_quads = None
+
+    def write_items(self, items, buf):
+        n_items = len(items)
+
+        s = self.make_struct(self.factor * n_items)
+        uint_64_pairs = self.to_quads(items, n_items)
+
+        buf.write(s.pack(*uint_64_pairs))
+
+    def read_items(self, n_items, buf):
+        s = self.make_struct(self.factor * n_items)
+        items = s.unpack(buf.read(s.size))
+
+        return self.from_quads(items, n_items)
+
+
+class Int128Column(LargeIntColumn):
+    ch_type = 'Int128'
+    int_size = 16
+    factor = 2
+
+    to_quads = int128_to_quads
+    from_quads = int128_from_quads
+
+
+class UInt128Column(LargeIntColumn):
+    ch_type = 'UInt128'
+    int_size = 16
+    factor = 2
+
+    to_quads = uint128_to_quads
+    from_quads = uint128_from_quads
+
+
+class Int256Column(LargeIntColumn):
+    ch_type = 'Int256'
+    int_size = 32
+    factor = 4
+
+    to_quads = int256_to_quads
+    from_quads = int256_from_quads
+
+
+class UInt256Column(LargeIntColumn):
+    ch_type = 'UInt256'
+    int_size = 32
+    factor = 4
+
+    to_quads = uint256_to_quads
+    from_quads = uint256_from_quads