HHH-6862 Reuse cached entryArray of IdentityMap in StatefulPersistenceContext as much as possible

Sanne · stliu · commit d12396ee3726 · 2011-11-30T11:39:54.000+08:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -1162,7 +1162,7 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p
 
 		//not found in case, proceed
 		// iterate all the entities currently associated with the persistence context.
-		for ( Entry<Object,EntityEntry> me : IdentityMap.entriesIterable( entityEntries ) ) {
+		for ( Entry<Object,EntityEntry> me : IdentityMap.concurrentEntries( entityEntries ) ) {
 			final EntityEntry entityEntry = me.getValue();
 			// does this entity entry pertain to the entity persister in which we are interested (owner)?
 			if ( persister.isSubclassEntityName( entityEntry.getEntityName() ) ) {
@@ -1284,7 +1284,7 @@ public Object getIndexInOwner(String entity, String property, Object childEntity
 		}
 
 		//Not found in cache, proceed
-		for ( Entry<Object, EntityEntry> me : IdentityMap.entriesIterable( entityEntries ) ) {
+		for ( Entry<Object, EntityEntry> me : IdentityMap.concurrentEntries( entityEntries ) ) {
 			EntityEntry ee = me.getValue();
 			if ( persister.isSubclassEntityName( ee.getEntityName() ) ) {
 				Object instance = me.getKey();
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -187,7 +187,7 @@ private void prepareCollectionFlushes(PersistenceContext persistenceContext) thr
 		LOG.debug( "Dirty checking collections" );
 
 		for ( Map.Entry<PersistentCollection,CollectionEntry> entry :
-				IdentityMap.entriesIterable( (Map<PersistentCollection,CollectionEntry>) persistenceContext.getCollectionEntries() )) {
+				IdentityMap.concurrentEntries( (Map<PersistentCollection,CollectionEntry>) persistenceContext.getCollectionEntries() )) {
 			entry.getValue().preFlush( entry.getKey() );
 		}
 	}
@@ -246,7 +246,7 @@ private void flushCollections(final EventSource session, final PersistenceContex
 		LOG.trace( "Processing unreferenced collections" );
 
 		for ( Map.Entry<PersistentCollection,CollectionEntry> me :
-				IdentityMap.entriesIterable( (Map<PersistentCollection,CollectionEntry>) persistenceContext.getCollectionEntries() )) {
+				IdentityMap.concurrentEntries( (Map<PersistentCollection,CollectionEntry>) persistenceContext.getCollectionEntries() )) {
 			CollectionEntry ce = me.getValue();
 			if ( !ce.isReached() && !ce.isIgnore() ) {
 				Collections.processUnreachableCollection( me.getKey(), session );
@@ -259,7 +259,7 @@ private void flushCollections(final EventSource session, final PersistenceContex
 
 		ActionQueue actionQueue = session.getActionQueue();
 		for ( Map.Entry<PersistentCollection,CollectionEntry> me :
-			IdentityMap.entriesIterable( (Map<PersistentCollection,CollectionEntry>) persistenceContext.getCollectionEntries() )) {
+			IdentityMap.concurrentEntries( (Map<PersistentCollection,CollectionEntry>) persistenceContext.getCollectionEntries() )) {
 			PersistentCollection coll = me.getKey();
 			CollectionEntry ce = me.getValue();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
@@ -90,10 +90,6 @@ public static <K,V> Map.Entry<K,V>[] concurrentEntries(Map<K,V> map) {
 		return ( (IdentityMap<K,V>) map ).entryArray();
 	}
 
-	public static <K,V> Iterable<Map.Entry<K,V>> entriesIterable(Map<K,V> map) {
-		return ( (IdentityMap<K,V>) map ).entryList();
-	}
-
 	public static <K,V> Iterator<K> keyIterator(Map<K,V> map) {
 		return ( (IdentityMap<K,V>) map ).keyIterator();
 	}

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,6 @@ public static <K,V> Map.Entry<K,V>[] concurrentEntries(Map<K,V> map) {`
`90`	`90`	`return ( (IdentityMap<K,V>) map ).entryArray();`
`91`	`91`	`}`
`92`	`92`
`93`		`- public static <K,V> Iterable<Map.Entry<K,V>> entriesIterable(Map<K,V> map) {`
`94`		`- return ( (IdentityMap<K,V>) map ).entryList();`
`95`		`- }`
`96`		`-`
`97`	`93`	`public static <K,V> Iterator<K> keyIterator(Map<K,V> map) {`
`98`	`94`	`return ( (IdentityMap<K,V>) map ).keyIterator();`
`99`	`95`	`}`