Skip to content

Commit 0449d9b

Browse files
authored
Remove CallContext.CURRENT_CONTEXT (apache#2203)
the last callers of `CallContext.getCurrentContext` had been removed in the following commits: - 756e535 - e7eb59f - 4d94745 thus we can now remove the `CURRENT_CONTEXT` threadlocal and all associated methods.
1 parent 0b3a129 commit 0449d9b

File tree

6 files changed

+7
-38
lines changed

6 files changed

+7
-38
lines changed

polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,6 @@
3030
* underlying nature of the persistence layer may differ between different realms.
3131
*/
3232
public interface CallContext {
33-
InheritableThreadLocal<CallContext> CURRENT_CONTEXT = new InheritableThreadLocal<>();
34-
35-
static CallContext setCurrentContext(CallContext context) {
36-
CURRENT_CONTEXT.set(context);
37-
return context;
38-
}
39-
40-
static CallContext getCurrentContext() {
41-
return CURRENT_CONTEXT.get();
42-
}
43-
44-
static void unsetCurrentContext() {
45-
CURRENT_CONTEXT.remove();
46-
}
47-
4833
/** Copy the {@link CallContext}. */
4934
CallContext copy();
5035

runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AbstractIcebergCatalogViewTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
4646
import org.apache.polaris.core.config.FeatureConfiguration;
4747
import org.apache.polaris.core.config.PolarisConfigurationStore;
48-
import org.apache.polaris.core.context.CallContext;
4948
import org.apache.polaris.core.context.RealmContext;
5049
import org.apache.polaris.core.entity.CatalogEntity;
5150
import org.apache.polaris.core.entity.PrincipalEntity;
@@ -167,8 +166,6 @@ public void before(TestInfo testInfo) {
167166
PolarisEntityManager entityManager =
168167
new PolarisEntityManager(metaStoreManager, resolverFactory);
169168

170-
CallContext.setCurrentContext(polarisContext);
171-
172169
PrincipalEntity rootPrincipal =
173170
metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
174171
AuthenticatedPolarisPrincipal authenticatedRoot =

runtime/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.polaris.core.admin.model.Principal;
3737
import org.apache.polaris.core.admin.model.PrincipalRole;
3838
import org.apache.polaris.core.admin.model.PrincipalWithCredentials;
39-
import org.apache.polaris.core.context.CallContext;
4039
import org.apache.polaris.core.context.RealmContext;
4140
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
4241
import org.apache.polaris.core.entity.PrincipalEntity;
@@ -116,17 +115,13 @@ private PolarisPrincipalSecrets fetchAdminSecrets() {
116115
helper.diagServices,
117116
helper.configurationStore,
118117
helper.clock);
119-
try {
120-
PolarisMetaStoreManager metaStoreManager =
121-
helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
122-
PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
123-
Map<String, String> propertiesMap = readInternalProperties(principal);
124-
return metaStoreManager
125-
.loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id"))
126-
.getPrincipalSecrets();
127-
} finally {
128-
CallContext.unsetCurrentContext();
129-
}
118+
PolarisMetaStoreManager metaStoreManager =
119+
helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
120+
PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow();
121+
Map<String, String> propertiesMap = readInternalProperties(principal);
122+
return metaStoreManager
123+
.loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id"))
124+
.getPrincipalSecrets();
130125
}
131126

132127
private SnowmanCredentials createSnowmanCredentials(TestEnvironment testEnv) {

service/common/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ public PolarisServiceImpl(
111111
this.polarisAuthorizer = polarisAuthorizer;
112112
this.callContext = callContext;
113113
this.reservedProperties = reservedProperties;
114-
// FIXME: This is a hack to set the current context for downstream calls.
115-
CallContext.setCurrentContext(callContext);
116114
}
117115

118116
private PolarisAdminService newAdminService(

service/common/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ public GenericTableCatalogAdapter(
6969
this.polarisAuthorizer = polarisAuthorizer;
7070
this.prefixParser = prefixParser;
7171
this.reservedProperties = reservedProperties;
72-
73-
// FIXME: This is a hack to set the current context for downstream calls.
74-
CallContext.setCurrentContext(callContext);
7572
}
7673

7774
private GenericTableCatalogHandler newHandlerWrapper(

service/common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ public PolicyCatalogAdapter(
7070
this.metaStoreManager = metaStoreManager;
7171
this.polarisAuthorizer = polarisAuthorizer;
7272
this.prefixParser = prefixParser;
73-
74-
// FIXME: This is a hack to set the current context for downstream calls.
75-
CallContext.setCurrentContext(callContext);
7673
}
7774

7875
private PolicyCatalogHandler newHandlerWrapper(SecurityContext securityContext, String prefix) {

0 commit comments

Comments
 (0)