Fix NesQuEIT to pass against recent Iceberg changes

There are two Iceberg PRs that "broke" NesQuEIT: * apache/iceberg#11478 caused `testRewriteManifests` to fail due to the changed outcome of the `rewrite_manifests` procedure * apache/iceberg#11520 caused a class-path issue w/ Scala 2.13
projectnessie · Jan 10, 2025 · 941d8e9 · 941d8e9
1 parent e0b5fa8
commit 941d8e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -950,8 +950,11 @@ jobs:
       - name: Nessie Spark 3.4 / 2.13 Extensions test
         run: ./gradlew -DscalaVersion=2.13 :nessie:nessie-iceberg:nessie-spark-extensions-3.4_2.13:test :nessie:nessie-iceberg:nessie-spark-extensions-3.4_2.13:intTest --scan
 
-      - name: Nessie Spark 3.5 / 2.13 Extensions test
-        run: ./gradlew -DscalaVersion=2.13 :nessie:nessie-iceberg:nessie-spark-extensions-3.5_2.13:test :nessie:nessie-iceberg:nessie-spark-extensions-3.5_2.13:intTest --scan
+      - name: Nessie Spark 3.5 / 2.12 Extensions test
+        run: ./gradlew -DscalaVersion=2.12 :nessie:nessie-iceberg:nessie-spark-extensions-3.5_2.12:test :nessie:nessie-iceberg:nessie-spark-extensions-3.5_2.12:intTest --scan
+      # TODO Revert the change to Scala 2.12 after we have an Iceberg release with https://github.com/apache/iceberg/pull/11520 (Iceberg 1.8 probably)
+      #- name: Nessie Spark 3.5 / 2.13 Extensions test
+      #  run: ./gradlew -DscalaVersion=2.13 :nessie:nessie-iceberg:nessie-spark-extensions-3.5_2.13:test :nessie:nessie-iceberg:nessie-spark-extensions-3.5_2.13:intTest --scan
 
       #- name: Publish Nessie + Iceberg to local Maven repo
       #  run: ./gradlew publishLocal --scan

diff --git a/...src/main/java/org/projectnessie/spark/extensions/AbstractNessieSparkSqlExtensionTest.java b/...src/main/java/org/projectnessie/spark/extensions/AbstractNessieSparkSqlExtensionTest.java
@@ -755,8 +755,16 @@ void testRewriteManifests(String branchName, String tableName)
     String version = spark.version();
     if (version.startsWith("3.3.")) {
       soft.assertThat(rewriteResult.get(0)).startsWith(5, 1);
-    } else {
+    } else if (version.startsWith("3.4.")) {
       soft.assertThat(rewriteResult.get(0)).startsWith(11, 2);
+    } else {
+      // 3.5 onwards
+      soft.assertThat(rewriteResult.get(0))
+          .satisfiesAnyOf(
+              result -> assertThat(result).startsWith(11, 2),
+              // Since https://github.com/apache/iceberg/pull/11478 (Spark: Change Delete
+              // granularity to file for Spark 3.5)
+              result -> assertThat(result).startsWith(8, 2));
     }
 
     validateContentAfterMaintenance(branchName, tableName);