update for julia1 (#28)

Pietro Vertechi · web-flow · commit ee0f709ccd38 · 2018-11-10T12:20:04.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: julia
 os:
   - linux
 julia:
-  - 0.6
+  - 1.0
   - nightly
 matrix:
   allow_failures:
@@ -31,9 +31,9 @@ notifications:
 #  - julia -e 'Pkg.clone(pwd()); Pkg.build("JuliaDBMeta"); Pkg.test("JuliaDBMeta"; coverage=true)'
 after_success:
   # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia -e 'import Pkg; cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'import Pkg; cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
   # deploy docs
-  - julia -e 'Pkg.add("Documenter")'
-  - julia -e 'cd(Pkg.dir("JuliaDBMeta")); include(joinpath("docs", "make.jl"))'
+  - julia -e 'import Pkg; Pkg.add("Documenter")'
+  - julia -e 'import Pkg; cd(Pkg.dir("JuliaDBMeta")); include(joinpath("docs", "make.jl"))'
diff --git a/README.md b/README.md
@@ -3,8 +3,6 @@
 [![Build Status](https://travis-ci.org/piever/JuliaDBMeta.jl.svg?branch=master)](https://travis-ci.org/piever/JuliaDBMeta.jl)
 [![codecov.io](http://codecov.io/github/piever/JuliaDBMeta.jl/coverage.svg?branch=master)](http://codecov.io/github/piever/JuliaDBMeta.jl?branch=master)
 [![](https://img.shields.io/badge/docs-latest-blue.svg)](https://piever.github.io/JuliaDBMeta.jl/latest/)
-[![JuliaDBMeta](http://pkg.julialang.org/badges/JuliaDBMeta_0.6.svg)](http://pkg.julialang.org/?pkg=JuliaDBMeta)
-[![JuliaDBMeta](http://pkg.julialang.org/badges/JuliaDBMeta_0.7.svg)](http://pkg.julialang.org/?pkg=JuliaDBMeta)
 
 JuliaDBMeta is a set of macros to simplify data manipulation with [JuliaDB](https://github.com/JuliaComputing/JuliaDB.jl), heavily inspired on [DataFramesMeta](https://github.com/JuliaStats/DataFramesMeta.jl). It exploits the technical advantages of JuliaDB:
 
diff --git a/REQUIRE b/REQUIRE
@@ -1,7 +1,6 @@
-julia 0.6
-Compat
-IndexedTables 0.7.2
-JuliaDB 0.7.0
+julia 1.0.2
+IndexedTables 0.8.1
+JuliaDB 0.9.0
 Reexport
 MacroTools
 IterTools
diff --git a/src/JuliaDBMeta.jl b/src/JuliaDBMeta.jl
@@ -1,7 +1,7 @@
-__precompile__()
 module JuliaDBMeta
 
-using IndexedTables, MacroTools, NamedTuples, Reexport
+using IndexedTables, MacroTools, Reexport
+import IndexedTables: select
 import IterTools
 
 import JuliaDB: Dataset, DDataset, fromchunks
diff --git a/src/apply.jl b/src/apply.jl
@@ -76,7 +76,7 @@ function thread(ex)
      if isexpr(ex, :block)
           thread(rmlines(ex).args...)
      elseif isa(ex, Expr)
-          us = find(ex.args .== :(_))
+          us = findall(ex.args .== :(_))
           i = gensym()
           ex.args[us] .= i
           isempty(us) ? ex : Expr(:(->), i, ex)
diff --git a/src/byrow.jl b/src/byrow.jl
@@ -9,7 +9,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest byrow
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @byrow! t :b = :b*string(:a)
 Table with 3 rows, 2 columns:
diff --git a/src/filter.jl b/src/filter.jl
@@ -10,7 +10,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest filter
-julia> t = table(@NT(a = [1,2,3], b=[2,3,4]));
+julia> t = table((a = [1,2,3], b=[2,3,4]));
 
 julia> @filter t :a < 3
 Table with 2 rows, 2 columns:
diff --git a/src/map.jl b/src/map.jl
@@ -11,7 +11,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest map
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @map t :b*string(:a)
 3-element Array{String,1}:
diff --git a/src/pair.jl b/src/pair.jl
@@ -9,7 +9,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest pair
-julia> t = table(@NT(a = [1,2,3], b = [4,5,6]));
+julia> t = table((a = [1,2,3], b = [4,5,6]));
 
 julia> select(t, @=>(:a, :a + :b))
 Table with 3 rows, 2 columns:
@@ -44,7 +44,7 @@ Short-hand for `select(d, @=>(x))`
 ## Examples
 
 ```jldoctest select
-julia> t = table(@NT(a = [1,2,3], b = [4,5,6]));
+julia> t = table((a = [1,2,3], b = [4,5,6]));
 
 julia> @select(t, (:a, :a + :b))
 Table with 3 rows, 2 columns:
diff --git a/src/transform.jl b/src/transform.jl
@@ -1,6 +1,6 @@
 @deprecate transformcol setcol
 
-function _setcol(t, col::NamedTuples.NamedTuple)
+function _setcol(t, col::NamedTuple)
     p = ((key => val) for (key, val) in zip(keys(col), values(col)))
     setcol(t, p)
 end
@@ -26,7 +26,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest transform_vec
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @transform_vec t {:a .+ 1}
 Table with 3 rows, 3 columns:
@@ -61,7 +61,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest transform
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @transform t {:a + 1}
 Table with 3 rows, 3 columns:
diff --git a/src/utils.jl b/src/utils.jl
@@ -1,7 +1,7 @@
 const AbstractDataset = Union{Dataset, DDataset}
 
 isquotenode(::Any) = false
-isquotenode(x::Expr) = x.head == :quote
+isquotenode(::QuoteNode) = true
 
 ispair(::Any) = false
 ispair(x::Expr) = length(x.args) >=1 && x.args[1] == :(=>)
@@ -23,12 +23,14 @@ function _parse_function_call!(syms, d, x, func, args...)
     end
 end
 
+function _parse_function_call!(syms, d, x::QuoteNode, func, args...)
+    push!(syms, x)
+    func(d, x, args...)
+end
+
 function _parse_function_call!(syms, d, x::Expr, func, args...)
     if x.head == :. && length(x.args) == 2 && isquotenode(x.args[2])
         Expr(x.head, _parse_function_call!(syms, d, x.args[1], func, args...), x.args[2])
-    elseif x.head == :quote
-        push!(syms, x)
-        func(d, x, args...)
     elseif x.head == :call && length(x.args) == 2 && x.args[1] == :^
             x.args[2]
     elseif x.head == :call && x.args[1] == :cols
@@ -51,7 +53,7 @@ end
 
 function replace_key(key, ex)
     MacroTools.postwalk(ex) do x
-        if x == Expr(:., :(_), Expr(:quote, :key))
+        if x == Expr(:., :(_), QuoteNode(:key))
             return key
         else
             return x
@@ -62,18 +64,18 @@ end
 # From Query: use curly brackets to simplify writing named tuples
 function helper_namedtuples_replacement(ex)
 	MacroTools.postwalk(ex) do x
-		if x isa Expr && x.head==:cell1d
-			new_ex = Expr(:macrocall, Expr(:., :(JuliaDBMeta.NamedTuples), QuoteNode(Symbol("@NT"))), x.args...)
+		if x isa Expr && x.head==:braces
+			new_ex = Expr(:tuple, x.args...)
 
-			for (j,field_in_NT) in enumerate(new_ex.args[2:end])
+			for (j,field_in_NT) in enumerate(new_ex.args)
 				if isa(field_in_NT, Expr) && field_in_NT.head==:(=)
-					new_ex.args[j+1] = Expr(:kw, field_in_NT.args...)
+					new_ex.args[j] = Expr(:(=), field_in_NT.args...)
 				elseif isquotenode(field_in_NT)
-					new_ex.args[j+1] = Expr(:kw, field_in_NT.args[1], field_in_NT)
+					new_ex.args[j] = Expr(:(=), field_in_NT.value, field_in_NT)
                 elseif isa(field_in_NT, Expr)
-                    new_ex.args[j+1] = Expr(:kw, Symbol(filter(t -> t != ':', string(field_in_NT))), field_in_NT)
+                    new_ex.args[j] = Expr(:(=), Symbol(filter(t -> t != ':', string(field_in_NT))), field_in_NT)
                 elseif isa(field_in_NT, Symbol)
-                   new_ex.args[j+1] = Expr(:kw, field_in_NT, field_in_NT)
+                   new_ex.args[j] = Expr(:(=), field_in_NT, field_in_NT)
                 end
 			end
 
@@ -89,7 +91,7 @@ replace_keyword(arg) = (@capture arg x_ = y_) ? Expr(:kw, x, y) : arg
 replace_keywords(args) = map(replace_keyword, args)
 
 _table(cols::C) where{C<:Columns} =
-       NextTable{C}(cols, Int[], IndexedTables.Perm[], fill(Nullable{Float64}(), length(cols)), nothing)
+       NextTable{C}(cols, Int[], IndexedTables.Perm[], fill(missing, length(cols)), nothing)
 _table(c) = c
 
 distinct_tuple(args...) = Tuple(IterTools.distinct(args))
diff --git a/src/where.jl b/src/where.jl
@@ -18,7 +18,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest where_vec
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @where_vec t (:a .>= 2) .& (:b .!= "y")
 Table with 1 rows, 2 columns:
@@ -51,7 +51,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest where
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @where t :a <= 2
 Table with 2 rows, 2 columns:
diff --git a/src/with.jl b/src/with.jl
@@ -9,7 +9,7 @@ the scope where the macro is called.
 ## Examples
 
 ```jldoctest with
-julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
+julia> t = table((a = [1,2,3], b = ["x","y","z"]));
 
 julia> @with t mean(:a)
 2.0
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,14 +1,16 @@
+using Distributed
+
 addprocs(4)
 
-@everywhere using JuliaDBMeta, Compat, NamedTuples
-@everywhere using JuliaDB, Dagger
-@everywhere using Compat.Test
+using JuliaDBMeta
+using JuliaDB, Dagger
+using Test
 
-iris1 = collect(loadtable(joinpath(@__DIR__, "tables", "iris.csv")))
+iris1 = loadtable(joinpath(@__DIR__, "tables", "iris.csv"), distributed = false)
 iris2 = table(iris1, chunks = 5)
 
 @testset "utils" begin
-    @test JuliaDBMeta.isquotenode(Expr(:quote, 3))
+    @test JuliaDBMeta.isquotenode(QuoteNode(:test))
     @test !JuliaDBMeta.isquotenode(Expr(:call, exp, 3))
     @test !JuliaDBMeta.isquotenode(3)
     @test !JuliaDBMeta.ispair(2)
@@ -33,7 +35,7 @@ end
         l = :x
         {l}
     end
-    @test v == @NT(l = [6,8,10])
+    @test v == (l = [6,8,10],)
     c = :x
     @with(t, cols(c)) == [6,8,10]
 end
@@ -79,14 +81,14 @@ end
         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])
+    @test (@transform_vec t (a = :x .+ :y,)) == pushcol(t, :a, [1,2,3] .+ [4,5,6])
+    @test @transform_vec((a = :x .+ :y,))(t) == pushcol(t, :a, [1,2,3] .+ [4,5,6])
+    @test (@transform_vec t (z = :x .+ :y,)) == setcol(t, :z, [1,2,3] .+ [4,5,6])
 
-    @test (@transform t @NT(a = :x .+ :y))  == pushcol(t, :a, [1,2,3] .+ [4,5,6])
-    @test @transform(@NT(a = :x .+ :y))(t)  == pushcol(t, :a, [1,2,3] .+ [4,5,6])
-    @test (@transform t @NT(z = :x + :y))  == setcol(t, :z, [1,2,3] .+ [4,5,6])
-    @test collect(@transform table(t, chunks = 2) @NT(z = :x + :y)) == (@transform t @NT(z = :x + :y))
+    @test (@transform t (a = :x .+ :y,))  == pushcol(t, :a, [1,2,3] .+ [4,5,6])
+    @test @transform((a = :x .+ :y,))(t)  == pushcol(t, :a, [1,2,3] .+ [4,5,6])
+    @test (@transform t (z = :x + :y,))  == setcol(t, :z, [1,2,3] .+ [4,5,6])
+    @test collect(@transform table(t, chunks = 2) (z = :x + :y,)) == (@transform t (z = :x + :y,))
 end
 
 @testset "where" begin
@@ -99,7 +101,7 @@ end
     @test @where((:x < 3) .& (:z == 0.2))(t) == view(t, [2])
 
     t = table([1,1,3], [4,5,6], [0.1, 0.2, 0.3], names = [:x, :y, :z])
-    grp = groupby(@map(@NT(z = :z))∘@where(:y != 5), t, :x, flatten = true)
+    grp = groupby(@map((z = :z,))∘@where(:y != 5), t, :x, flatten = true)
     @test grp == table([1, 3], [0.1, 0.3], names = [:x, :z], pkey = :x)
     @test collect(@where iris2 :SepalLength > 4) == @where iris1 :SepalLength > 4
 end
@@ -114,7 +116,7 @@ end
 
 @testset "apply" begin
     t = table([1,2,3], [4,5,6], [0.1, 0.2, 0.3], names = [:x, :y, :z])
-    s = t |> @where(:x >= 2) |> @transform(@NT(s = :x + :y))
+    s = t |> @where(:x >= 2) |> @transform((s = :x + :y,))
     expected = table([2, 3], [5, 6], [0.2, 0.3], [7, 9], names = [:x, :y, :z, :s])
     @test s == expected
     s2 = @apply t begin
@@ -140,7 +142,7 @@ end
 
     t = table([1,2,2], [4,5,6], [0.1, 0.2, 0.3], names = [:x, :y, :z])
     t1 = @apply t :x flatten=true begin
-        select(_, 1:1, by = i -> i.y)
+        partialsort(_, 1:1, by = i -> i.y)
         @map {:y}
     end
     @test t1 ==  table([1,2], [4,5], names = [:x, :y], pkey = :x)
