Skip to content
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.

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

Spark 3.4: Backport support for default values #11987

Merged
merged 5 commits into from
Jan 17, 2025

Conversation

rdblue
Copy link
Contributor

@rdblue rdblue commented Jan 17, 2025

This backports support for default values from 3.5.

Each PR is backported as a separate commit: #11299, #11803, #11811, #11815, and #11832.

@rdblue rdblue force-pushed the spark-3.4-default-values branch from 2d91c71 to fc4943e Compare January 17, 2025 03:26

File testFile = temp.newFile();
Assert.assertTrue("Delete should succeed", testFile.delete());
OutputFile outputFile = new InMemoryOutputFile();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spark 3.5 tests have been ported to JUnit 5, but 3.4 and 3.3 had not been. This required a few changes that I tried to keep to a minimum. This is one example, where the base class uses a Unit 4 TemporaryFolder that is not initialized for JUnit 5 parameterized tests.

Using InMemoryOutputFile here and in a couple other test suites avoided the need to port tests in #11811 to JUnit 5.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I compared it side by side with the original, I think the changes made are reasonable

@@ -62,8 +62,7 @@ public void writeAndValidateRepeatingRecords() throws IOException {

private void writeAndValidateRecords(Schema schema, Iterable<InternalRow> expected)
throws IOException {
final File testFile = temp.newFile();
Assert.assertTrue("Delete should succeed", testFile.delete());
final File testFile = temp.resolve("test").toFile();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test suite also hit issues with JUnit 4 so I ported all the AvroDataTest suites to JUnit 5.

@rdblue rdblue added this to the Iceberg 1.8.0 milestone Jan 17, 2025
@amogh-jahagirdar
Copy link
Contributor

Thanks @rdblue!

@amogh-jahagirdar amogh-jahagirdar merged commit d97ac3e into apache:main Jan 17, 2025
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants