Skip to content

Remove CallContext and its ThreadLocal usage #589

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 2 commits into from
Jan 14, 2025
Merged

Remove CallContext and its ThreadLocal usage #589

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
dac212f
Remove PolarisContext
adutra Dec 22, 2024
5c18e9c
Remove CallContext
adutra Dec 24, 2024
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
29 changes: 25 additions & 4 deletions ...ris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import java.nio.file.Path;
import java.time.Clock;
import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
Expand All @@ -40,8 +42,24 @@
public class EclipseLinkPolarisMetaStoreManagerFactory
extends LocalPolarisMetaStoreManagerFactory<PolarisEclipseLinkStore> {

@Inject EclipseLinkConfiguration eclipseLinkConfiguration;
@Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
private final EclipseLinkConfiguration eclipseLinkConfiguration;
private final PolarisStorageIntegrationProvider storageIntegrationProvider;

public EclipseLinkPolarisMetaStoreManagerFactory() {
this(null, null, null, null, null);
}

@Inject
public EclipseLinkPolarisMetaStoreManagerFactory(
EclipseLinkConfiguration eclipseLinkConfiguration,
PolarisStorageIntegrationProvider storageIntegrationProvider,
PolarisConfigurationStore configurationStore,
PolarisDiagnostics diagnostics,
Clock clock) {
super(configurationStore, diagnostics, clock);
this.eclipseLinkConfiguration = eclipseLinkConfiguration;
this.storageIntegrationProvider = storageIntegrationProvider;
}

@Override
protected PolarisEclipseLinkStore createBackingStore(@Nonnull PolarisDiagnostics diagnostics) {
Expand All @@ -50,14 +68,17 @@ protected PolarisEclipseLinkStore createBackingStore(@Nonnull PolarisDiagnostics

@Override
protected PolarisMetaStoreSession createMetaStoreSession(
@Nonnull PolarisEclipseLinkStore store, @Nonnull RealmContext realmContext) {
@Nonnull PolarisEclipseLinkStore store,
@Nonnull RealmContext realmContext,
@Nonnull PolarisDiagnostics diagnostics) {
return new PolarisEclipseLinkMetaStoreSessionImpl(
store,
storageIntegrationProvider,
realmContext,
configurationFile(),
persistenceUnitName(),
secretsGenerator(realmContext));
secretsGenerator(realmContext),
diagnostics);
}

private String configurationFile() {
Expand Down
Loading
Loading