Fix typelevel#239

imarios · Jul 4, 2018 · 3e6dee4 · 3e6dee4
1 parent 3ad68b3
commit 3e6dee4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/dataset/src/main/scala/frameless/TypedDataset.scala b/dataset/src/main/scala/frameless/TypedDataset.scala
@@ -111,7 +111,6 @@ class TypedDataset[T] protected[frameless](val dataset: Dataset[T])(implicit val
         val selected = dataset.toDF()
           .agg(cols.head.alias("_1"), cols.tail: _*)
           .as[Out](TypedExpressionEncoder[Out])
-          .filter("_1 is not null") // otherwise spark produces List(null) for empty datasets
 
         TypedDataset.create[Out](selected)
       }

diff --git a/dataset/src/test/scala/frameless/functions/NonAggregateFunctionsTests.scala b/dataset/src/test/scala/frameless/functions/NonAggregateFunctionsTests.scala
@@ -1122,8 +1122,7 @@ class NonAggregateFunctionsTests extends TypedDatasetSuite {
     }
 
     check(forAll(prop[Long, Long] _))
-    // This fails due to issue #239
-    //check(forAll(prop[Option[Vector[Boolean]], Long] _))
+    check(forAll(prop[Option[Vector[Boolean]], Long] _))
   }
 
   test("year") {