Skip to content

Allow MetaStoreManagerFactory to produce null EntityCache #1131

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
merged 1 commit into from
Mar 8, 2025
Merged

Allow MetaStoreManagerFactory to produce null EntityCache #1131

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: 1 addition & 1 deletion polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class Resolver {
private final @Nonnull PolarisMetaStoreManager polarisMetaStoreManager;

// the cache of entities
private final EntityCache cache;
@Nullable private final EntityCache cache;

// the id of the principal making the call or 0 if unknown
private final @Nonnull AuthenticatedPolarisPrincipal polarisPrincipal;
Expand Down
15 changes: 3 additions & 12 deletions ...kus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisEntityManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
import org.apache.polaris.service.auth.ActiveRolesProvider;
import org.apache.polaris.service.auth.Authenticator;
import org.apache.polaris.service.auth.TokenBrokerFactory;
import org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService;
import org.apache.polaris.service.catalog.io.FileIOFactory;
import org.apache.polaris.service.config.RealmEntityManagerFactory;
import org.apache.polaris.service.context.RealmContextConfiguration;
import org.apache.polaris.service.context.RealmContextFilter;
import org.apache.polaris.service.context.RealmContextResolver;
Expand Down Expand Up @@ -211,13 +211,6 @@ public ManagedExecutor taskExecutor(TaskHandlerConfiguration config) {
.build();
}

@Produces
@RequestScoped
public EntityCache entityCache(
RealmContext realmContext, MetaStoreManagerFactory metaStoreManagerFactory) {
return metaStoreManagerFactory.getOrCreateEntityCache(realmContext);
}

@Produces
@RequestScoped
public PolarisMetaStoreManager polarisMetaStoreManager(
Expand All @@ -235,10 +228,8 @@ public TransactionalPersistence polarisMetaStoreSession(
@Produces
@RequestScoped
public PolarisEntityManager polarisEntityManager(
PolarisMetaStoreManager polarisMetaStoreManager,
StorageCredentialCache credentialCache,
EntityCache entityCache) {
return new PolarisEntityManager(polarisMetaStoreManager, credentialCache, entityCache);
RealmContext realmContext, RealmEntityManagerFactory factory) {
return factory.getOrCreateEntityManager(realmContext);
}

@Produces
Expand Down