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

Rename fillna -> fill_none. #1470

Merged
merged 2 commits into from
May 13, 2022
Merged

Rename fillna -> fill_none. #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
672fe12
_getitem_* functions must consistently set the slicer in handle_error.
jpivarski May 13, 2022
1203283
Rename fillna -> fill_none.
jpivarski May 13, 2022
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
11 changes: 5 additions & 6 deletions src/awkward/_v2/contents/bitmaskedarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,9 @@ def _getitem_next(self, head, tail, advanced):
if head == ():
return self

elif isinstance(head, (int, slice, ak._v2.index.Index64)):
elif isinstance(
head, (int, slice, ak._v2.index.Index64, ak._v2.contents.ListOffsetArray)
):
return self.toByteMaskedArray()._getitem_next(head, tail, advanced)

elif ak._util.isstr(head):
Expand All @@ -342,9 +344,6 @@ def _getitem_next(self, head, tail, advanced):
elif head is Ellipsis:
return self._getitem_next_ellipsis(tail, advanced)

elif isinstance(head, ak._v2.contents.ListOffsetArray):
return self.toByteMaskedArray()._getitem_next(head, tail, advanced)

elif isinstance(head, ak._v2.contents.IndexedOptionArray):
return self._getitem_next_missing(head, tail, advanced)

Expand Down Expand Up @@ -411,8 +410,8 @@ def mergemany(self, others):
return self
return self.toIndexedOptionArray64().mergemany(others)

def fillna(self, value):
return self.toIndexedOptionArray64().fillna(value)
def fill_none(self, value):
return self.toIndexedOptionArray64().fill_none(value)

def _local_index(self, axis, depth):
return self.toByteMaskedArray()._local_index(axis, depth)
Expand Down
14 changes: 7 additions & 7 deletions src/awkward/_v2/contents/bytemaskedarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ def _getitem_next_jagged_generic(self, slicestarts, slicestops, slicecontent, ta
reducedstarts.data,
reducedstops.data,
self.length,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)

next = self._content._carry(nextcarry, True)
Expand All @@ -353,7 +354,9 @@ def _getitem_next(self, head, tail, advanced):
if head == ():
return self

elif isinstance(head, (int, slice, ak._v2.index.Index64)):
elif isinstance(
head, (int, slice, ak._v2.index.Index64, ak._v2.contents.ListOffsetArray)
):
nexthead, nexttail = ak._v2._slicing.headtail(tail)
numnull = ak._v2.index.Index64.empty(1, self._nplike)
nextcarry, outindex = self._nextcarry_outindex(numnull)
Expand Down Expand Up @@ -381,9 +384,6 @@ def _getitem_next(self, head, tail, advanced):
elif head is Ellipsis:
return self._getitem_next_ellipsis(tail, advanced)

elif isinstance(head, ak._v2.contents.ListOffsetArray):
return self._getitem_next_jagged_generic(head, tail, advanced)

elif isinstance(head, ak._v2.contents.IndexedOptionArray):
return self._getitem_next_missing(head, tail, advanced)

Expand Down Expand Up @@ -587,8 +587,8 @@ def mergemany(self, others):
return self
return self.toIndexedOptionArray64().mergemany(others)

def fillna(self, value):
return self.toIndexedOptionArray64().fillna(value)
def fill_none(self, value):
return self.toIndexedOptionArray64().fill_none(value)

def _local_index(self, axis, depth):
posaxis = self.axis_wrap_if_negative(axis)
Expand Down
9 changes: 6 additions & 3 deletions src/awkward/_v2/contents/content.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ def _getitem_next_regular_missing(self, head, tail, advanced, raw, length):
index.length,
length,
raw._size,
)
),
slicer=head,
)

out = ak._v2.contents.indexedoptionarray.IndexedOptionArray(
Expand Down Expand Up @@ -397,7 +398,8 @@ def _getitem_next_missing_jagged(self, head, tail, advanced, that):
starts.data,
stops.data,
index.length,
)
),
slicer=head,
)

