Skip to content

wide table support #10243

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

Closed
wants to merge 2 commits into from
Closed

wide table support #10243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11de0d2
wip
hhuuggoo Aug 22, 2015
143985a
wip
hhuuggoo Aug 22, 2015
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
40 changes: 35 additions & 5 deletions pandas/io/pytables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
import itertools
import warnings
import os

from six import string_types
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use compat.string_types

from tables.exceptions import NoSuchNodeError
import numpy as np
from pandas import (Series, TimeSeries, DataFrame, Panel, Panel4D, Index,
MultiIndex, Int64Index, Timestamp)
Expand Down Expand Up @@ -1478,6 +1479,7 @@ def infer(self, handler):
"""infer this column from the table: create and return a new object"""
table = handler.table
new_self = self.copy()
new_self._handle = handler._handle
new_self.set_table(table)
new_self.get_attr()
new_self.read_metadata(handler)
Expand Down Expand Up @@ -1557,6 +1559,7 @@ def validate_names(self):
pass

def validate_and_set(self, handler, append, **kwargs):
self._handle = handler._handle
self.set_table(handler.table)
self.validate_col()
self.validate_attr(append)
Expand Down Expand Up @@ -2094,13 +2097,22 @@ def convert(self, values, nan_rep, encoding):
def get_attr(self):
""" get the data for this colummn """
self.values = getattr(self.attrs, self.kind_attr, None)
if self.values is None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to actually set _handle, you can get it directly from self.table (maybe make a property to do this), I think its slightly cleaner

try:
self.values = self._handle.get_node(self.attrs._v_node._v_parent,
self.kind_attr)[:].tolist()
except NoSuchNodeError:
pass
self.dtype = getattr(self.attrs, self.dtype_attr, None)
self.meta = getattr(self.attrs, self.meta_attr, None)
self.set_kind()

def set_attr(self):
""" set the data for this colummn """
setattr(self.attrs, self.kind_attr, self.values)
#setattr(self.attrs, self.kind_attr, self.values)
self._handle.create_carray(self.attrs._v_node._v_parent,
self.kind_attr,
obj=np.array(self.values))
setattr(self.attrs, self.meta_attr, self.meta)
if self.dtype is not None:
setattr(self.attrs, self.dtype_attr, self.dtype)
Expand Down Expand Up @@ -3061,12 +3073,31 @@ def set_info(self):
""" update our table index info """
self.attrs.info = self.info

def set_non_index_axes(self):
replacement = []
for dim, flds in self.non_index_axes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

slightly cleaner is to:

def f(dim, flds):
    self._handle.create_carray.......
    return (dim, name)
replacement = [ f(dim, flds) for dim, flds in self.non_index_axes ]

and same below

name = "non_index_axes_%d" % dim
self._handle.create_carray(self.attrs._v_node, name, obj=np.array(flds))
replacement.append((dim, name))
self.attrs.non_index_axes = replacement

def get_non_index_axes(self):
non_index_axes = getattr(self.attrs, 'non_index_axes', [])
new = []
for dim, flds in non_index_axes:
if isinstance(flds, string_types):
flds = self._handle.get_node(self.attrs._v_node, flds)[:].tolist()
new.append((dim, flds))
return new

def set_attrs(self):
""" set our table type & indexables """
self.attrs.table_type = str(self.table_type)
self.attrs.index_cols = self.index_cols()
self.attrs.values_cols = self.values_cols()
self.attrs.non_index_axes = self.non_index_axes

#self.attrs.non_index_axes = self.non_index_axes
self.set_non_index_axes()
self.attrs.data_columns = self.data_columns
self.attrs.nan_rep = self.nan_rep
self.attrs.encoding = self.encoding
Expand All @@ -3076,8 +3107,7 @@ def set_attrs(self):

def get_attrs(self):
""" retrieve our attributes """
self.non_index_axes = getattr(
self.attrs, 'non_index_axes', None) or []
self.non_index_axes = self.get_non_index_axes()
self.data_columns = getattr(
self.attrs, 'data_columns', None) or []
self.info = getattr(
Expand Down