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

fix first and last for negative row count #3402

Merged
merged 3 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

## Bug fixes

* Correctly throw an error if negative number of rows is passed
to `first` or `last`
([#3402](https://github.com/JuliaData/DataFrames.jl/pull/3402))
* Always use the default thread pool for multithreaded operations,
instead of using the interactive thread pool when Julia was started
with `-tM,N` with N > 0
Expand Down
18 changes: 14 additions & 4 deletions src/abstractdataframe/abstractdataframe.jl
Original file line number Diff line number Diff line change
Expand Up @@ -558,14 +558,19 @@ Base.first(df::AbstractDataFrame) = df[1, :]
first(df::AbstractDataFrame, n::Integer; view::Bool=false)

Get a data frame with the `n` first rows of `df`.
Get all rows if `n` is greater than the number of rows in `df`.
Error if `n` is negative.

If `view=false` a freshly allocated `DataFrame` is returned.
If `view=true` then a `SubDataFrame` view into `df` is returned.

$METADATA_FIXED
"""
@inline Base.first(df::AbstractDataFrame, n::Integer; view::Bool=false) =
view ? Base.view(df, 1:min(n ,nrow(df)), :) : df[1:min(n, nrow(df)), :]
@inline function Base.first(df::AbstractDataFrame, n::Integer; view::Bool=false)
n < 0 && throw(ArgumentError("Number of elements must be nonnegative"))
r = min(n, nrow(df))
return view ? Base.view(df, 1:r, :) : df[1:r, :]
end

"""
last(df::AbstractDataFrame)
Expand All @@ -580,14 +585,19 @@ Base.last(df::AbstractDataFrame) = df[nrow(df), :]
last(df::AbstractDataFrame, n::Integer; view::Bool=false)

Get a data frame with the `n` last rows of `df`.
Get all rows if `n` is greater than the number of rows in `df`.
Error if `n` is negative.

If `view=false` a freshly allocated `DataFrame` is returned.
If `view=true` then a `SubDataFrame` view into `df` is returned.

$METADATA_FIXED
"""
@inline Base.last(df::AbstractDataFrame, n::Integer; view::Bool=false) =
view ? Base.view(df, max(1, nrow(df)-n+1):nrow(df), :) : df[max(1, nrow(df)-n+1):nrow(df), :]
@inline function Base.last(df::AbstractDataFrame, n::Integer; view::Bool=false)
n < 0 && throw(ArgumentError("Number of elements must be nonnegative"))
r = max(1, nrow(df) - n + 1)
return view ? Base.view(df, r:nrow(df), :) : df[r:nrow(df), :]
end

"""
describe(df::AbstractDataFrame; cols=:)
Expand Down
14 changes: 10 additions & 4 deletions test/dataframe.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1180,10 +1180,16 @@ end
@test_throws BoundsError first(DataFrame(x=[]))
@test_throws BoundsError last(DataFrame(x=[]))

@test first(df, 6) == DataFrame(A=1:6)
@test first(df, 1) == DataFrame(A=1)
@test last(df, 6) == DataFrame(A=5:10)
@test last(df, 1) == DataFrame(A=10)
for v in (true, false)
@test first(df, 6, view=v) == DataFrame(A=1:6)
@test first(df, 1, view=v) == DataFrame(A=1)
@test first(df, 0, view=v) == DataFrame(A=Int[])
@test_throws ArgumentError first(df, -1, view=v)
@test last(df, 6, view=v) == DataFrame(A=5:10)
@test last(df, 1, view=v) == DataFrame(A=10)
@test last(df, 0, view=v) == DataFrame(A=Int[])
@test_throws ArgumentError last(df, -1, view=v)
end

@inferred first(df, 6)
@inferred last(df, 6)
Expand Down
Loading