tmp = content._getitem_next_jagged(starts, stops, jagged.content, tail)
Expand Down Expand Up @@ -622,7 +624,8 @@ def _carry_asrange(self, carry):
result,
carry.data,
carry.length,
)
),
slicer=carry.data,
)
if result[0]:
if carry.length == self.length:
Expand Down
2 changes: 1 addition & 1 deletion src/awkward/_v2/contents/emptyarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def mergemany(self, others):
tail_others = others[1:]
return others[0].mergemany(tail_others)

def fillna(self, value):
def fill_none(self, value):
return EmptyArray(None, self._parameters, self._nplike)

def _local_index(self, axis, depth):
Expand Down
19 changes: 10 additions & 9 deletions src/awkward/_v2/contents/indexedarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ def _getitem_next_jagged_generic(self, slicestarts, slicestops, slicecontent, ta
self._index.data,
self._index.length,
self._content.length,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)
# an eager carry (allow_lazy = false) to avoid infinite loop (unproven)
next = self._content._carry(nextcarry, False)
Expand All @@ -233,7 +234,9 @@ def _getitem_next(self, head, tail, advanced):
if head == ():
return self

elif isinstance(head, (int, slice, ak._v2.index.Index64)):
elif isinstance(
head, (int, slice, ak._v2.index.Index64, ak._v2.contents.ListOffsetArray)
):
nexthead, nexttail = ak._v2._slicing.headtail(tail)

nextcarry = ak._v2.index.Index64.empty(self._index.length, self._nplike)
Expand All @@ -250,7 +253,8 @@ def _getitem_next(self, head, tail, advanced):
self._index.data,
self._index.length,
self._content.length,
)
),
slicer=head,
)

next = self._content._carry(nextcarry, False)
Expand All @@ -268,9 +272,6 @@ def _getitem_next(self, head, tail, advanced):
elif head is Ellipsis:
return self._getitem_next_ellipsis(tail, advanced)

elif isinstance(head, ak._v2.contents.ListOffsetArray):
raise ak._v2._util.error(NotImplementedError)

elif isinstance(head, ak._v2.contents.IndexedOptionArray):
return self._getitem_next_missing(head, tail, advanced)

Expand Down Expand Up @@ -640,14 +641,14 @@ def mergemany(self, others):
)
)

def fillna(self, value):
def fill_none(self, value):
if value.nplike.known_shape and value.length != 1:
raise ak._v2._util.error(
ValueError(f"fillna value length ({value.length}) is not equal to 1")
ValueError(f"fill_none value length ({value.length}) is not equal to 1")
)
return IndexedArray(
self._index,
self._content.fillna(value),
self._content.fill_none(value),
None,
self._parameters,
self._nplike,
Expand Down
14 changes: 7 additions & 7 deletions src/awkward/_v2/contents/indexedoptionarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ def _getitem_next_jagged_generic(self, slicestarts, slicestops, slicecontent, ta
reducedstarts.data,
reducedstops.data,
self.length,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)
next = self._content._carry(nextcarry, True)
out = next._getitem_next_jagged(reducedstarts, reducedstops, slicecontent, tail)
Expand All @@ -309,7 +310,9 @@ def _getitem_next(self, head, tail, advanced):
if head == ():
return self

elif isinstance(head, (int, slice, ak._v2.index.Index64)):
elif isinstance(
head, (int, slice, ak._v2.index.Index64, ak._v2.contents.ListOffsetArray)
):
nexthead, nexttail = ak._v2._slicing.headtail(tail)

numnull, nextcarry, outindex = self._nextcarry_outindex(self._nplike)
Expand All @@ -333,9 +336,6 @@ def _getitem_next(self, head, tail, advanced):
elif head is Ellipsis:
return self._getitem_next_ellipsis(tail, advanced)

elif isinstance(head, ak._v2.contents.ListOffsetArray):
raise ak._v2._util.error(NotImplementedError)

elif isinstance(head, ak._v2.contents.IndexedOptionArray):
return self._getitem_next_missing(head, tail, advanced)

Expand Down Expand Up @@ -743,10 +743,10 @@ def mergemany(self, others):
)
)

def fillna(self, value):
def fill_none(self, value):
if value.nplike.known_shape and value.length != 1:
raise ak._v2._util.error(
ValueError(f"fillna value length ({value.length}) is not equal to 1")
ValueError(f"fill_none value length ({value.length}) is not equal to 1")
)

