fix #4853 (#4854)

hail-is · Nov 29, 2018 · 35b0977 · 35b0977
1 parent 65a9cd2
commit 35b0977
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/hail/python/test/hail/expr/test_expr.py b/hail/python/test/hail/expr/test_expr.py
@@ -338,6 +338,12 @@ def test_agg_group_by(self):
         for aggregation, expected in tests:
             self.assertEqual(t.aggregate(aggregation), expected)
 
+    def test_agg_group_by_on_call(self):
+        t = hl.utils.range_table(10)
+        t = t.annotate(call = hl.call(0, 0), x = 1)
+        res = t.aggregate(hl.agg.group_by(t.call, hl.agg.sum(t.x)))
+        self.assertEqual(res, {hl.Call([0, 0]): 10})
+
     def test_aggregators_with_randomness(self):
         t = hl.utils.range_table(10)
         res = t.aggregate(agg.filter(hl.rand_bool(0.5), hl.struct(collection=agg.collect(t.idx), sum=agg.sum(t.idx))))

diff --git a/hail/src/main/scala/is/hail/expr/ir/Emit.scala b/hail/src/main/scala/is/hail/expr/ir/Emit.scala
@@ -693,7 +693,7 @@ private class Emit(
                 Code._null,
                 aggSig.seqOpArgs(0) match {
                   case _: TBoolean => Code.boxBoolean(key.value[Boolean])
-                  case _: TInt32 => Code.boxInt(key.value[Int])
+                  case _: TInt32 | _: TCall => Code.boxInt(key.value[Int])
                   case _: TInt64 => Code.boxLong(key.value[Long])
                   case _: TFloat32 => Code.boxFloat(key.value[Float])
                   case _: TFloat64 => Code.boxDouble(key.value[Double])