rebase

Author: Sophie Wang

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

@@ -81,7 +81,7 @@ object JoinUtils {
       val leftDataType = leftDf.schema(leftDf.schema.fieldIndex(column)).dataType
       val rightDataType = rightDf.schema(rightDf.schema.fieldIndex(column)).dataType
       assert(leftDataType == rightDataType,
-        s"Column '$column' has mismatched data types - left type: $leftDataType vs. right type $rightDataType")
+             s"Column '$column' has mismatched data types - left type: $leftDataType vs. right type $rightDataType")
     }
 
     val joinedDf = leftDf.join(rightDf, keys, joinType)

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

@@ -11,7 +11,6 @@ import java.time.{Instant, ZoneId}
 import scala.collection.mutable
 import scala.util.{Success, Try}
 
-
 case class TableUtils(sparkSession: SparkSession) {
 
   private val ARCHIVE_TIMESTAMP_FORMAT = "yyyyMMddHHmmss"

spark/src/test/scala/ai/chronon/spark/test/JoinUtilsTest.scala

@@ -1,5 +1,6 @@
 package ai.chronon.spark.test
 
+import ai.chronon.api.Constants
 import ai.chronon.spark.JoinUtils.{contains_any, set_add}
 import ai.chronon.spark.{JoinUtils, SparkSessionBuilder, TableUtils}
 import org.apache.spark.rdd.RDD
@@ -241,8 +242,10 @@ class JoinUtilsTest {
     assertTrue(filteredDf.schema.fieldNames.sorted sameElements filter.sorted)
   }
 
+  import ai.chronon.api.{LongType, StringType, StructField, StructType}
+
   def createSampleTable(tableName:String = "testSampleTable"): DataFrame = {
-    val schema = ai.chronon.api.StructType(
+    val schema = StructType(
       tableName,
       Array(
         StructField("listing", LongType),