Skip to content

Spark: Migrate Spark 3.4 SparkTestBase related tests including refactoring Spark 3.5 tests #13031

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
nastra merged 1 commit into from
May 12, 2025
Merged

Spark: Migrate Spark 3.4 SparkTestBase related tests including refactoring Spark 3.5 tests #13031

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
287 changes: 0 additions & 287 deletions spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
View file
Open in desktop

This file was deleted.

32 changes: 18 additions & 14 deletions spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestChangelogReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@

import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.iceberg.ChangelogOperation;
Expand All @@ -41,17 +44,15 @@
import org.apache.iceberg.io.CloseableIterable;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.spark.SparkTestBase;
import org.apache.iceberg.spark.TestBase;
import org.apache.iceberg.types.Types;
import org.apache.spark.sql.catalyst.InternalRow;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

public class TestChangelogReader extends SparkTestBase {
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

public class TestChangelogReader extends TestBase {
private static final Schema SCHEMA =
new Schema(
required(1, "id", Types.IntegerType.get()), optional(2, "data", Types.StringType.get()));
Expand All @@ -64,9 +65,9 @@ public class TestChangelogReader extends SparkTestBase {
private DataFile dataFile1;
private DataFile dataFile2;

@Rule public TemporaryFolder temp = new TemporaryFolder();
@TempDir private Path temp;

@Before
@BeforeEach
public void before() throws IOException {
table = catalog.createTable(TableIdentifier.of("default", "test"), SCHEMA, SPEC);
// create some data
Expand All @@ -85,7 +86,7 @@ public void before() throws IOException {
dataFile2 = writeDataFile(records2);
}

@After
@AfterEach
public void after() {
catalog.dropTable(TableIdentifier.of("default", "test"));
}
Expand Down Expand Up @@ -176,7 +177,7 @@ public void testDataFileRewrite() throws IOException {
reader.close();
}

Assert.assertEquals("Should have no rows", 0, rows.size());
assertThat(rows).as("Should have no rows").isEmpty();
}

@Test
Expand Down Expand Up @@ -254,6 +255,9 @@ private Object[] toJava(InternalRow row) {
private DataFile writeDataFile(List<Record> records) throws IOException {
// records all use IDs that are in bucket id_bucket=0
return FileHelpers.writeDataFile(
table, Files.localOutput(temp.newFile()), TestHelpers.Row.of(0), records);
table,
Files.localOutput(File.createTempFile("junit", null, temp.toFile())),
TestHelpers.Row.of(0),
records);
}
}
Loading