You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by ad...@apache.org on 2024/11/22 18:19:40 UTC
(polaris) branch main updated: Make RealmEntityManagerFactory thread-safe (#466)
This is an automated email from the ASF dual-hosted git repository.
adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 017ebbc6 Make RealmEntityManagerFactory thread-safe (#466)
017ebbc6 is described below
commit 017ebbc6eeb76239a169079cb6c3d99e725ceb22
Author: Alexandre Dutra <ad...@users.noreply.github.com>
AuthorDate: Fri Nov 22 19:19:36 2024 +0100
Make RealmEntityManagerFactory thread-safe (#466)
---
.../service/config/RealmEntityManagerFactory.java | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
index b5fb48a7..b896a13e 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
@@ -18,8 +18,8 @@
*/
package org.apache.polaris.service.config;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisEntityManager;
@@ -32,7 +32,7 @@ public class RealmEntityManagerFactory {
private final MetaStoreManagerFactory metaStoreManagerFactory;
// Key: realmIdentifier
- private final Map<String, PolarisEntityManager> cachedEntityManagers = new HashMap<>();
+ private final Map<String, PolarisEntityManager> cachedEntityManagers = new ConcurrentHashMap<>();
// Subclasses for test injection.
protected RealmEntityManagerFactory() {
@@ -47,17 +47,14 @@ public class RealmEntityManagerFactory {
String realm = context.getRealmIdentifier();
LOGGER.debug("Looking up PolarisEntityManager for realm {}", realm);
- PolarisEntityManager entityManagerInstance = cachedEntityManagers.get(realm);
- if (entityManagerInstance == null) {
- LOGGER.info("Initializing new PolarisEntityManager for realm {}", realm);
- entityManagerInstance =
- new PolarisEntityManager(
+ return cachedEntityManagers.computeIfAbsent(
+ realm,
+ r -> {
+ LOGGER.info("Initializing new PolarisEntityManager for realm {}", r);
+ return new PolarisEntityManager(
metaStoreManagerFactory.getOrCreateMetaStoreManager(context),
metaStoreManagerFactory.getOrCreateStorageCredentialCache(context));
-
- cachedEntityManagers.put(realm, entityManagerInstance);
- }
- return entityManagerInstance;
+ });
}
}