Skip to content

Remove CallContext.CURRENT_CONTEXT #2203

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

Remove CallContext.CURRENT_CONTEXT #2203

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
15 changes: 0 additions & 15 deletions polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,6 @@
* underlying nature of the persistence layer may differ between different realms.
*/
public interface CallContext {
InheritableThreadLocal<CallContext> CURRENT_CONTEXT = new InheritableThreadLocal<>();

static CallContext setCurrentContext(CallContext context) {
CURRENT_CONTEXT.set(context);
return context;
}

static CallContext getCurrentContext() {
return CURRENT_CONTEXT.get();
}

static void unsetCurrentContext() {
CURRENT_CONTEXT.remove();
}

/** Copy the {@link CallContext}. */
CallContext copy();

Expand Down
3 changes: 0 additions & 3 deletions .../test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
import org.apache.polaris.core.config.FeatureConfiguration;
import org.apache.polaris.core.config.PolarisConfigurationStore;
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.PrincipalEntity;
Expand Down Expand Up @@ -167,8 +166,6 @@ public void before(TestInfo testInfo) {
PolarisEntityManager entityManager =
new PolarisEntityManager(metaStoreManager, resolverFactory);

CallContext.setCurrentContext(polarisContext);

PrincipalEntity rootPrincipal =
metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
AuthenticatedPolarisPrincipal authenticatedRoot =
Expand Down
19 changes: 7 additions & 12 deletions .../src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.apache.polaris.core.admin.model.Principal;
import org.apache.polaris.core.admin.model.PrincipalRole;
import org.apache.polaris.core.admin.model.PrincipalWithCredentials;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.entity.PrincipalEntity;
Expand Down Expand Up @@ -116,17 +115,13 @@ private PolarisPrincipalSecrets fetchAdminSecrets() {
helper.diagServices,
helper.configurationStore,
helper.clock);
try {
PolarisMetaStoreManager metaStoreManager =
helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
Map<String, String> propertiesMap = readInternalProperties(principal);
return metaStoreManager
.loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id"))
.getPrincipalSecrets();
} finally {
CallContext.unsetCurrentContext();
}
PolarisMetaStoreManager metaStoreManager =
helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
Map<String, String> propertiesMap = readInternalProperties(principal);
return metaStoreManager
.loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id"))
.getPrincipalSecrets();
}

private SnowmanCredentials createSnowmanCredentials(TestEnvironment testEnv) {
Expand Down
2 changes: 0 additions & 2 deletions service/common/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ public PolarisServiceImpl(
this.polarisAuthorizer = polarisAuthorizer;
this.callContext = callContext;
this.reservedProperties = reservedProperties;
// FIXME: This is a hack to set the current context for downstream calls.
CallContext.setCurrentContext(callContext);
}

private PolarisAdminService newAdminService(
Expand Down
3 changes: 0 additions & 3 deletions .../src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ public GenericTableCatalogAdapter(
this.polarisAuthorizer = polarisAuthorizer;
this.prefixParser = prefixParser;
this.reservedProperties = reservedProperties;

// FIXME: This is a hack to set the current context for downstream calls.
CallContext.setCurrentContext(callContext);
}

private GenericTableCatalogHandler newHandlerWrapper(
Expand Down
3 changes: 0 additions & 3 deletions .../common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ public PolicyCatalogAdapter(
this.metaStoreManager = metaStoreManager;
this.polarisAuthorizer = polarisAuthorizer;
this.prefixParser = prefixParser;

// FIXME: This is a hack to set the current context for downstream calls.
CallContext.setCurrentContext(callContext);
}

private PolicyCatalogHandler newHandlerWrapper(SecurityContext securityContext, String prefix) {
Expand Down