use IR for smol col annotations

hail-is · Mar 20, 2018 · 3b37894 · 3b37894
1 parent 5faa2ea
commit 3b37894
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/scala/is/hail/variant/MatrixTable.scala b/src/main/scala/is/hail/variant/MatrixTable.scala
@@ -1583,11 +1583,12 @@ class MatrixTable(val hc: HailContext, val ast: MatrixIR) {
 
     val irs = asts.flatMap { case (f, a) => a.toIR().map((f, _)) }
 
-//    if (irs.length == asts.length) {
-//      val newEntries = ir.InsertFields(ir.Ref("g"), irs)
-//
-//      new MatrixTable(hc, MapEntries(ast, newEntries))
-//    } else {
+    val colValuesIsSmall = colType.size == 1 && colType.types.head.isOfType(TString())
+    if (irs.length == asts.length && colValuesIsSmall) {
+      val newEntries = ir.InsertFields(ir.Ref("g"), irs)
+
+      new MatrixTable(hc, MapEntries(ast, newEntries))
+    } else {
 
       val (paths, types, f) = Parser.parseAnnotationExprs(expr, ec, Some(Annotation.ENTRY_HEAD))
 
@@ -1632,7 +1633,7 @@ class MatrixTable(val hc: HailContext, val ast: MatrixIR) {
         }
         rvb.endArray()
       })
-//    }
+    }
   }
 
   def filterCols(p: (Annotation, Int) => Boolean): MatrixTable = {