Skip to content

Fix NesQuEIT to pass against recent Iceberg changes #10184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snazy merged 1 commit into from
Jan 10, 2025
Merged

Fix NesQuEIT to pass against recent Iceberg changes #10184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion ...src/main/java/org/projectnessie/spark/extensions/AbstractNessieSparkSqlExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down