contents = [self._content, value]
Expand Down
37 changes: 24 additions & 13 deletions src/awkward/_v2/contents/listarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ def _getitem_next_jagged(self, slicestarts, slicestops, slicecontent, tail):
self._starts.data,
self._stops.data,
),
slicer=ListArray(slicestarts, slicestops, slicecontent),
)

asListOffsetArray64 = self.toListOffsetArray64(True)
Expand Down Expand Up @@ -346,7 +347,8 @@ def _getitem_next_jagged(self, slicestarts, slicestops, slicecontent, tail):
slicestarts.data,
slicestops.data,
slicestarts.length,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)
sliceindex = ak._v2.index.Index64(slicecontent._data)
outoffsets = ak._v2.index.Index64.empty(
Expand Down Expand Up @@ -384,7 +386,8 @@ def _getitem_next_jagged(self, slicestarts, slicestops, slicecontent, tail):
self._starts.data,
self._stops.data,
self._content.length,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)

nextcontent = self._content._carry(nextcarry, True)
Expand Down Expand Up @@ -429,7 +432,8 @@ def _getitem_next_jagged(self, slicestarts, slicestops, slicecontent, tail):
slicestarts.length,
missing.data,
missing.length,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)

nextcarry = ak._v2.index.Index64.empty(numvalid[0], self._nplike)
Expand Down Expand Up @@ -466,7 +470,8 @@ def _getitem_next_jagged(self, slicestarts, slicestops, slicecontent, tail):
slicestops.data,
slicestarts.length,
missing.data,
)
),
slicer=ak._v2.contents.ListArray(slicestarts, slicestops, slicecontent),
)

if isinstance(
Expand Down Expand Up @@ -554,7 +559,7 @@ def _getitem_next(self, head, tail, advanced):
lenstarts,
head,
),
head,
slicer=head,
)
nextcontent = self._content._carry(nextcarry, True)
return nextcontent._getitem_next(nexthead, nexttail, advanced)
Expand Down Expand Up @@ -591,7 +596,8 @@ def _getitem_next(self, head, tail, advanced):
start,
stop,
step,
)
),
slicer=head,
)
nextcarry = ak._v2.index.Index64.empty(carrylength[0], self._nplike)
else:
Expand Down Expand Up @@ -628,7 +634,8 @@ def _getitem_next(self, head, tail, advanced):
start,
stop,
step,
)
),
slicer=head,
)

nextcontent = self._content._carry(nextcarry, True)
Expand Down Expand Up @@ -657,7 +664,8 @@ def _getitem_next(self, head, tail, advanced):
total.data,
nextoffsets.data,
lenstarts,
)
),
slicer=head,
)
nextadvanced = ak._v2.index.Index64.empty(total[0], self._nplike)
else:
Expand All @@ -681,7 +689,8 @@ def _getitem_next(self, head, tail, advanced):
advanced.data,
nextoffsets.data,
lenstarts,
)
),
slicer=head,
)
return ak._v2.contents.listoffsetarray.ListOffsetArray(
nextoffsets,
Expand Down Expand Up @@ -741,7 +750,7 @@ def _getitem_next(self, head, tail, advanced):
regular_flathead.length,
self._content.length,
),
head,
slicer=head,
)
nextcontent = self._content._carry(nextcarry, True)

Expand Down Expand Up @@ -784,7 +793,8 @@ def _getitem_next(self, head, tail, advanced):
lenstarts,
regular_flathead.length,
self._content.length,
)
),
slicer=head,
)
nextcontent = self._content._carry(nextcarry, True)

Expand Down Expand Up @@ -832,6 +842,7 @@ def _getitem_next(self, head, tail, advanced):
head.length,
length,
),
slicer=head,
)
carried = self._content._carry(nextcarry, True)
down = carried._getitem_next_jagged(
Expand Down Expand Up @@ -1059,11 +1070,11 @@ def mergemany(self, others):
else:
return reversed.mergemany(tail[1:])

def fillna(self, value):
def fill_none(self, value):
return ListArray(
self._starts,
self._stops,
self._content.fillna(value),
self._content.fill_none(value),
self._identifier,
self._parameters,
self._nplike,
Expand Down
Loading