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

Fix type instability in getproperty(::Schema, ::Symbol) #340

Merged
merged 7 commits into from
Oct 20, 2023
Merged

Fix type instability in getproperty(::Schema, ::Symbol) #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f02b974
Fix instability in getproperty(::Schema, :types)
MilesCranmer Aug 5, 2023
f3fa24a
Add test for type stability of `.types`
MilesCranmer Aug 5, 2023
4d4c962
Avoid `ntuple` for `fieldcount` above 512
MilesCranmer Aug 6, 2023
08b4886
Add test to assert type instability for wide tables
MilesCranmer Aug 7, 2023
9aa551a
Localize variable definition in getproperty
MilesCranmer Aug 7, 2023
edb7cc8
Update src/Tables.jl
bkamins Oct 19, 2023
fc33a5a
Clean up `getproperty` redundancy
MilesCranmer Oct 19, 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
13 changes: 11 additions & 2 deletions src/Tables.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,17 @@ function Base.getproperty(sch::Schema{names, types}, field::Symbol) where {names
if field === :names
return names === nothing ? getfield(sch, :storednames) : names
elseif field === :types
T = getfield(sch, :storedtypes)
return types === nothing ? (T !== nothing ? T : nothing) : Tuple(fieldtype(types, i) for i = 1:fieldcount(types))
if types === nothing
return getfield(sch, :storedtypes)
else
ncol = fieldcount(types)
if ncol <= 512
# Type stable, but slower to compile
return ntuple(i -> fieldtype(types, i), Val(ncol))
else
return Tuple(fieldtype(types, i) for i=1:ncol)
end
end
else
throw(ArgumentError("unsupported property for Tables.Schema"))
end
Expand Down
11 changes: 11 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,17 @@ end

# 228
@test Tables.columntable(NamedTuple[]) === NamedTuple()

@testset "Type stability of schema(x).types" begin
_get_types(X) = Tables.schema(X).types

x = (a=[1.0], b=[1.0])
@inferred Tuple{Type{Float64},Type{Float64}} _get_types(x)

# Trigger other branch which lacks type stability:
x_wide = NamedTuple([Symbol("x$(i)") => [1.0] for i=1:513])
@inferred NTuple{513,DataType} _get_types(x_wide)
end
end

@testset "Materializer" begin
Expand Down
Loading