Skip to content

REF: pytables remove need for set_atom #30143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 9, 2019
Merged

REF: pytables remove need for set_atom #30143

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f08e250
REF: move tz setting to the constructor
jbrockmendel Dec 8, 2019
55bb70a
REF: pytables set attrs in constructor, avoid need for set_atom
jbrockmendel Dec 8, 2019
c68c45c
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 17 additions & 31 deletions pandas/io/pytables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,6 +1895,7 @@ def __init__(
freq=None,
tz=None,
index_name=None,
ordered=None,
table=None,
meta=None,
metadata=None,
Expand All @@ -1913,6 +1914,7 @@ def __init__(
self.freq = freq
self.tz = tz
self.index_name = index_name
self.ordered = ordered
self.table = table
self.meta = meta
self.metadata = metadata
Expand Down Expand Up @@ -2200,6 +2202,8 @@ def __init__(
typ=None,
cname=None,
pos=None,
tz=None,
ordered=None,
table=None,
meta=None,
metadata=None,
Expand All @@ -2211,6 +2215,8 @@ def __init__(
typ=typ,
pos=pos,
cname=cname,
tz=tz,
ordered=ordered,
table=table,
meta=meta,
metadata=metadata,
Expand Down Expand Up @@ -2270,15 +2276,6 @@ def take_data(self):
self.data, data = None, self.data
return data

def set_atom(self, block):
""" create and setup my atom from the block b """

# short-cut certain block types
if block.is_categorical:
self.set_atom_categorical(block)
elif block.is_datetimetz:
self.set_atom_datetime64tz(block)

@classmethod
def _get_atom(cls, values: Union[np.ndarray, ABCExtensionArray]) -> "Col":
"""
Expand Down Expand Up @@ -2331,31 +2328,10 @@ def get_atom_coltype(cls, kind: str) -> Type["Col"]:
def get_atom_data(cls, shape, kind: str) -> "Col":
return cls.get_atom_coltype(kind=kind)(shape=shape[0])

def set_atom_categorical(self, block):
# currently only supports a 1-D categorical
# in a 1-D block

values = block.values

if values.ndim > 1:
raise NotImplementedError("only support 1-d categoricals")

# write the codes; must be in a block shape
self.ordered = values.ordered

# write the categories
self.meta = "category"
self.metadata = np.array(values.categories, copy=False).ravel()

@classmethod
def get_atom_datetime64(cls, shape):
return _tables().Int64Col(shape=shape[0])

def set_atom_datetime64tz(self, block):

# store a converted timezone
self.tz = _get_tz(block.values.tz)

@classmethod
def get_atom_timedelta64(cls, shape):
return _tables().Int64Col(shape=shape[0])
Expand Down Expand Up @@ -3880,6 +3856,13 @@ def get_blk_items(mgr, blocks):

typ = klass._get_atom(data_converted)
kind = _dtype_to_kind(data_converted.dtype.name)
tz = _get_tz(data_converted.tz) if hasattr(data_converted, "tz") else None

meta = metadata = ordered = None
if is_categorical_dtype(data_converted):
ordered = data_converted.ordered
meta = "category"
metadata = np.array(data_converted.categories, copy=False).ravel()

col = klass(
name=adj_name,
Expand All @@ -3888,8 +3871,11 @@ def get_blk_items(mgr, blocks):
typ=typ,
pos=j,
kind=kind,
tz=tz,
ordered=ordered,
meta=meta,
metadata=metadata,
)
col.set_atom(block=b)
col.set_data(data_converted)
col.update_info(self.info)

Expand Down