Skip to content
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

Add logging and move test to the right package #104

Merged
merged 4 commits into from
Aug 7, 2024
Merged

Add logging and move test to the right package #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7bbb3d
Add logging and reuse created EntityManagerFactory
aihuaxu Aug 7, 2024
c6f41a9
Remove reuse EntityManagerFactory since we need to have different one…
aihuaxu Aug 7, 2024
49f62f7
Cache and reuse EntityManagerFactory
aihuaxu Aug 7, 2024
e2275b0
Address comments
aihuaxu Aug 7, 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
58 changes: 46 additions & 12 deletions ...olaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,21 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
Expand All @@ -80,6 +84,10 @@ public class PolarisEclipseLinkMetaStoreSessionImpl implements PolarisMetaStoreS
private static final Logger LOG =
LoggerFactory.getLogger(PolarisEclipseLinkMetaStoreSessionImpl.class);

// Cache to hold the EntityManagerFactory for each realm. Each realm needs a separate
// EntityManagerFactory since it connects to different databases
private static final ConcurrentHashMap<String, EntityManagerFactory> realmFactories =
new ConcurrentHashMap<>();
private final EntityManagerFactory emf;
private final ThreadLocal<EntityManager> localSession = new ThreadLocal<>();
private final PolarisEclipseLinkStore store;
Expand All @@ -100,20 +108,30 @@ public PolarisEclipseLinkMetaStoreSessionImpl(
@NotNull RealmContext realmContext,
@Nullable String confFile,
@Nullable String persistenceUnitName) {

emf = createEntityManagerFactory(realmContext, confFile, persistenceUnitName);
LOG.debug("Create EclipseLink Meta Store Session for {}", realmContext.getRealmIdentifier());
emf = createEntityManagerFactory(realmContext, confFile, persistenceUnitName);

// init store
this.store = store;
this.storageIntegrationProvider = storageIntegrationProvider;
}

/** Load the persistence unit properties from a given configuration file */
/**
* Create EntityManagerFactory.
*
* <p>The EntityManagerFactory creation is expensive, so we are caching and reusing it for each
* realm.
*/
private EntityManagerFactory createEntityManagerFactory(
@NotNull RealmContext realmContext,
@Nullable String confFile,
@Nullable String persistenceUnitName) {
String realm = realmContext.getRealmIdentifier();
EntityManagerFactory factory = realmFactories.getOrDefault(realm, null);
if (factory != null) {
return factory;
}

ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
persistenceUnitName = persistenceUnitName == null ? "polaris" : persistenceUnitName;
Expand All @@ -131,31 +149,44 @@ private EntityManagerFactory createEntityManagerFactory(
if (prefixUrl == null) {
prefixUrl = new File(jarPrefixPath).toURI().toURL();
}

LOG.info(
"Created a new ClassLoader with the jar {} in classpath to load the config file",
prefixUrl);

URLClassLoader currentClassLoader =
new URLClassLoader(new URL[] {prefixUrl}, this.getClass().getClassLoader());

LOG.debug("Update ClassLoader in current thread temporarily");
Thread.currentThread().setContextClassLoader(currentClassLoader);
}

Map<String, String> properties = loadProperties(confFile, persistenceUnitName);
// Replace database name in JDBC URL with realm
if (properties.containsKey(JDBC_URL)) {
properties.put(
JDBC_URL,
properties.get(JDBC_URL).replace("{realm}", realmContext.getRealmIdentifier()));
properties.put(JDBC_URL, properties.get(JDBC_URL).replace("{realm}", realm));
}
properties.put(ECLIPSELINK_PERSISTENCE_XML, confFile);

return Persistence.createEntityManagerFactory(persistenceUnitName, properties);
} catch (Exception e) {
factory = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
realmFactories.putIfAbsent(realm, factory);

return factory;
} catch (IOException e) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@collado-mike Didn't get your original comment "catch RuntimeException separately and just rethrow".

throw new RuntimeException(e);
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@TestOnly
static void clearEntityManagerFactories() {
realmFactories.clear();
}

/** Load the persistence unit properties from a given configuration file */
private Map<String, String> loadProperties(
@NotNull String confFile, @NotNull String persistenceUnitName) throws Exception {
@NotNull String confFile, @NotNull String persistenceUnitName) throws IOException {
try {
InputStream input =
Thread.currentThread().getContextClassLoader().getResourceAsStream(confFile);
Expand All @@ -176,13 +207,16 @@ private Map<String, String> loadProperties(
}

return properties;
} catch (SAXException | IOException e) {
} catch (XPathExpressionException
| ParserConfigurationException
| SAXException
| IOException e) {
String str =
String.format(
"Cannot find or parse the configuration file %s for persistence-unit %s",
confFile, persistenceUnitName);
LOG.error(str);
throw new Exception(str);
LOG.error(str, e);
throw new IOException(str);
}
}

Expand Down
7 changes: 4 additions & 3 deletions ...link/PolarisEclipseLinkMetaStoreTest.java → ...link/PolarisEclipseLinkMetaStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.snowflake.polaris.persistence.impl.eclipselink;
package io.polaris.extension.persistence.impl.eclipselink;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -26,8 +26,6 @@
import io.polaris.core.persistence.PolarisMetaStoreManagerImpl;
import io.polaris.core.persistence.PolarisMetaStoreManagerTest;
import io.polaris.core.persistence.PolarisTestMetaStoreManager;
import io.polaris.extension.persistence.impl.eclipselink.PolarisEclipseLinkMetaStoreSessionImpl;
import io.polaris.extension.persistence.impl.eclipselink.PolarisEclipseLinkStore;
import java.time.ZoneId;
import java.util.stream.Stream;
import org.junit.jupiter.api.extension.ExtensionContext;
Expand Down Expand Up @@ -63,6 +61,9 @@ protected PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
@ParameterizedTest()
@ArgumentsSource(CreateStoreSessionArgs.class)
void testCreateStoreSession(String confFile, boolean success) {
// Clear cache to prevent reuse EntityManagerFactory
PolarisEclipseLinkMetaStoreSessionImpl.clearEntityManagerFactories();

PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
PolarisEclipseLinkStore store = new PolarisEclipseLinkStore(diagServices);
try {
Expand Down
Loading