Skip to content

Core, Test: Make locations in ViewCatalogTests configurable #14669

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

Closed
okumin wants to merge 1 commit into from
Closed

Core, Test: Make locations in ViewCatalogTests configurable #14669

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
41 changes: 25 additions & 16 deletions core/src/test/java/org/apache/iceberg/view/ViewCatalogTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assumptions.assumeThat;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.UUID;
import org.apache.iceberg.Schema;
import org.apache.iceberg.Transaction;
Expand All @@ -43,11 +47,12 @@
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

public abstract class ViewCatalogTests<C extends ViewCatalog & SupportsNamespaces> {
private static final String TEMP_DIR_PREFIX = "iceberg-view-catalog-tests-";

protected static final Schema SCHEMA =
new Schema(
5,
Expand All @@ -61,7 +66,18 @@ public abstract class ViewCatalogTests<C extends ViewCatalog & SupportsNamespace

protected abstract Catalog tableCatalog();

@TempDir private Path tempDir;
protected String getLocation(String... dirs) {
try {
Path tempDir = Files.createTempDirectory(TEMP_DIR_PREFIX);
if (dirs.length == 0) {
return tempDir.toString();
}
Path subDir = Paths.get(dirs[0], Arrays.copyOfRange(dirs, 1, dirs.length));
return Paths.get(tempDir.toUri().toString(), subDir.toString()).toString();
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}

protected boolean requiresNamespaceCreate() {
return false;
Expand Down Expand Up @@ -264,8 +280,7 @@ public void completeCreateView() {

assertThat(catalog().viewExists(identifier)).as("View should not exist").isFalse();

String location =
Paths.get(tempDir.toUri().toString(), Paths.get("ns", "view").toString()).toString();
String location = getLocation("ns", "view");
View view =
catalog()
.buildView(identifier)
Expand Down Expand Up @@ -340,8 +355,8 @@ public void createViewWithCustomMetadataLocation() {

assertThat(catalog().viewExists(identifier)).as("View should not exist").isFalse();

String location = Paths.get(tempDir.toUri().toString()).toString();
String customLocation = Paths.get(tempDir.toUri().toString(), "custom-location").toString();
String location = getLocation();
String customLocation = getLocation("custom-location");

View view =
catalog()
Expand Down Expand Up @@ -1584,8 +1599,7 @@ public void createAndReplaceViewWithLocation() {

assertThat(catalog().viewExists(identifier)).as("View should not exist").isFalse();

String location =
Paths.get(tempDir.toUri().toString(), Paths.get("ns", "view").toString()).toString();
String location = getLocation("ns", "view");
View view =
catalog()
.buildView(identifier)
Expand All @@ -1603,9 +1617,7 @@ public void createAndReplaceViewWithLocation() {
assertThat(view.location()).isNotNull();
}

String updatedLocation =
Paths.get(tempDir.toUri().toString(), Paths.get("updated", "ns", "view").toString())
.toString();
String updatedLocation = getLocation("updated", "ns", "view");
view =
catalog()
.buildView(identifier)
Expand Down Expand Up @@ -1635,8 +1647,7 @@ public void updateViewLocation() {

assertThat(catalog().viewExists(identifier)).as("View should not exist").isFalse();

String location =
Paths.get(tempDir.toUri().toString(), Paths.get("ns", "view").toString()).toString();
String location = getLocation("ns", "view");
View view =
catalog()
.buildView(identifier)
Expand All @@ -1653,9 +1664,7 @@ public void updateViewLocation() {
assertThat(view.location()).isNotNull();
}

String updatedLocation =
Paths.get(tempDir.toUri().toString(), Paths.get("updated", "ns", "view").toString())
.toString();
String updatedLocation = getLocation("updated", "ns", "view");
view.updateLocation().setLocation(updatedLocation).commit();

View updatedView = catalog().loadView(identifier);
Expand Down