Compiles in Spark 3.5 and Scala 2.13

backends-velox/pom.xml

@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-hivethriftserver_${scala.binary.version}</artifactId>
+      <artifactId>spark-hive-thriftserver_${scala.binary.version}</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

pom.xml

@@ -307,7 +307,7 @@
       </dependency>
       <dependency>
 	<groupId>org.apache.spark</groupId>
-	<artifactId>spark-hivethriftserver_${scala.binary.version}</artifactId>
+	<artifactId>spark-hive-thriftserver_${scala.binary.version}</artifactId>
 	<version>${spark.version}</version>
 	<scope>provided</scope>
 	<exclusions>

substrait/substrait-spark/src/main/scala/io/substrait/utils/Util.scala

@@ -32,19 +32,19 @@ object Util {
   def crossProduct[T](lists: Seq[Seq[T]]): Seq[Seq[T]] = {
 
     /** list [a, b], element 1 =>  list + element => [a, b, 1] */
-    val appendElementToList: (ArrayBuffer[T], T) => ArrayBuffer[T] =
+    val appendElementToList: (Seq[T], T) => Seq[T] =
       (list, element) => list :+ element
 
     /** ([a, b], [1, 2]) ==> [a, b, 1], [a, b, 2] */
-    val appendAndGen: (ArrayBuffer[T], Seq[T]) => Seq[ArrayBuffer[T]] =
+    val appendAndGen: (Seq[T], Seq[T]) => Seq[Seq[T]] =
       (list, elemsToAppend) => elemsToAppend.map(e => appendElementToList(list, e))
 
     val firstListToJoin = lists.head
-    val startProduct = appendAndGen(new ArrayBuffer[T], firstListToJoin)
+    val startProduct = appendAndGen(new ArrayBuffer[T].toSeq, firstListToJoin)
 
     /** ([ [a, b], [c, d] ], [1, 2]) -> [a, b, 1], [a, b, 2], [c, d, 1], [c, d, 2] */
-    val appendAndGenLists: (Seq[ArrayBuffer[T]], Seq[T]) => Seq[Seq[T]] =
-      (products, toJoin) => products.flatMap(product => appendAndGen(product, toJoin).toSeq)
+    val appendAndGenLists: (Seq[Seq[T]], Seq[T]) => Seq[Seq[T]] =
+      (products, toJoin) => products.flatMap(product => appendAndGen(product, toJoin).toSeq).toSeq
     lists.tail.foldLeft(startProduct)(appendAndGenLists).map(_.toSeq)
   }
 

substrait/substrait-spark/src/main/scala/org/apache/spark/substrait/ToSubstraitType.scala

@@ -119,7 +119,7 @@ class ToSubstraitType {
       .zip(namedStruct.names().asScala)
       .map { case ((t, d), name) => StructField(name, d, t.nullable()) }
       .map(f => AttributeReference(f.name, f.dataType, f.nullable, f.metadata)())
-      .toSeq()
+      .toSeq
   }
 }