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

Add Tables.partitions definition for Arrow.Table #443

Merged
merged 3 commits into from
May 25, 2023
Merged

Add Tables.partitions definition for Arrow.Table #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66399b2
Add Tables.partitions definition for Arrow.Table
quinnj May 24, 2023
c126aa1
fix testset
quinnj May 24, 2023
8c142ad
fix append tests
quinnj May 24, 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
36 changes: 36 additions & 0 deletions src/table.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ types(t::Table) = getfield(t, :types)
columns(t::Table) = getfield(t, :columns)
lookup(t::Table) = getfield(t, :lookup)
schema(t::Table) = getfield(t, :schema)
metadata(t::Table) = getfield(t, :metadata)

"""
Arrow.getmetadata(x)
Expand All @@ -286,6 +287,41 @@ Tables.columnnames(t::Table) = names(t)
Tables.getcolumn(t::Table, i::Int) = columns(t)[i]
Tables.getcolumn(t::Table, nm::Symbol) = lookup(t)[nm]

struct TablePartitions
table::Table
npartitions::Int
end

function TablePartitions(table::Table)
cols = columns(table)
npartitions = if length(cols) == 0
0
elseif cols[1] isa ChainedVector
length(cols[1].arrays)
else
1
end
return TablePartitions(table, npartitions)
end

function Base.iterate(tp::TablePartitions, i=1)
i > tp.npartitions && return nothing
tp.npartitions == 1 && return tp.table, i + 1
cols = columns(tp.table)
newcols = AbstractVector[cols[j].arrays[i] for j in 1:length(cols)]
nms = names(tp.table)
tbl = Table(
nms,
types(tp.table),
newcols,
Dict{Symbol, AbstractVector}(nms[i] => newcols[i] for i in 1:length(nms)),
schema(tp.table)
)
return tbl, i + 1
end

Tables.partitions(t::Table) = TablePartitions(t)

# high-level user API functions
Table(input, pos::Integer=1, len=nothing; kw...) = Table([ArrowBlob(tobytes(input), pos, len)]; kw...)
Table(input::Vector{UInt8}, pos::Integer=1, len=nothing; kw...) = Table([ArrowBlob(tobytes(input), pos, len)]; kw...)
Expand Down
15 changes: 15 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,21 @@ t = Arrow.Table(joinpath(dirname(pathof(Arrow)), "../test/java_compress_len_neg_

end

@testset "# 293" begin

t = (a = [1, 2, 3], b = [1.0, 2.0, 3.0])
buf = Arrow.tobuffer(t)
tbl = Arrow.Table(buf)
parts = Tables.partitioner((t, t))
buf2 = Arrow.tobuffer(parts)
tbl2 = Arrow.Table(buf2)
for t in Tables.partitions(tbl2)
@test t.a == tbl.a
@test t.b == tbl.b
end

end

end # @testset "misc"

end
8 changes: 5 additions & 3 deletions test/testappend.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,13 @@ function testappend_partitions()
arrow_table2 = Arrow.Table(file2)
# now
# arrow_table1: 2 partitions, 20 rows
# arrow_table2: 2 partitions, 30 rows (both partitions of table1 are appended as single partition)
# arrow_table2: 2 partitions, 30 rows (both partitions of table1 are appended as separate partitions)

@test Tables.schema(arrow_table1) == Tables.schema(arrow_table2)
@test length(Tables.columns(arrow_table1)[1]) == 20
@test length(Tables.columns(arrow_table2)[1]) == 30
@test length(collect(Tables.partitions(Arrow.Stream(file1)))) == length(collect(Tables.partitions(Arrow.Stream(file2))))
@test length(collect(Tables.partitions(Arrow.Stream(file1)))) == 2
@test length(collect(Tables.partitions(Arrow.Stream(file2)))) == 3

Arrow.append(file1, Arrow.Stream(file2))
arrow_table1 = Arrow.Table(file1)
Expand All @@ -145,6 +146,7 @@ function testappend_partitions()
@test Tables.schema(arrow_table1) == Tables.schema(arrow_table2)
@test length(Tables.columns(arrow_table1)[1]) == 50
@test length(Tables.columns(arrow_table2)[1]) == 30
@test length(collect(Tables.partitions(Arrow.Stream(file1)))) == 2 * length(collect(Tables.partitions(Arrow.Stream(file2))))
@test length(collect(Tables.partitions(Arrow.Stream(file1)))) == 5
@test length(collect(Tables.partitions(Arrow.Stream(file2)))) == 3
end
end