This is an automated email from the ASF dual-hosted git repository.
snazy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 85e22ce6ef Use more CDI in AbstractIcebergCatalogTest (#3788)
85e22ce6ef is described below
commit 85e22ce6ef275751d6d90d4fbbee986be94de59c
Author: Robert Stupp <[email protected]>
AuthorDate: Wed Feb 18 18:21:50 2026 +0100
Use more CDI in AbstractIcebergCatalogTest (#3788)
Remove the unnecessary "no entity cache" test class, which is not relevant
for production workloads.
---
.../iceberg/AbstractIcebergCatalogTest.java | 51 +++-------------------
.../iceberg/IcebergCatalogNoSqlInMemTest.java | 12 -----
...Test.java => IcebergCatalogRelationalTest.java} | 17 +-------
...cebergCatalogRelationalWithEntityCacheTest.java | 41 -----------------
4 files changed, 6 insertions(+), 115 deletions(-)
diff --git
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
index 3dabc256c5..46624c297a 100644
---
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
+++
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java
@@ -39,7 +39,6 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Streams;
import io.quarkus.test.junit.QuarkusMock;
import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
import jakarta.inject.Inject;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -100,13 +99,10 @@ import
org.apache.polaris.core.admin.model.AwsStorageConfigInfo;
import org.apache.polaris.core.admin.model.CreateCatalogRequest;
import org.apache.polaris.core.admin.model.StorageConfigInfo;
import org.apache.polaris.core.admin.model.UpdateCatalogRequest;
-import org.apache.polaris.core.auth.PolarisAuthorizer;
-import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
import org.apache.polaris.core.auth.PolarisPrincipal;
import org.apache.polaris.core.config.FeatureConfiguration;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.context.CallContext;
-import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.entity.CatalogEntity;
import org.apache.polaris.core.entity.NamespaceEntity;
import org.apache.polaris.core.entity.PolarisBaseEntity;
@@ -119,16 +115,13 @@ import
org.apache.polaris.core.exceptions.CommitConflictException;
import org.apache.polaris.core.identity.provider.ServiceIdentityProvider;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
import org.apache.polaris.core.persistence.dao.entity.DropEntityResult;
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
import org.apache.polaris.core.persistence.pagination.Page;
import org.apache.polaris.core.persistence.pagination.PageToken;
import org.apache.polaris.core.persistence.resolver.ResolutionManifestFactory;
-import org.apache.polaris.core.persistence.resolver.Resolver;
import org.apache.polaris.core.persistence.resolver.ResolverFactory;
-import org.apache.polaris.core.secrets.UserSecretsManager;
import org.apache.polaris.core.storage.CredentialVendingContext;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
@@ -144,7 +137,7 @@ import
org.apache.polaris.service.catalog.io.ExceptionMappingFileIO;
import org.apache.polaris.service.catalog.io.FileIOFactory;
import org.apache.polaris.service.catalog.io.MeasuredFileIOFactory;
import org.apache.polaris.service.catalog.io.StorageAccessConfigProvider;
-import org.apache.polaris.service.config.ReservedProperties;
+import org.apache.polaris.service.context.catalog.RealmContextHolder;
import org.apache.polaris.service.events.EventAttributes;
import org.apache.polaris.service.events.PolarisEvent;
import org.apache.polaris.service.events.PolarisEventMetadataFactory;
@@ -243,25 +236,24 @@ public abstract class AbstractIcebergCatalogTest extends
CatalogTests<IcebergCat
@Inject PolarisEventListener polarisEventListener;
@Inject PolarisEventMetadataFactory eventMetadataFactory;
@Inject PolarisMetaStoreManager metaStoreManager;
- @Inject UserSecretsManager userSecretsManager;
@Inject CallContext callContext;
@Inject RealmConfig realmConfig;
+ @Inject RealmContextHolder realmContextHolder;
@Inject ResolutionManifestFactory resolutionManifestFactory;
@Inject StorageAccessConfigProvider storageAccessConfigProvider;
@Inject FileIOFactory fileIOFactory;
@Inject TaskFileIOSupplier taskFileIOSupplier;
@Inject PolarisPrincipal authenticatedRoot;
+ @Inject PolarisAdminService adminService;
+ @Inject ResolverFactory resolverFactory;
private IcebergCatalog catalog;
private String realmName;
private PolarisCallContext polarisContext;
- private PolarisAdminService adminService;
- private ResolverFactory resolverFactory;
private InMemoryFileIO fileIO;
private PolarisEntity catalogEntity;
private TestPolarisEventListener testPolarisEventListener;
- private ReservedProperties reservedProperties;
@BeforeAll
public static void setUpMocks() {
@@ -270,12 +262,6 @@ public abstract class AbstractIcebergCatalogTest extends
CatalogTests<IcebergCat
QuarkusMock.installMockForType(mock,
PolarisStorageIntegrationProviderImpl.class);
}
- @Nullable
- protected abstract EntityCache createEntityCache(
- PolarisDiagnostics diagnostics,
- RealmConfig realmConfig,
- PolarisMetaStoreManager metaStoreManager);
-
protected void bootstrapRealm(String realmName) {}
@BeforeEach
@@ -289,36 +275,9 @@ public abstract class AbstractIcebergCatalogTest extends
CatalogTests<IcebergCat
testInfo.getTestMethod().map(Method::getName).orElse("test"),
System.nanoTime());
bootstrapRealm(realmName);
- RealmContext realmContext = () -> realmName;
- QuarkusMock.installMockForType(realmContext, RealmContext.class);
+ realmContextHolder.set(() -> realmName);
polarisContext = callContext.getPolarisCallContext();
- EntityCache entityCache = createEntityCache(diagServices, realmConfig,
metaStoreManager);
- resolverFactory =
- (principal, referenceCatalogName) ->
- new Resolver(
- diagServices,
- polarisContext,
- metaStoreManager,
- principal,
- entityCache,
- referenceCatalogName);
- QuarkusMock.installMockForType(resolverFactory, ResolverFactory.class);
-
- PolarisAuthorizer authorizer = new PolarisAuthorizerImpl(realmConfig);
- reservedProperties = new ReservedProperties() {};
-
- adminService =
- new PolarisAdminService(
- polarisContext,
- resolutionManifestFactory,
- metaStoreManager,
- userSecretsManager,
- serviceIdentityProvider,
- authenticatedRoot,
- authorizer,
- reservedProperties);
-
String storageLocation = "s3://my-bucket/path/to/data";
AwsStorageConfigInfo storageConfigModel =
AwsStorageConfigInfo.builder()
diff --git
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogNoSqlInMemTest.java
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogNoSqlInMemTest.java
index 536c17c038..7ea2a3c33d 100644
---
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogNoSqlInMemTest.java
+++
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogNoSqlInMemTest.java
@@ -25,11 +25,7 @@ import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import java.util.List;
import java.util.Map;
-import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.config.RealmConfig;
-import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
-import org.apache.polaris.core.persistence.cache.EntityCache;
@QuarkusTest
@TestProfile(IcebergCatalogNoSqlInMemTest.Profile.class)
@@ -53,12 +49,4 @@ public class IcebergCatalogNoSqlInMemTest extends
AbstractIcebergCatalogTest {
RootCredentialsSet.fromList(List.of(realmName +
",aClientId,aSecret")))
.get(realmName);
}
-
- @Override
- protected EntityCache createEntityCache(
- PolarisDiagnostics diagnostics,
- RealmConfig realmConfig,
- PolarisMetaStoreManager metaStoreManager) {
- return null;
- }
}
diff --git
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalTest.java
similarity index 63%
rename from
runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java
rename to
runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalTest.java
index 1060b6a013..049e240f08 100644
---
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java
+++
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalTest.java
@@ -20,22 +20,7 @@ package org.apache.polaris.service.catalog.iceberg;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
-import jakarta.annotation.Nullable;
-import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.config.RealmConfig;
-import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;
@QuarkusTest
@TestProfile(AbstractIcebergCatalogTest.Profile.class)
-public class IcebergCatalogRelationalNoEntityCacheTest extends
AbstractIcebergCatalogTest {
-
- @Nullable
- @Override
- protected InMemoryEntityCache createEntityCache(
- PolarisDiagnostics diagnostics,
- RealmConfig realmConfig,
- PolarisMetaStoreManager metaStoreManager) {
- return null;
- }
-}
+public class IcebergCatalogRelationalTest extends AbstractIcebergCatalogTest {}
diff --git
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java
b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java
deleted file mode 100644
index c589e913ef..0000000000
---
a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.polaris.service.catalog.iceberg;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
-import jakarta.annotation.Nullable;
-import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.config.RealmConfig;
-import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;
-
-@QuarkusTest
-@TestProfile(AbstractIcebergCatalogTest.Profile.class)
-public class IcebergCatalogRelationalWithEntityCacheTest extends
AbstractIcebergCatalogTest {
-
- @Nullable
- @Override
- protected InMemoryEntityCache createEntityCache(
- PolarisDiagnostics diagnostics,
- RealmConfig realmConfig,
- PolarisMetaStoreManager metaStoreManager) {
- return new InMemoryEntityCache(diagnostics, realmConfig, metaStoreManager);
- }
-}
