avoid unnecessary generated function (#120)

* remove generated in roweq

* avoid unnecessary Base

* remove generated function on rowcmp

Author: Pietro Vertechi

src/groupjoin.jl

@@ -1,16 +1,18 @@
 # Important, for broadcast joins we cannot assume c and d have same number of columns:
 # c could have more columns than d
-@generated function rowcmp(c::StructVector, i, d::StructVector{C, D}, j) where {C, D}
-    N = fieldcount(D)
-    ex = :(cmp(getfield(fieldarrays(c),$N)[i], getfield(fieldarrays(d),$N)[j]))
-    for n in N-1:-1:1
-        ex = quote
-            let k = rowcmp(getfield(fieldarrays(c),$n), i, getfield(fieldarrays(d),$n), j)
-                (k == 0) ? ($ex) : k
-            end
-        end
+rowcmp(::Tuple, i, ::Tuple{}, j) = 0
+
+function rowcmp(tc::Tuple, i, td::Tuple, j)
+    c, d = tc[1], td[1]
+    let k = rowcmp(c, i, d, j)
+        (k == 0) ? rowcmp(tail(tc), i, tail(td), j) : k
     end
-    ex
+end
+
+function rowcmp(c::StructVector, i, d::StructVector, j)
+    tc = Tuple(fieldarrays(c))
+    td = Tuple(fieldarrays(d))
+    return rowcmp(tc, i, td, j)
 end
 
 @inline function rowcmp(c::AbstractVector, i, d::AbstractVector, j)

src/sort.jl

@@ -38,14 +38,9 @@ Base.eltype(::Type{<:GroupPerm}) = UnitRange{Int}
     return eq
 end
 
-@generated function roweq(c::StructVector{D,C}, i, j) where {D,C}
-    N = fieldcount(C)
-    ex = :(roweq(getfield(fieldarrays(c),1), i, j))
-    for n in 2:N
-        ex = :(($ex) && (roweq(getfield(fieldarrays(c),$n), i, j)))
-    end
-    ex
-end
+roweq(t::Tuple{}, i, j) = true
+roweq(t::Tuple, i, j) = roweq(t[1], i, j) ? roweq(tail(t), i, j) : false
+roweq(s::StructArray, i, j) = roweq(Tuple(fieldarrays(s)), i, j)
 
 function uniquesorted(keys, perm=sortperm(keys))
     (keys[perm[idxs[1]]] for idxs in GroupPerm(keys, perm))