HHH-14305 Memory optimisations for AbstractEntityPersister#uniqueKeyL…

…oaders
hibernate · Nov 1, 2020 · bc0f3d9 · bc0f3d9
1 parent d6108fa
commit bc0f3d9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -250,12 +250,12 @@ public abstract class AbstractEntityPersister
 
 	private volatile Set<String> affectingFetchProfileNames;
 
-	private final Map uniqueKeyLoaders = new HashMap();
-
 	private final LockModeEnumMap<LockingStrategy> lockers = new LockModeEnumMap<>();
 
 	private final EntityLoaderLazyCollection loaders = new EntityLoaderLazyCollection();
 
+	private volatile Map<String,EntityLoader> uniqueKeyLoaders;
+
 	// SQL strings
 	private String sqlVersionSelectString;
 	private String sqlSnapshotSelectString;
@@ -2433,7 +2433,8 @@ private EntityLoader getAppropriateUniqueKeyLoader(String propertyName, SharedSe
 				&& propertyName.indexOf( '.' ) < 0; //ugly little workaround for fact that createUniqueKeyLoaders() does not handle component properties
 
 		if ( useStaticLoader ) {
-			return (EntityLoader) uniqueKeyLoaders.get( propertyName );
+			final Map<String, EntityLoader> uniqueKeyLoaders = this.uniqueKeyLoaders;
+			return uniqueKeyLoaders == null ? null : uniqueKeyLoaders.get( propertyName );
 		}
 		else {
 			return createUniqueKeyLoader(
@@ -2453,6 +2454,9 @@ protected void createUniqueKeyLoaders() throws MappingException {
 		String[] propertyNames = getPropertyNames();
 		for ( int i = 0; i < entityMetamodel.getPropertySpan(); i++ ) {
 			if ( propertyUniqueness[i] ) {
+				if ( uniqueKeyLoaders == null ) {
+					this.uniqueKeyLoaders = new HashMap<>();
+				}
 				//don't need filters for the static loaders
 				uniqueKeyLoaders.put(
 						propertyNames[i],