fix the UTs

Co-authored-by: Thomas Chow <[email protected]>

Author: tchow-zlai

spark/src/main/scala/ai/chronon/spark/TableUtils.scala

@@ -118,7 +118,7 @@ class TableUtils(@transient val sparkSession: SparkSession) extends Serializable
   def loadTable(tableName: String, rangeWheres: Seq[String] = List.empty[String]): DataFrame = {
     tableFormatProvider
       .readFormat(tableName)
-      .map(_.table(tableName, combinePredicates(rangeWheres))(sparkSession))
+      .map(_.table(tableName, andPredicates(rangeWheres))(sparkSession))
       .getOrElse(
         throw new RuntimeException(s"Could not load table: ${tableName} with partition filter: ${rangeWheres}"))
   }
@@ -568,7 +568,7 @@ class TableUtils(@transient val sparkSession: SparkSession) extends Serializable
     }
   }
 
-  private def combinePredicates(predicates: Seq[String]): String = {
+  private def andPredicates(predicates: Seq[String]): String = {
     val whereStr = predicates.map(p => s"($p)").mkString(" AND ")
     logger.info(s"""Where str: $whereStr""")
     whereStr
@@ -597,7 +597,7 @@ class TableUtils(@transient val sparkSession: SparkSession) extends Serializable
     if (selects.nonEmpty) df = df.selectExpr(selects: _*)
 
     if (wheres.nonEmpty) {
-      val whereStr = combinePredicates(wheres)
+      val whereStr = andPredicates(wheres)
       logger.info(s"""Where str: $whereStr""")
       df = df.where(whereStr)
     }

spark/src/main/scala/ai/chronon/spark/format/Format.scala

@@ -9,9 +9,12 @@ trait Format {
   @transient protected lazy val logger: Logger = LoggerFactory.getLogger(getClass)
 
   def table(tableName: String, partitionFilters: String)(implicit sparkSession: SparkSession): DataFrame = {
-    sparkSession.read
-      .table(tableName)
-      .where(partitionFilters)
+    val df = sparkSession.read.table(tableName)
+    if (partitionFilters.isEmpty) {
+      df
+    } else {
+      df.where(partitionFilters)
+    }
   }
 
   // Return the primary partitions (based on the 'partitionColumn') filtered down by sub-partition filters if provided