check column non empty

Signed-off-by: Oleksii Moskalenko <moskalenko.alexey@gmail.com>
feast-dev · Jan 28, 2021 · 8e2453a · 8e2453a
1 parent 7327714
commit 8e2453a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/spark/ingestion/src/main/scala/feast/ingestion/sources/file/FileReader.scala b/spark/ingestion/src/main/scala/feast/ingestion/sources/file/FileReader.scala
@@ -35,12 +35,12 @@ object FileReader {
       .filter(col(source.eventTimestampColumn) >= new Timestamp(start.getMillis))
       .filter(col(source.eventTimestampColumn) < new Timestamp(end.getMillis))
 
-    if (source.datePartitionColumn.nonEmpty) {
-      reader
-        .filter(col(source.datePartitionColumn.get) >= new Date(start.getMillis))
-        .filter(col(source.datePartitionColumn.get) <= new Date(end.getMillis))
-    } else {
-      reader
+    source.datePartitionColumn match {
+      case Some(partitionColumn) if partitionColumn.nonEmpty =>
+        reader
+          .filter(col(partitionColumn) >= new Date(start.getMillis))
+          .filter(col(partitionColumn) <= new Date(end.getMillis))
+      case _ => reader
     }
   }
 }