Merge pull request JuliaArrays#29 from piever/pv/sort

add permuting and copying

Author: Pietro Vertechi

src/StructArrays.jl

@@ -10,6 +10,12 @@ include("collect.jl")
 
 function __init__()
     Requires.@require Tables="bd369af6-aec1-5ad0-b16a-f7cc5008161c" include("tables.jl")
+    Requires.@require PooledArrays="2dfb63ee-cc39-5dd5-95bd-886bf059d720" begin
+        isdiscrete(::PooledArrays.PooledArray) = true
+    end
+    Requires.@require WeakRefStrings="ea10d353-3f73-51f8-a26c-33c1cb351aa5" begin
+        isdiscrete(::WeakRefStrings.StringArray) = true
+    end
 end
 
 end # module

src/sort.jl

@@ -0,0 +1,12 @@
+isdiscrete(v) = false
+
+function Base.permute!(c::StructVector, p::AbstractVector)
+    foreachcolumn(c) do v
+        if isdiscrete(v) || v isa StructVector
+            permute!(v, p)
+        else
+            copyto!(v, v[p])
+        end
+    end
+    return c
+end

src/structarray.jl

@@ -106,12 +106,16 @@ end
 
 function Base.push!(s::StructArray, vals)
     foreachcolumn(push!, s, vals)
+    return s
 end
 
 function Base.append!(s::StructArray, vals)
     foreachcolumn(append!, s, vals)
+    return s
 end
 
+Base.copyto!(I::StructArray, J::StructArray) = (foreachcolumn(copyto!, I, J); I)
+
 function Base.cat(args::StructArray...; dims)
     f = key -> cat((getproperty(t, key) for t in args)...; dims=dims)
     T = mapreduce(eltype, promote_type, args)

test/REQUIRE

@@ -1 +1,3 @@
 Tables
+PooledArrays
+WeakRefStrings

test/runtests.jl

@@ -1,5 +1,5 @@
 using StructArrays
-import Tables
+import Tables, PooledArrays, WeakRefStrings
 using Test
 
 # write your own tests here
@@ -18,6 +18,21 @@ end
     @test StructArrays.propertynames(StructArrays.fieldarrays(t)) == (:a, :b)
 end
 
+@testset "permute" begin
+    a = WeakRefStrings.StringVector(["a", "b", "c"])
+    b = PooledArrays.PooledArray([1, 2, 3])
+    c = [:a, :b, :c]
+    s = StructArray(a=a, b=b, c=c)
+    permute!(s, [2, 3, 1])
+    @test s.a == ["b", "c", "a"]
+    @test s.b == [2, 3, 1]
+    @test s.c == [:b, :c, :a]
+    s = StructArray(a=[1, 2], b=["a", "b"])
+    t = StructArray(a=[3, 4], b=["c", "d"])
+    copyto!(s, t)
+    @test s == t
+end
+
 @testset "similar" begin
     t = StructArray(a = rand(10), b = rand(Bool, 10))
     s = similar(t)