use IndexedTables setcol rather than reinveinting it (#23)

* wip

* remove _view

* test for setcol

Author: Pietro Vertechi

REQUIRE

@@ -1,8 +1,8 @@
 julia 0.6
 Compat
-IndexedTables 0.6
+IndexedTables 0.7.2
 JuliaDB 0.7.0
 Reexport
 MacroTools
 IterTools
-Dagger
+Dagger

src/transform.jl

@@ -1,15 +1,15 @@
-transformcol(t, s, col) = s in colnames(t) ? setcol(t, s, col) : pushcol(t, s, col)
-function transformcol(t, col::NamedTuples.NamedTuple)
-    for (key, val) in zip(keys(col), values(col))
-        t = transformcol(t, key, val)
-    end
-    t
+@deprecate transformcol setcol
+
+function _setcol(t, col::NamedTuples.NamedTuple)
+    p = ((key => val) for (key, val) in zip(keys(col), values(col)))
+    setcol(t, p)
 end
-transformcol(t, col::Union{Columns, IndexedTables.AbstractIndexedTable}) = transformcol(t, columns(col))
+_setcol(t, col::Union{Columns, IndexedTables.AbstractIndexedTable}) = _setcol(t, columns(col))
+_setcol(t, args...) = setcol(t, args...)
 
 function transform_vec_helper(args...)
     d = gensym()
-    func = Expr(:(->), d, Expr(:call, :(JuliaDBMeta.transformcol), d, with_helper(d, args[end])))
+    func = Expr(:(->), d, Expr(:call, :(JuliaDBMeta._setcol), d, with_helper(d, args[end])))
     Expr(:call, :(JuliaDBMeta._pipe), func, replace_keywords(args[1:end-1])...)
 end
 
@@ -42,8 +42,8 @@ macro transform_vec(args...)
 end
 
 function transform_helper(args...)
-    d = gensym() 
-    func = Expr(:(->), d, Expr(:call, :(JuliaDBMeta.transformcol), d, map_helper(d, args[end])))
+    d = gensym()
+    func = Expr(:(->), d, Expr(:call, :(JuliaDBMeta._setcol), d, map_helper(d, args[end])))
     Expr(:call, :(JuliaDBMeta._pipe_chunks), func, args[1:end-1]...)
 end
 

src/utils.jl

@@ -92,16 +92,4 @@ _table(cols::C) where{C<:Columns} =
        NextTable{C}(cols, Int[], IndexedTables.Perm[], fill(Nullable{Float64}(), length(cols)), nothing)
 _table(c) = c
 
-_view(t, I) = view(t, find(I))
-
-function _view(t::IndexedTables.NextTable, I)
-    sorted_index = (eltype(I) == Bool) || issorted(I)
-    table(
-        view(t.columns, I),
-        pkey = sorted_index ? t.pkey : Int64[],
-        copy = false,
-        presorted = true
-    )
-end
-
 distinct_tuple(args...) = Tuple(IterTools.distinct(args))

src/where.jl

@@ -1,6 +1,6 @@
 function where_vec_helper(args...)
     d = gensym()
-    func = Expr(:(->), d,  Expr(:call, :(JuliaDBMeta._view), d, with_helper(d, args[end])))
+    func = Expr(:(->), d,  Expr(:call, :(view), d, with_helper(d, args[end])))
     Expr(:call, :(JuliaDBMeta._pipe), func, replace_keywords(args[1:end-1])...)
 end
 
@@ -33,7 +33,7 @@ end
 
 function where_helper(args...)
     d = gensym()
-    func = Expr(:(->), d,  Expr(:call, :(JuliaDBMeta._view), d, map_helper(d, args[end])))
+    func = Expr(:(->), d,  Expr(:call, :(view), d, map_helper(d, args[end])))
     Expr(:call, :(JuliaDBMeta._pipe_chunks), func, args[1:end-1]...)
 end
 

test/runtests.jl

@@ -75,6 +75,10 @@ end
 
 @testset "transform" begin
     t = table([1,2,3], [4,5,6], [0.1, 0.2, 0.3], names = [:x, :y, :z])
+    @test setcol(t, :x => [2,3,4], :y => [4,5,6]) ==
+        JuliaDBMeta._setcol(t, :x => [2,3,4], :y => [4,5,6]) ==
+        JuliaDBMeta._setcol(t, Columns(x = [2,3,4], y = [4,5,6]))
+
     @test (@transform_vec t @NT(a = :x .+ :y)) == pushcol(t, :a, [1,2,3] .+ [4,5,6])
     @test @transform_vec(@NT(a = :x .+ :y))(t) == pushcol(t, :a, [1,2,3] .+ [4,5,6])
     @test (@transform_vec t @NT(z = :x .+ :y)) == setcol(t, :z, [1,2,3] .+ [4,5,6])
@@ -90,7 +94,6 @@ end
     @test (@where_vec t (:x .< 3) .& (:z .== 0.2)) == view(t, [2])
     @test @where_vec(t, 1:2) == view(t, 1:2)
     @test @where_vec(rows(t), 1:2) == view(t, 1:2)
-    @test JuliaDBMeta._view(rows(t), 1:2) == view(rows(t), 1:2)
     @test @where_vec((:x .< 3) .& (:z .== 0.2))(t) == view(t, [2])
     @test (@where t (:x < 3) .& (:z == 0.2)) == view(t, [2])
     @test @where((:x < 3) .& (:z == 0.2))(t) == view(t, [2])