Make 3.5 compile again

delta-io · Feb 14, 2025 · 810d4d8 · 810d4d8
1 parent 995d670
commit 810d4d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/spark/src/main/scala-spark-3.5/shims/ColumnConversionShims.scala b/spark/src/main/scala-spark-3.5/shims/ColumnConversionShims.scala
@@ -16,7 +16,7 @@
 
 package org.apache.spark.sql.delta
 
-import org.apache.spark.sql.Column
+import org.apache.spark.sql.{Column, SparkSession => SparkSessionImpl}
 import org.apache.spark.sql.catalyst.expressions.Expression
 
 /**
@@ -26,3 +26,8 @@ import org.apache.spark.sql.catalyst.expressions.Expression
 object ClassicColumnConversions {
   def expression(c: Column): Expression = c.expr
 }
+
+object TestCompatibility {
+  type SparkSession = SparkSessionImpl
+  def setActiveSession(session: SparkSession): Unit = SparkSessionImpl.setActiveSession(session)
+}
diff --git a/spark/src/main/scala-spark-master/shims/ColumnConversionShims.scala b/spark/src/main/scala-spark-master/shims/ColumnConversionShims.scala
@@ -19,6 +19,7 @@ package org.apache.spark.sql.delta
 import org.apache.spark.sql.classic.ClassicConversions
 import org.apache.spark.sql.classic.ColumnConversions
 import org.apache.spark.sql.classic.ColumnNodeToExpressionConverter
+import org.apache.spark.sql.classic.{SparkSession => SparkSessionImpl}
 
 /**
  * Conversions from a [[org.apache.spark.sql.Column]] to an
@@ -34,3 +35,8 @@ object ClassicColumnConversions
   with ColumnConversions {
   override def converter: ColumnNodeToExpressionConverter = ColumnNodeToExpressionConverter
 }
+
+object TestCompatibility {
+  type SparkSession = SparkSessionImpl
+  def setActiveSession(session: SparkSession): Unit = SparkSessionImpl.setActiveSession(session)
+}
diff --git a/spark/src/test/scala/org/apache/spark/sql/delta/test/DeltaHiveTest.scala b/spark/src/test/scala/org/apache/spark/sql/delta/test/DeltaHiveTest.scala
@@ -16,13 +16,13 @@
 
 package org.apache.spark.sql.delta.test
 
+import org.apache.spark.sql.delta.TestCompatibility._
 import org.apache.spark.sql.delta.catalog.DeltaCatalog
 import org.apache.spark.sql.delta.test.DeltaSQLTestUtils
 import io.delta.sql.DeltaSparkSessionExtension
 import org.scalatest.BeforeAndAfterAll
 
 import org.apache.spark.{SparkContext, SparkFunSuite}
-import org.apache.spark.sql.classic.SparkSession
 import org.apache.spark.sql.hive.test.{TestHive, TestHiveContext}
 import org.apache.spark.sql.internal.{SQLConf, StaticSQLConf}
 
@@ -46,7 +46,7 @@ trait DeltaHiveTest extends SparkFunSuite with BeforeAndAfterAll { self: DeltaSQ
     _sc = new SparkContext("local", this.getClass.getName, conf)
     _hiveContext = new TestHiveContext(_sc)
     _session = _hiveContext.sparkSession
-    SparkSession.setActiveSession(_session)
+    setActiveSession(_session)
     super.beforeAll()
   }