Add TableTraits.jl integration

REQUIRE

@@ -2,3 +2,4 @@ julia 0.6
 Compat 0.19
 NamedTuples 2.1.0
 PooledArrays
+TableTraits 0.0.1

src/IndexedTables.jl

@@ -435,4 +435,7 @@ include("join.jl")
 # query and aggregate
 include("query.jl")
 
+# TableTraits.jl integration
+include("tabletraits.jl")
+
 end # module

src/tabletraits.jl

@@ -0,0 +1,72 @@
+using TableTraits
+
+TableTraits.isiterable(x::IndexedTable) = true
+TableTraits.isiterabletable(x::IndexedTable) = true
+
+function TableTraits.getiterator{S<:IndexedTable}(source::S)
+    return rows(source)
+end
+
+# Sink
+
+@generated function _fillIndexedTable{idx_indices,data_indices}(iter,idx_storage,data_storage,::Type{idx_indices},::Type{data_indices})
+    push_exprs = Expr(:block)
+    for (i,idx) in enumerate(map(i->i.parameters[1],idx_indices.parameters))
+        ex = :( push!(idx_storage.columns[$i], row[$idx]) )
+        push!(push_exprs.args, ex)
+    end
+
+    for (i,idx) in enumerate(map(i->i.parameters[1],data_indices.parameters))
+        ex = :( push!(data_storage.columns[$i], row[$idx]) )
+        push!(push_exprs.args, ex)
+    end
+
+    quote
+        for row in iter
+            $push_exprs
+        end
+    end
+end
+
+function IndexedTable(x; idxcols::Union{Void,Vector{Symbol}}=nothing, datacols::Union{Void,Vector{Symbol}}=nothing)
+    if isiterabletable(x)
+        iter = getiterator(x)
+
+        source_colnames = TableTraits.column_names(iter)
+        source_coltypes = TableTraits.column_types(iter)
+
+        if idxcols==nothing && datacols==nothing
+            idxcols = source_colnames[1:end-1]
+            datacols = [source_colnames[end]]
+        elseif idxcols==nothing
+            idxcols = setdiff(source_colnames,datacols)
+        elseif datacols==nothing
+            datacols = setdiff(source_colnames, idxcols)
+        end
+
+        if length(setdiff(idxcols, source_colnames))>0
+            error("Unknown idxcol")
+        end
+
+        if length(setdiff(datacols, source_colnames))>0
+            error("Unknown datacol")
+        end
+
+        idxcols_indices = [findfirst(source_colnames,i) for i in idxcols]
+        datacols_indices = [findfirst(source_colnames,i) for i in datacols]
+
+        idx_storage = Columns([Array{source_coltypes[i],1}(0) for i in idxcols_indices]..., names=[source_colnames[i] for i in idxcols_indices])
+        data_storage = Columns([Array{source_coltypes[i],1}(0) for i in datacols_indices]..., names=[source_colnames[i] for i in datacols_indices])
+
+        tuple_type_idx = eval(Expr(:curly, :Tuple, [Expr(:curly, :Val, i) for i in idxcols_indices]...))
+        tuple_type_data = eval(Expr(:curly, :Tuple, [Expr(:curly, :Val, i) for i in datacols_indices]...))
+
+        _fillIndexedTable(iter, idx_storage, data_storage, tuple_type_idx, tuple_type_data)
+
+        return IndexedTable(idx_storage, data_storage)
+    elseif idxcols==nothing && datacols==nothing
+        return convert(IndexedTable, x)
+    else
+        throw(ArgumentError("x cannot be turned into an IndexedTable."))
+    end
+end

test/runtests.jl

@@ -1,3 +1,4 @@
 include("test_core.jl")
 include("test_query.jl")
 include("test_utils.jl")
+include("test_tabletraits.jl")

test/test_tabletraits.jl

@@ -0,0 +1,40 @@
+using IndexedTables
+using TableTraits
+using NamedTuples
+using DataValues
+using Base.Test
+
+@testset "TableTraits" begin
+
+source_it = IndexedTable(Columns(a=[1,2,3]), Columns(b=[1.,2.,3.], c=["A","B","C"]))
+
+@test isiterable(source_it) == true
+
+target_array = collect(getiterator(source_it))
+
+@test length(target_array) == 3
+@test target_array[1] == @NT(a=1, b=1., c="A")
+@test target_array[2] == @NT(a=2, b=2., c="B")
+@test target_array[3] == @NT(a=3, b=3., c="C")
+
+source_array = [@NT(a=1,b=1.,c="A"), @NT(a=2,b=2.,c="B"), @NT(a=3,b=3.,c="C")]
+
+it1 = IndexedTable(source_array)
+@test length(it1) == 3
+@test it1[1,1.].c == "A"
+@test it1[2,2.].c == "B"
+@test it1[3,3.].c == "C"
+
+it2 = IndexedTable(source_array, idxcols=[:a])
+@test length(it2) == 3
+@test it2[1] == @NT(b=1., c="A")
+@test it2[2] == @NT(b=2., c="B")
+@test it2[3] == @NT(b=3., c="C")
+
+it3 = IndexedTable(source_array, datacols=[:b, :c])
+@test length(it3) == 3
+@test it3[1] == @NT(b=1., c="A")
+@test it3[2] == @NT(b=2., c="B")
+@test it3[3] == @NT(b=3., c="C")
+
+end