Fix type instabilities in _innerjoin!

Innerjoin is 3x faster on simple test case
JuliaData · Aug 4, 2020 · 95c56c8 · 95c56c8 · andyferris · Aug 4, 2020
1 parent 269f6d8
commit 95c56c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 authors = ["Andy Ferris <ferris.andy@gmail.com>"]
 name = "SplitApplyCombine"
 uuid = "03a91e81-4c3e-53e1-a0a4-9c0c8f19dd66"
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 Indexing = "313cdc1a-70c2-5d6a-ae34-0150d3930a38"

diff --git a/src/innerjoin.jl b/src/innerjoin.jl
@@ -109,22 +109,25 @@ function _innerjoin!(out, l::AbstractArray, r::AbstractArray, v::AbstractArray,
     V = eltype(rkeys)
     dict = Dict{eltype(r), Vector{V}}()
     @inbounds for i_r ∈ rkeys
-        push!(get!(()->Vector{V}(), dict, r[i_r]), i_r)
+        push!(get!(Vector{V}, dict, r[i_r]), i_r)
     end
 
     @inbounds for i_l in keys(l)
         l_value = l[i_l]
         dict_index = Base.ht_keyindex(dict, l_value)
         if dict_index > 0 # -1 if key not found
             for i_r ∈ dict.vals[dict_index]
-                push!(out, v[Tuple(i_l)..., Tuple(i_r)...])
+                push!(out, v[_tuple(i_l)..., _tuple(i_r)...])
             end
         end
     end
 
     return out
 end
 
+_tuple(i::Integer) = (i,)
+_tuple(i::Any) = Tuple(i)
+
 
 # TODO more specialized methods for comparisons: ==, <, isless, etc - via sorting strategies