fixup

Author: richardc-db

build.sbt

@@ -459,6 +459,7 @@ lazy val kernelApi = (project in file("kernel/kernel-api"))
     scalaStyleSettings,
     javaOnlyReleaseSettings,
     Test / javaOptions ++= Seq("-ea"),
+    crossSparkSettings(),
     libraryDependencies ++= Seq(
       "org.roaringbitmap" % "RoaringBitmap" % "0.9.25",
       "org.slf4j" % "slf4j-api" % "1.7.36",

kernel/kernel-api/src/main/java/io/delta/kernel/internal/TableFeatures.java

@@ -64,7 +64,8 @@ public static void validateReadSupportedTable(
                         case "deletionVectors": // fall through
                         case "timestampNtz": // fall through
                         case "variantType-dev": // fall through
-                        case "vacuumProtocolCheck":
+                        case "vacuumProtocolCheck": // fall through
+                        case "v2Checkpoint":
                             break;
                         default:
                             throw DeltaErrors.unsupportedReaderFeature(tablePath, readerFeature);

kernel/kernel-defaults/src/test/scala/io/delta/kernel/defaults/internal/parquet/ParquetFileReaderSuite.scala

@@ -17,8 +17,6 @@ package io.delta.kernel.defaults.internal.parquet
 
 import java.math.BigDecimal
 
-import org.apache.spark.sql.DataFrame
-
 import io.delta.golden.GoldenTableUtils.goldenTableFile
 import io.delta.kernel.defaults.utils.{ExpressionTestUtils, TestRow}
 import io.delta.kernel.test.VectorTestUtils

kernel/kernel-defaults/src/test/scala/io/delta/kernel/defaults/utils/TestUtils.scala

@@ -137,17 +137,6 @@ trait TestUtils extends Assertions with SQLHelper {
     withTempDir { dir => f(dir.getAbsolutePath, engine) }
   }
 
-  /**
-   * Drops table `tableName` after calling `f`.
-   */
-  def withTable(tableNames: String*)(f: => Unit): Unit = {
-    try f finally {
-      tableNames.foreach { name =>
-        spark.sql(s"DROP TABLE IF EXISTS $name")
-      }
-    }
-  }
-
   def withGoldenTable(tableName: String)(testFunc: String => Unit): Unit = {
     val tablePath = GoldenTableUtils.goldenTablePath(tableName)
     testFunc(tablePath)

spark/src/main/scala-spark-3.5/shims/VariantShim.scala

@@ -572,14 +572,6 @@ object IdentityColumnsTableFeature
   }
 }
 
-object VariantTypeTableFeature extends ReaderWriterFeature(name = "variantType-dev")
-    with FeatureAutomaticallyEnabledByMetadata {
-  override def metadataRequiresFeatureToBeEnabled(
-      metadata: Metadata, spark: SparkSession): Boolean = {
-    SchemaUtils.checkForVariantTypeColumnsRecursively(metadata.schema)
-  }
-}
-
 object TimestampNTZTableFeature extends ReaderWriterFeature(name = "timestampNtz")
     with FeatureAutomaticallyEnabledByMetadata {
   override def metadataRequiresFeatureToBeEnabled(

spark/src/main/scala-spark-master/shims/VariantShim.scala

@@ -1287,13 +1287,6 @@ def normalizeColumnNamesInDataType(
     unsupportedDataTypes.toSeq
   }
 
-  /**
-   * Find VariantType columns in the table schema.
-   */
-  def checkForVariantTypeColumnsRecursively(schema: StructType): Boolean = {
-    SchemaUtils.typeExistsRecursively(schema)(VariantShim.isTypeVariant(_))
-  }
-
   /**
    * Find TimestampNTZ columns in the table schema.
    */