Skip to content

Add newIcebergCatalog helper #2134

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
dimas-b merged 1 commit into from
Jul 18, 2025
Merged

Add newIcebergCatalog helper #2134

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
2 changes: 0 additions & 2 deletions .../service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest;
import org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
import org.apache.polaris.core.policy.PredefinedPolicyTypes;
import org.apache.polaris.core.secrets.UserSecretsManager;
import org.apache.polaris.core.secrets.UserSecretsManagerFactory;
Expand Down Expand Up @@ -200,7 +199,6 @@ public Map<String, String> getConfigOverrides() {
protected PolarisEntityManager entityManager;
protected PolarisMetaStoreManager metaStoreManager;
protected UserSecretsManager userSecretsManager;
protected TransactionalPersistence metaStoreSession;
protected PolarisBaseEntity catalogEntity;
protected PrincipalEntity principalEntity;
protected CallContext callContext;
Expand Down
3 changes: 0 additions & 3 deletions ...src/test/java/org/apache/polaris/service/quarkus/admin/PolarisS3InteroperabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.iceberg.catalog.Namespace;
import org.apache.iceberg.exceptions.ForbiddenException;
import org.apache.iceberg.inmemory.InMemoryFileIO;
import org.apache.iceberg.io.FileIO;
import org.apache.iceberg.rest.requests.CreateNamespaceRequest;
import org.apache.iceberg.rest.requests.CreateTableRequest;
import org.apache.iceberg.rest.responses.GetNamespaceResponse;
Expand Down Expand Up @@ -61,8 +60,6 @@ public class PolarisS3InteroperabilityTest {
"true",
"SUPPORTED_CATALOG_STORAGE_TYPES",
List.of("FILE", "S3"));
private static final FileIO fileIO = new InMemoryFileIO();

private final TestServices services;

private static String makeNamespaceLocation(String catalogName, String namespace, String scheme) {
Expand Down
142 changes: 34 additions & 108 deletions .../src/test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,20 +400,7 @@ protected IcebergCatalog catalog() {
@Override
protected IcebergCatalog initCatalog(
String catalogName, Map<String, String> additionalProperties) {
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, CATALOG_NAME);
TaskExecutor taskExecutor = Mockito.mock();
IcebergCatalog icebergCatalog =
new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
taskExecutor,
fileIOFactory,
polarisEventListener);
IcebergCatalog icebergCatalog = newIcebergCatalog(CATALOG_NAME);
fileIO = new InMemoryFileIO();
icebergCatalog.setCatalogFileIo(fileIO);
ImmutableMap.Builder<String, String> propertiesBuilder =
Expand Down Expand Up @@ -444,6 +431,32 @@ protected boolean supportsNotifications() {
return true;
}

protected IcebergCatalog newIcebergCatalog(String catalogName) {
return newIcebergCatalog(catalogName, metaStoreManager);
}

protected IcebergCatalog newIcebergCatalog(
String catalogName, PolarisMetaStoreManager metaStoreManager) {
return newIcebergCatalog(catalogName, metaStoreManager, fileIOFactory);
}

protected IcebergCatalog newIcebergCatalog(
String catalogName, PolarisMetaStoreManager metaStoreManager, FileIOFactory fileIOFactory) {
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, catalogName);
TaskExecutor taskExecutor = Mockito.mock(TaskExecutor.class);
return new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
taskExecutor,
fileIOFactory,
polarisEventListener);
}

