Skip to content

include pandas Index object in dataframe indexing options #1698

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
Aug 4, 2020
Merged

include pandas Index object in dataframe indexing options #1698

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e0ddc5
is_list_like condition and list conversion for dataframe indexing wit…
sllynn Aug 4, 2020
fe8e6d4
split out logic for str / tuple vs. other list like types
sllynn Aug 4, 2020
0024918
test on dataframe values, not shape
sllynn Aug 4, 2020
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
8 changes: 5 additions & 3 deletions databricks/koalas/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10094,16 +10094,18 @@ def __getitem__(self, key):

if key is None:
raise KeyError("none key")
if isinstance(key, (str, tuple, list)):
if isinstance(key, Series):
return self.loc[key.astype(bool)]
elif isinstance(key, (str, tuple)):
return self.loc[:, key]
elif is_list_like(key):
return self.loc[:, list(key)]
elif isinstance(key, slice):
if any(type(n) == int or None for n in [key.start, key.stop]):
# Seems like pandas Frame always uses int as positional search when slicing
# with ints.
return self.iloc[key]
return self.loc[key]
elif isinstance(key, Series):
return self.loc[key.astype(bool)]
raise NotImplementedError(key)

def __setitem__(self, key, value):
Expand Down
6 changes: 6 additions & 0 deletions databricks/koalas/tests/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ def test_dataframe(self):
kser = ks.from_pandas(pser)
self.assert_eq(pd.DataFrame(pser), ks.DataFrame(kser))

# check kdf[pd.Index]
pdf, kdf = self.df_pair
column_mask = pdf.columns.isin(["a", "b"])
index_cols = pdf.columns[column_mask]
self.assert_eq(pdf[index_cols].shape, kdf[index_cols].shape)

def test_inplace(self):
pdf, kdf = self.df_pair

Expand Down