fix tag filtering bug (#47)

* fix tag filtering bug

* fix/add tests

Author: jrevels

src/groups.jl

@@ -171,24 +171,40 @@ end
 
 # normal union doesn't have the behavior we want
 # (e.g. union(["1"], "2") === ["1", '2'])
-vcatunion(args...) = unique(vcat(args...))
+keyunion(args...) = unique(vcat(args...))
+
+function tagunion(args...)
+    unflattened = keyunion(args...)
+    result = Any[]
+    for i in unflattened
+        if isa(i, Tuple)
+            for j in i
+                push!(result, j)
+            end
+        else
+            push!(result, i)
+        end
+    end
+    return result
+end
 
 function loadtagged!(f::TagFilter, dest::BenchmarkGroup, src::BenchmarkGroup,
                      group::BenchmarkGroup, keys::Vector, tags::Vector)
-    ismatch = f.predicate(tags)
-    if ismatch
+    if f.predicate(tags)
         child_dest = createchild!(dest, src, keys)
         for (k, v) in group
             if isa(v, BenchmarkGroup)
-                loadtagged!(f, dest, src, v, vcatunion(keys, k), vcatunion(tags, k, v.tags))
-            else
+                loadtagged!(f, dest, src, v, keyunion(keys, k), tagunion(tags, k, v.tags))
+            elseif isa(child_dest, BenchmarkGroup)
                 child_dest[k] = v
             end
         end
     else
         for (k, v) in group
             if isa(v, BenchmarkGroup)
-                loadtagged!(f, dest, src, v, vcatunion(keys, k), vcatunion(tags, k, v.tags))
+                loadtagged!(f, dest, src, v, keyunion(keys, k), tagunion(tags, k, v.tags))
+            elseif f.predicate(tagunion(tags, k))
+                createchild!(dest, src, keyunion(keys, k))
             end
         end
     end
@@ -202,8 +218,10 @@ function createchild!(dest, src, keys)
         k = first(keys)
         src_child = src[k]
         if !(haskey(dest, k))
-            dest_child = similar(src_child)
+            isgroup = isa(src_child, BenchmarkGroup)
+            dest_child = isgroup ? similar(src_child) : src_child
             dest[k] = dest_child
+            !(isgroup) && return
         else
             dest_child = dest[k]
         end

test/GroupsTests.jl

@@ -181,12 +181,17 @@ gnest = BenchmarkGroup(["1"],
                        "2" => BenchmarkGroup(["3"], 1 => 1),
                        4 => BenchmarkGroup(["3"], 5 => 6),
                        7 => 8,
-                       "a" => BenchmarkGroup(["3"], "a" => :a),
+                       "a" => BenchmarkGroup(["3"], "a" => :a, (11, "b") => :b),
                        9 => BenchmarkGroup(["2"],
                                            10 => BenchmarkGroup(["3"]),
                                            11 => BenchmarkGroup()))
 
-@test leaves(gnest) == [([7],8), ([4,5],6), (["2",1],1), (["a","a"], :a)]
+@test leaves(gnest) == [([7],8), ([4,5],6), (["2",1],1), (["a", (11, "b")], :b), (["a","a"], :a)]
+
+@test gnest[@tagged 11 || 10] == BenchmarkGroup(["1"],
+                                                "a" => BenchmarkGroup(["3"],
+                                                                      (11, "b") => :b),
+                                                9 => gnest[9])
 
 @test gnest[@tagged "3"] == BenchmarkGroup(["1"], "2" => gnest["2"], 4 => gnest[4], "a" => gnest["a"],
                                            9 => BenchmarkGroup(["2"], 10 => BenchmarkGroup(["3"])))