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

Column insertion in DataFrameRow #3391

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Column insertion in DataFrameRow #3391

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ef44c0
initial implementation
bkamins Oct 18, 2023
6890681
fix typo
bkamins Oct 18, 2023
eccd0b4
Update src/dataframerow/dataframerow.jl
bkamins Oct 22, 2023
a141a71
avoid repeated index call
bkamins Oct 22, 2023
f91b6d4
Merge branch 'bk/row_insertion' of https://github.com/JuliaData/DataF…
bkamins Oct 22, 2023
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
40 changes: 37 additions & 3 deletions src/dataframerow/dataframerow.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,45 @@ for T in MULTICOLUMNINDEX_TUPLE
end
end

Base.@propagate_inbounds Base.setindex!(r::DataFrameRow, value, idx) =
setindex!(parent(r), value, row(r), parentcols(index(r), idx))

index(r::DataFrameRow) = getfield(r, :colindex)

is_column_insertion_allowed(dfr::DataFrameRow) = index(dfr) isa Index

Base.@propagate_inbounds function Base.setindex!(dfr::DataFrameRow, value, idx)
if idx isa SymbolOrString && (int_idx = columnindex(dfr, idx)) == 0
if !is_column_insertion_allowed(dfr)
throw(ArgumentError("creating new columns in a DataFrameRow that subsets " *
"columns of its parent data frame is disallowed"))
end
T = typeof(val)
newcol = similar(val, Union{T,Missing}, nrow(parent(dfr)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use Tables.allocate_column? similar is for arrays.

Or maybe just call insertcols! to avoid duplication? Is that slower?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a very good point. I used similar, because we already had it in
https://github.com/JuliaData/DataFrames.jl/blob/main/src/subdataframe/subdataframe.jl#L207
which also requires fixing then.

Other places with the same issue are e.g.:

Do you think we should do a systematic review of them and fix this everywhere?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we followed the policy that similar is called when we have a vector to pass to it, and otherwise allocatecolumn is used. Apparently that's not really the case, given the example in broadcasting.jl. The two other examples look correct to me. We could try changing the broadcasting.jl one and check whether other places have the same issue.

fill!(newcol, missing)
newcol[row(dfr)] = val
parent(dfr)[!, int_idx] = newcol
else
setindex!(parent(dfr), value, row(dfr), parentcols(index(dfr), idx))
end
return dfr
end

insertcols(dfr::DataFrameRow, args...;
after::Bool=false, makeunique::Bool=false, copycols::Bool=true) =
throw(ArgumentError("insertcols is not supported for DataFrameRow. " *
"Maybe you wanted to use insertcols!?"))

function insertcols!(dfr::DataFrameRow, col::ColumnIndex, name_cols::Pair{Symbol}...;
after::Bool=false, makeunique::Bool=false, copycols::Bool=false)
if !is_column_insertion_allowed(dfr)
throw(ArgumentError("creating new columns in a DataFrameRow that subsets " *
"columns of its parent data frame is disallowed"))
end
r = row(dfr)
insertcols!(view(parent(dfr), r:r, :),
col, (k => [v] for (k,v) in name_cols)...,
after=after, makeunique=makeunique, copycols=copycols)
return dfr
end

Base.names(r::DataFrameRow, cols::Colon=:) = names(index(r))

function Base.names(r::DataFrameRow, cols)
Expand Down