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.

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

Jump to bottom

Fix df.loc when providing empty list #2528

Merged
merged 1 commit into from
Oct 15, 2021
Merged

Fix df.loc when providing empty list #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 3 deletions mars/dataframe/indexing/index_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,10 @@ def preprocess(self,
for chunk_index, pos in chunk_index_to_pos.items():
# chunk_index and pos are all list with 1 element
abs_pos = pos[0] + cum_nsplit[chunk_index[0]]
chunk_labels = to_numpy(pd_index[abs_pos])
if isinstance(pd_index, pd.RangeIndex) and len(abs_pos) == 0:
chunk_labels = np.array([], dtype=pd_index.dtype)
else:
chunk_labels = to_numpy(pd_index[abs_pos])
chunk_index_to_labels[chunk_index[0]] = chunk_labels

index_info.is_label_asc_sorted = is_asc_sorted
Expand All @@ -778,6 +781,8 @@ def process(self,
tileable = context.tileable
input_axis = index_info.input_axis
chunk_index_to_labels = index_info.chunk_index_to_labels
full_label_size = sum(labels.size for labels
in chunk_index_to_labels.values())

other_index_to_iter = dict()
chunk_index_to_info = context.chunk_index_to_info.copy()
Expand All @@ -786,8 +791,11 @@ def process(self,
chunk_labels = chunk_index_to_labels[i]
size = chunk_labels.size

if size == 0 and tileable.shape[0] > 0:
# not effected when tileable not empty and no index chosen
if size == 0 and full_label_size > 0 and tileable.shape[0] > 0:
# not effected when
# 1) tileable not empty
# 2) full index not empty
# 3) no index chosen for this chunk
del context.chunk_index_to_info[chunk_index]
continue

Expand Down
11 changes: 11 additions & 0 deletions mars/dataframe/indexing/tests/test_indexing_execution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,17 @@ def test_loc_getitem(setup):
expected = raw1.loc['a3', 'b']
assert result == expected

# test empty list
df = df1.loc[[]]
result = df.execute().fetch()
expected = raw1.loc[[]]
pd.testing.assert_frame_equal(result, expected)

df = df2.loc[[]]
result = df.execute().fetch()
expected = raw2.loc[[]]
pd.testing.assert_frame_equal(result, expected)

df = df2.loc[1:4, 'b':'d']
result = df.execute().fetch()
expected = raw2.loc[1:4, 'b': 'd']
Expand Down