Skip to content
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.

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

Add default dtype for empty series #188

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
14 changes: 12 additions & 2 deletions eland/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@
SizeTask,
)

with warnings.catch_warnings() as w:
mesejo marked this conversation as resolved.
Show resolved Hide resolved
warnings.simplefilter("ignore")
EMPTY_SERIES_DTYPE = pd.Series().dtype


def build_series(data, dtype=None, **kwargs):
out_dtype = EMPTY_SERIES_DTYPE if not data else dtype
s = pd.Series(data=data, index=data.keys(), dtype=out_dtype, **kwargs)
return s


class Operations:
"""
Expand Down Expand Up @@ -340,7 +350,7 @@ def _metric_aggs(
# Return single value if this is a series
# if len(numeric_source_fields) == 1:
# return np.float64(results[numeric_source_fields[0]])
s = pd.Series(data=results, index=results.keys())
s = build_series(results)

return s

Expand Down Expand Up @@ -390,7 +400,7 @@ def _terms_aggs(self, query_compiler, func, es_size=None):
except IndexError:
name = None

s = pd.Series(data=results, index=results.keys(), name=name)
s = build_series(results, name=name)

return s

Expand Down
5 changes: 5 additions & 0 deletions eland/tests/dataframe/test_dtypes_pytest.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import numpy as np
from pandas.testing import assert_series_equal

from eland.operations import build_series, EMPTY_SERIES_DTYPE
from eland.tests.common import TestData
from eland.tests.common import assert_pandas_eland_frame_equal

Expand All @@ -42,3 +43,7 @@ def test_flights_select_dtypes(self):
pd_flights.select_dtypes(include=np.number),
ed_flights.select_dtypes(include=np.number),
)

def test_emtpy_series_dtypes(self):
s = build_series({})
mesejo marked this conversation as resolved.
Show resolved Hide resolved
assert s.dtype == EMPTY_SERIES_DTYPE