rebase main

Author: gh-yzou

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkCatalogOperationsIT.java renamed to plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/PolarisSparkCatalogIT.java

@@ -36,13 +36,13 @@
 import org.apache.spark.sql.types.StructType;
 import org.junit.jupiter.api.Test;
 
+/**
+ * This integration directly performs operations using the SparkCatalog instance, instead of going
+ * through Spark SQL interface. Some operations don't have an easy way to trigger through the
+ * SparkSQL, for example, list nested namespaces.
+ */
 @QuarkusIntegrationTest
-public class SparkCatalogOperationsIT extends SparkIntegrationBase {
-  /**
-   * This integration directly performs operations using the SparkCatalog instance, instead of going
-   * through Spark SQL interface. Some operations don't have an easy way to trigger through the
-   * SparkSQL, for example, list nested namespaces.
-   */
+public class PolarisSparkCatalogIT extends SparkIntegrationBase {
   private static StructType schema = new StructType().add("id", "long").add("name", "string");
 
   @Test

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIcebergCatalogIT.java renamed to plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIcebergIT.java

@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 @QuarkusIntegrationTest
-public class SparkIcebergCatalogIT extends SparkIntegrationBase {
+public class SparkIcebergIT extends SparkIntegrationBase {
   @Test
   public void testNamespaces() {
     List<Object[]> namespaces = sql("SHOW NAMESPACES");
@@ -99,11 +99,12 @@ public void renameView() {
     String renamedView = "renamedView";
     sql("CREATE VIEW %s AS SELECT 1 AS id", viewName);
     List<Object[]> views = sql("SHOW VIEWS");
+    assertThat(views.size()).isEqualTo(1);
     assertThat(views).contains(new Object[] {"ns", viewName, false});
 
-    // TODO: update this test once table related operations are supported
-    //    spark view rename triggers a loadTable underneath
-    assertThatThrownBy(() -> sql("ALTER VIEW %s RENAME TO %s", viewName, renamedView))
-        .isInstanceOf(UnsupportedOperationException.class);
+    sql("ALTER VIEW %s RENAME TO %s", viewName, renamedView);
+    views = sql("SHOW VIEWS");
+    assertThat(views.size()).isEqualTo(1);
+    assertThat(views).contains(new Object[] {"ns", renamedView, false});
   }
 }

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java

@@ -38,6 +38,9 @@ protected SparkSession.Builder withCatalog(SparkSession.Builder builder, String
         .config(
             String.format("spark.sql.catalog.%s", catalogName),
             "org.apache.polaris.spark.SparkCatalog")
+        .config(
+            "spark.sql.extensions",
+            "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions")
         .config("spark.sql.warehouse.dir", warehouseDir.toString())
         .config(String.format("spark.sql.catalog.%s.type", catalogName), "rest")
         .config(

settings.gradle.kts

@@ -74,12 +74,12 @@ for (sparkVersion in sparkVersions) {
     val sparkArtifactId = "polaris-spark-${sparkVersion}_${scalaVersion}"
     val sparkIntArtifactId = "polaris-spark-integration-${sparkVersion}_${scalaVersion}"
     polarisProject(
-       "polaris-spark-${sparkVersion}_${scalaVersion}",
-        file("${polarisSparkDir}/v${sparkVersion}/spark"),
+      "polaris-spark-${sparkVersion}_${scalaVersion}",
+      file("${polarisSparkDir}/v${sparkVersion}/spark"),
     )
     polarisProject(
-         "polaris-spark-integration-${sparkVersion}_${scalaVersion}",
-         file("${polarisSparkDir}/v${sparkVersion}/integration"),
+      "polaris-spark-integration-${sparkVersion}_${scalaVersion}",
+      file("${polarisSparkDir}/v${sparkVersion}/integration"),
     )
     if (first) {
       first = false