@Test
public void testEmptyNamespace() {
IcebergCatalog catalog = catalog();
Expand Down Expand Up @@ -982,21 +995,9 @@ public void testValidateNotificationFailToCreateFileIO() {
// filename.
final String tableLocation = "s3://externally-owned-bucket/validate_table/";
final String tableMetadataLocation = tableLocation + "metadata/";
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, catalog().name());
FileIOFactory fileIOFactory =
spy(new DefaultFileIOFactory(realmEntityManagerFactory, metaStoreManagerFactory));
IcebergCatalog catalog =
new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
Mockito.mock(TaskExecutor.class),
fileIOFactory,
polarisEventListener);
IcebergCatalog catalog = newIcebergCatalog(catalog().name(), metaStoreManager, fileIOFactory);
catalog.initialize(
CATALOG_NAME,
ImmutableMap.of(
Expand Down Expand Up @@ -1314,20 +1315,7 @@ public void testUpdateNotificationCreateTableWithLocalFilePrefix() {
.build()
.asCatalog()));

PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, catalogWithoutStorage);
TaskExecutor taskExecutor = Mockito.mock();
IcebergCatalog catalog =
new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
taskExecutor,
fileIOFactory,
polarisEventListener);
IcebergCatalog catalog = newIcebergCatalog(catalogWithoutStorage);
catalog.initialize(
catalogWithoutStorage,
ImmutableMap.of(
Expand Down Expand Up @@ -1378,21 +1366,7 @@ public void testUpdateNotificationCreateTableWithHttpPrefix() {
.build()
.asCatalog()));

PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, catalogName);
TaskExecutor taskExecutor = Mockito.mock();
InMemoryFileIO localFileIO = new InMemoryFileIO();
IcebergCatalog catalog =
new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
taskExecutor,
fileIOFactory,
polarisEventListener);
IcebergCatalog catalog = newIcebergCatalog(catalogName);
catalog.initialize(
catalogName,
ImmutableMap.of(
Expand Down Expand Up @@ -1909,19 +1883,8 @@ public void testDropTableWithPurgeDisabled() {
polarisContext, noPurgeStorageConfigModel, storageLocation)
.build()
.asCatalog()));
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, noPurgeCatalogName);
IcebergCatalog noPurgeCatalog =
new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
Mockito.mock(),
fileIOFactory,
polarisEventListener);
newIcebergCatalog(noPurgeCatalogName, metaStoreManager, fileIOFactory);
noPurgeCatalog.initialize(
noPurgeCatalogName,
ImmutableMap.of(
Expand Down Expand Up @@ -2012,22 +1975,9 @@ static Stream<Arguments> testRetriableException() {

@Test
public void testFileIOWrapper() {
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, CATALOG_NAME);

MeasuredFileIOFactory measured =
new MeasuredFileIOFactory(realmEntityManagerFactory, metaStoreManagerFactory);
IcebergCatalog catalog =
new IcebergCatalog(
entityManager,
metaStoreManager,
polarisContext,
passthroughView,
securityContext,
Mockito.mock(),
measured,
polarisEventListener);
IcebergCatalog catalog = newIcebergCatalog(CATALOG_NAME, metaStoreManager, measured);
catalog.initialize(
CATALOG_NAME,
ImmutableMap.of(
Expand Down Expand Up @@ -2116,19 +2066,7 @@ public void testConcurrencyConflictCreateTableUpdatedDuringFinalTransaction() {
// Use a spy so that non-transactional pre-requisites succeed normally, but we inject
// a concurrency failure at final commit.
PolarisMetaStoreManager spyMetaStore = spy(metaStoreManager);
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, CATALOG_NAME);
final IcebergCatalog catalog =
new IcebergCatalog(
entityManager,
spyMetaStore,
polarisContext,
passthroughView,
securityContext,
Mockito.mock(TaskExecutor.class),
fileIOFactory,
polarisEventListener);
final IcebergCatalog catalog = newIcebergCatalog(CATALOG_NAME, spyMetaStore);
catalog.initialize(
CATALOG_NAME,
ImmutableMap.of(
Expand Down Expand Up @@ -2165,19 +2103,7 @@ public void testConcurrencyConflictUpdateTableDuringFinalTransaction() {
// Use a spy so that non-transactional pre-requisites succeed normally, but we inject
// a concurrency failure at final commit.
PolarisMetaStoreManager spyMetaStore = spy(metaStoreManager);
PolarisPassthroughResolutionView passthroughView =
new PolarisPassthroughResolutionView(
polarisContext, entityManager, securityContext, CATALOG_NAME);
final IcebergCatalog catalog =
new IcebergCatalog(
entityManager,
spyMetaStore,
polarisContext,
passthroughView,
securityContext,
Mockito.mock(TaskExecutor.class),
fileIOFactory,
polarisEventListener);
final IcebergCatalog catalog = newIcebergCatalog(CATALOG_NAME, spyMetaStore);
catalog.initialize(
CATALOG_NAME,
ImmutableMap.of(
Expand Down