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

Add gather macro #213

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add gather macro #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1bf4c99
Add gather macro
TonyLianLong Nov 6, 2018
a827fd8
Update @gather macro to match the new format
TonyLianLong Nov 18, 2018
f8cc858
Parse `-:Name` syntax
TonyLianLong Nov 21, 2018
0faec87
Add tests for gather operator
TonyLianLong Nov 30, 2018
8719d63
Add standalone test into runtests
TonyLianLong Jan 20, 2019
3c1f431
Add tests for `@gather`
TonyLianLong Jan 20, 2019
87b3f44
Merge branch 'master' into add-gather-and-spread
TonyLianLong Jan 20, 2019
452e48f
Merge branch 'master' into add-gather-and-spread
davidanthoff Mar 19, 2019
94f24db
Don't remove @unique
davidanthoff Mar 19, 2019
f866dbc
Remove diagnostic statements
davidanthoff Mar 19, 2019
d87b24d
Fix @gather tests
davidanthoff Mar 19, 2019
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
2 changes: 1 addition & 1 deletion src/Query.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using QueryOperators
export @from, @query, @count, Grouping, key

export @map, @filter, @groupby, @orderby, @orderby_descending, @unique,
@thenby, @thenby_descending, @groupjoin, @join, @mapmany, @take, @drop
@thenby, @thenby_descending, @groupjoin, @join, @mapmany, @take, @drop, @gather

export @select, @rename, @mutate

Expand Down
13 changes: 13 additions & 0 deletions src/standalone_query_macros.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,19 @@ macro map(f)
helper_namedtuples_replacement
end

macro gather(args...)
parsedArgs = ()
for arg in args
if typeof(arg) == Expr
m1 = match(r"^-:(.+)", string(arg))
parsedArgs = (parsedArgs..., :(QueryOperators.Not($(QuoteNode(Symbol(m1[1]))))))
else
parsedArgs = (parsedArgs..., arg)
end
end
:( i -> QueryOperators.gather(QueryOperators.query(i), $(parsedArgs...)))
end

macro mapmany(source, collectionSelector,resultSelector)
collectionSelector_as_anonym_func = helper_replace_anon_func_syntax(collectionSelector)
resultSelector_as_anonym_func = helper_replace_anon_func_syntax(resultSelector)
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ q = collect(@map(source_df, i->i.children))

include("test_dplyr-syntax.jl")
include("test_pipesyntax.jl")
include("test_standalone.jl")
include("test_macros.jl")

end
18 changes: 18 additions & 0 deletions test/test_standalone.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Query
using QueryOperators
using DataFrames
using Test

Expand Down Expand Up @@ -44,6 +45,23 @@ end
@test df2[:c] == ["b","c"]
end

@testset "@gather operator" begin
source_gather = DataFrame(Year=[2017,2018,2019], US=[1,2,3], EU=[4,5,6], CN=[7,8,9])
@test source_gather |> @gather(:US, :EU, :CN) |> collect ==
[
(Year = 2017, key = :US, value = 1),
(Year = 2017, key = :EU, value = 4),
(Year = 2017, key = :CN, value = 7),
(Year = 2018, key = :US, value = 2),
(Year = 2018, key = :EU, value = 5),
(Year = 2018, key = :CN, value = 8),
(Year = 2019, key = :US, value = 3),
(Year = 2019, key = :EU, value = 6),
(Year = 2019, key = :CN, value = 9)
]
@test eltype(source_gather |> @gather(:US, :EU, :CN)) == NamedTuple{(:Year, :key, :value),Tuple{Int, Symbol, Int}}
end

@testset "@unique operator" begin
df = DataFrame(a=[1,2,1], b=[3.,3.,3.])

Expand Down