Skip to content

Use injected RealmConfig in JdbcMetaStoreManagerFactory #3412

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 2 commits into from
Jan 19, 2026
Merged

Use injected RealmConfig in JdbcMetaStoreManagerFactory #3412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d96540b
Use injected RealmConfig in JdbcMetaStoreManagerFactory
dimas-b Jan 10, 2026
bb60123
review: random realm ID
dimas-b Jan 14, 2026
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
11 changes: 3 additions & 8 deletions ...main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.config.BehaviorChangeConfiguration;
import org.apache.polaris.core.config.PolarisConfigurationStore;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.entity.PrincipalEntity;
Expand Down Expand Up @@ -75,7 +74,7 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
@Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
@Inject Instance<DataSource> dataSource;
@Inject RelationalJdbcConfiguration relationalJdbcConfiguration;
@Inject PolarisConfigurationStore configurationStore;
@Inject RealmConfig realmConfig;

protected JdbcMetaStoreManagerFactory() {}

Expand Down Expand Up @@ -103,8 +102,7 @@ private void initializeForRealm(
final int schemaVersion =
JdbcBasePersistenceImpl.loadSchemaVersion(
datasourceOperations,
configurationStore.getConfiguration(
realmContext, BehaviorChangeConfiguration.SCHEMA_VERSION_FALL_BACK_ON_DNE));
realmConfig.getConfig(BehaviorChangeConfiguration.SCHEMA_VERSION_FALL_BACK_ON_DNE));
sessionSupplierMap.put(
realmId,
() ->
Expand Down Expand Up @@ -155,10 +153,7 @@ public synchronized Map<String, PrincipalSecretsResult> bootstrapRealms(
if (!metaStoreManagerMap.containsKey(realm)) {
DatasourceOperations datasourceOperations = getDatasourceOperations();
int currentSchemaVersion =
JdbcBasePersistenceImpl.loadSchemaVersion(
datasourceOperations,
configurationStore.getConfiguration(
realmContext, BehaviorChangeConfiguration.SCHEMA_VERSION_FALL_BACK_ON_DNE));
JdbcBasePersistenceImpl.loadSchemaVersion(datasourceOperations, true);
int requestedSchemaVersion = JdbcBootstrapUtils.getRequestedSchemaVersion(bootstrapOptions);
int effectiveSchemaVersion =
JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
Expand Down
10 changes: 10 additions & 0 deletions runtime/admin/src/main/java/org/apache/polaris/admintool/config/AdminToolProducers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@
import jakarta.enterprise.inject.Instance;
import jakarta.enterprise.inject.Produces;
import java.time.Clock;
import java.util.UUID;
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.config.PolarisConfigurationStore;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.config.RealmConfigImpl;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
Expand Down Expand Up @@ -75,4 +78,11 @@ public PolarisConfigurationStore configurationStore() {
// A configuration store is not required when running the admin tool.
return new PolarisConfigurationStore() {};
}

@Produces
public RealmConfig dummyRealmConfig(PolarisConfigurationStore configurationStore) {
// Use a random realm ID for RealmConfig since the PolarisConfigurationStore is empty anyway
String absentId = UUID.randomUUID().toString();
return new RealmConfigImpl(configurationStore, () -> absentId);
}
}
6 changes: 4 additions & 2 deletions runtime/service/src/main/java/org/apache/polaris/service/config/ServiceProducers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.polaris.core.auth.PolarisAuthorizerFactory;
import org.apache.polaris.core.config.PolarisConfigurationStore;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.config.RealmConfigImpl;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.credentials.PolarisCredentialManager;
Expand Down Expand Up @@ -130,8 +131,9 @@ public CallContext polarisCallContext(

@Produces
@RequestScoped
public RealmConfig realmConfig(CallContext callContext) {
return callContext.getRealmConfig();
public RealmConfig realmConfig(
RealmContext realmContext, PolarisConfigurationStore configurationStore) {
return new RealmConfigImpl(configurationStore, realmContext);
}

@Produces
Expand Down