HHH-9811 - Change EntityPersister#resolveAttributeIndexes to take String[]

barreiro · sebersole · commit f795dfc2bc94 · 2015-05-27T12:07:19.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/EntityEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/EntityEnhancer.java
@@ -6,6 +6,11 @@
  */
 package org.hibernate.bytecode.enhance.internal;
 
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
 import javassist.CannotCompileException;
 import javassist.CtClass;
 import javassist.CtField;
@@ -20,11 +25,6 @@
 import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 import org.hibernate.engine.spi.SelfDirtinessTracker;
 
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-
 /**
  * enhancer for regular entities
  *
@@ -140,13 +140,18 @@ private void createDirtyTrackerMethods(CtClass managedCtClass) {
 
 			MethodWriter.write(
 					managedCtClass, "" +
-							"public java.util.Set %1$s() {%n" +
-							"  if (%2$s == null) { %2$s = new %4$s(); }%n" +
-							"  %3$s(%2$s);%n" +
-							"  return %2$s.asSet();%n" +
+							"public String[] %1$s() {%n" +
+							"  if(%3$s == null) {%n" +
+							"    return (%2$s == null) ? new String[0] : %2$s.get();%n" +
+							"  } else {%n" +
+							"    if (%2$s == null) %2$s = new %5$s();%n" +
+							"    %4$s(%2$s);%n" +
+							"    return %2$s.get();%n" +
+							"  }%n" +
 							"}",
 					EnhancerConstants.TRACKER_GET_NAME,
 					EnhancerConstants.TRACKER_FIELD_NAME,
+					EnhancerConstants.TRACKER_COLLECTION_NAME,
 					EnhancerConstants.TRACKER_COLLECTION_CHANGED_FIELD_NAME,
 					TRACKER_IMPL
 			);
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleDirtyTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SimpleDirtyTracker.java
@@ -7,8 +7,6 @@
 package org.hibernate.bytecode.enhance.internal.tracker;
 
 import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * small low memory class to keep track of changed fields
@@ -44,8 +42,8 @@ public boolean isEmpty() {
 		return names.length == 0;
 	}
 
-	public Set<String> asSet() {
-		return new CopyOnWriteArraySet<String>( Arrays.asList( names ) );
+	public String[] get() {
+		return names;
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedDirtyTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/SortedDirtyTracker.java
@@ -6,10 +6,6 @@
  */
 package org.hibernate.bytecode.enhance.internal.tracker;
 
-import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 /**
  * small low memory class to keep track of changed fields
  *
@@ -58,8 +54,8 @@ public boolean isEmpty() {
 		return names.length == 0;
 	}
 
-	public Set<String> asSet() {
-		return new CopyOnWriteArraySet<String>( Arrays.asList( names ) );
+	public String[] get() {
+		return names;
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SelfDirtinessTracker.java
@@ -6,8 +6,6 @@
  */
 package org.hibernate.engine.spi;
 
-import java.util.Set;
-
 /**
  * Contract for an entity to report that it tracks the dirtiness of its own state,
  * as opposed to needing Hibernate to perform state-diff dirty calculations.
@@ -30,9 +28,9 @@ public interface SelfDirtinessTracker {
 	/**
 	 * Retrieve the names of all the persistent attributes whose values have changed.
 	 *
-	 * @return The set of changed persistent attribute names
+	 * @return An array of changed persistent attribute names
 	 */
-	Set<String> $$_hibernate_getDirtyAttributes();
+	String[] $$_hibernate_getDirtyAttributes();
 
 	/**
 	 * Clear the stored dirty attributes
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
@@ -1868,12 +1868,12 @@ protected String[] getSubclassPropertyNameClosure() {
 	}
 
 	@Override
-	public int[] resolveAttributeIndexes(Set<String> properties) {
-		Iterator<String> iter = properties.iterator();
-		int[] fields = new int[properties.size()];
+	public int[] resolveAttributeIndexes(String[] attributeNames) {
+		int[] fields = new int[attributeNames.length];
 		int counter = 0;
-		while ( iter.hasNext() ) {
-			Integer index = entityMetamodel.getPropertyIndexOrNull( iter.next() );
+
+		for ( String attribute : attributeNames ) {
+			Integer index = entityMetamodel.getPropertyIndexOrNull( attribute );
 			if ( index != null ) {
 				fields[counter++] = index;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
@@ -8,7 +8,6 @@
 
 import java.io.Serializable;
 import java.util.Map;
-import java.util.Set;
 
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
@@ -784,7 +783,7 @@ public Object createProxy(Serializable id, SessionImplementor session)
 	
 	public FilterAliasGenerator getFilterAliasGenerator(final String rootAlias);
 
-	public int[] resolveAttributeIndexes(Set<String> properties);
+	public int[] resolveAttributeIndexes(String[] attributeNames);
 
 	public boolean canUseReferenceCacheEntries();
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java
@@ -9,7 +9,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -203,9 +202,9 @@ public static void clearDirtyTracking(Object entityInstance) {
 	public static void checkDirtyTracking(Object entityInstance, String... dirtyFields) {
 		final SelfDirtinessTracker selfDirtinessTracker = (SelfDirtinessTracker) entityInstance;
 		assertEquals( dirtyFields.length > 0, selfDirtinessTracker.$$_hibernate_hasDirtyAttributes() );
-		Set<?> tracked = selfDirtinessTracker.$$_hibernate_getDirtyAttributes();
-		assertEquals( dirtyFields.length, tracked.size() );
-		assertTrue( tracked.containsAll( Arrays.asList( dirtyFields ) ) );
+		String[] tracked = selfDirtinessTracker.$$_hibernate_getDirtyAttributes();
+		assertEquals( dirtyFields.length, tracked.length );
+		assertTrue( Arrays.asList( tracked ).containsAll( Arrays.asList( dirtyFields ) ) );
 	}
 
 	static EntityEntry makeEntityEntry() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/DirtyTrackerTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/DirtyTrackerTest.java
@@ -6,11 +6,10 @@
  */
 package org.hibernate.test.bytecode.enhancement.tracker;
 
-import org.hibernate.bytecode.enhance.internal.tracker.SortedDirtyTracker;
 import org.hibernate.bytecode.enhance.internal.tracker.SimpleDirtyTracker;
-import org.junit.Test;
+import org.hibernate.bytecode.enhance.internal.tracker.SortedDirtyTracker;
 
-import java.util.Set;
+import org.junit.Test;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,55 +24,53 @@ public class DirtyTrackerTest {
     public void testSimpleTracker() {
         SimpleDirtyTracker tracker = new SimpleDirtyTracker();
         assertTrue(tracker.isEmpty());
-        assertTrue(tracker.asSet().isEmpty());
+        assertTrue(tracker.get().length == 0);
 
         tracker.add("foo");
         assertFalse(tracker.isEmpty());
-        assertArrayEquals(tracker.asSet().toArray(), new String[]{"foo"});
+        assertArrayEquals(tracker.get(), new String[]{"foo"});
 
         tracker.clear();
         assertTrue(tracker.isEmpty());
-        assertTrue(tracker.asSet().isEmpty());
+        assertTrue(tracker.get().length == 0);
 
         tracker.add("foo");
         tracker.add("bar");
         tracker.add("another.bar");
         tracker.add("foo");
         tracker.add("another.foo");
         tracker.add("another.bar");
-        assertTrue(tracker.asSet().size() == 4);
+        assertTrue(tracker.get().length == 4);
 
     }
 
     @Test
     public void testSortedTracker() {
         SortedDirtyTracker tracker = new SortedDirtyTracker();
         assertTrue(tracker.isEmpty());
-        assertTrue(tracker.asSet().isEmpty());
+        assertTrue(tracker.get().length == 0);
 
         tracker.add("foo");
         assertFalse(tracker.isEmpty());
-        assertArrayEquals(tracker.asSet().toArray(), new String[]{"foo"});
+        assertArrayEquals(tracker.get(), new String[]{"foo"});
 
         tracker.clear();
         assertTrue(tracker.isEmpty());
-        assertTrue(tracker.asSet().isEmpty());
+        assertTrue(tracker.get().length == 0);
 
         tracker.add("foo");
         tracker.add("bar");
         tracker.add("another.bar");
         tracker.add("foo");
         tracker.add("another.foo");
         tracker.add("another.bar");
-        assertTrue(tracker.asSet().size() == 4);
+        assertTrue(tracker.get().length == 4);
 
         // we the algorithm for this implementation relies on the fact that the array is kept sorted, so let's check it really is
-        assertTrue(isSorted(tracker.asSet()));
+        assertTrue(isSorted(tracker.get()));
     }
 
-    private boolean isSorted(Set<String> set) {
-        String[] arr = new String[set.size()];
-        arr = set.toArray(arr);
+    private boolean isSorted(String[] arr) {
         for (int i = 1; i < arr.length; i++) {
             if (arr[i - 1].compareTo(arr[i]) > 0) {
                 return false;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java
@@ -11,7 +11,6 @@
 import java.sql.SQLException;
 import java.util.Comparator;
 import java.util.Map;
-import java.util.Set;
 
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
@@ -587,7 +586,7 @@ public Iterable<AttributeDefinition> getAttributes() {
 		}
 
         @Override
-        public int[] resolveAttributeIndexes(Set<String> attributes) {
+        public int[] resolveAttributeIndexes(String[] attributeNames) {
             return null;
         }
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java
@@ -10,7 +10,6 @@
 import java.util.Comparator;
 import java.util.Hashtable;
 import java.util.Map;
-import java.util.Set;
 
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
@@ -709,7 +708,7 @@ public Iterable<AttributeDefinition> getAttributes() {
 	}
 
     @Override
-    public int[] resolveAttributeIndexes(Set<String> attributes) {
+    public int[] resolveAttributeIndexes(String[] attributeNames) {
         return null;
     }
 
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/PersisterClassProviderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/PersisterClassProviderTest.java
@@ -10,7 +10,6 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Map;
-import java.util.Set;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
 
@@ -592,7 +591,7 @@ public FilterAliasGenerator getFilterAliasGenerator(String rootAlias) {
 		}
 
 		@Override
-		public int[] resolveAttributeIndexes(Set<String> properties) {
+		public int[] resolveAttributeIndexes(String[] attributeNames) {
 			return new int[0];
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`package org.hibernate.bytecode.enhance.internal.tracker;`
`8`	`8`
`9`	`9`	`import java.util.Arrays;`
`10`		`-import java.util.Set;`
`11`		`-import java.util.concurrent.CopyOnWriteArraySet;`
`12`	`10`
`13`	`11`	`/**`
`14`	`12`	`* small low memory class to keep track of changed fields`
`@@ -44,8 +42,8 @@ public boolean isEmpty() {`
`44`	`42`	`return names.length == 0;`
`45`	`43`	`}`
`46`	`44`
`47`		`- public Set<String> asSet() {`
`48`		`- return new CopyOnWriteArraySet<String>( Arrays.asList( names ) );`
	`45`	`+ public String[] get() {`
	`46`	`+ return names;`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,6 @@`
`6`	`6`	`*/`
`7`	`7`	`package org.hibernate.bytecode.enhance.internal.tracker;`
`8`	`8`
`9`		`-import java.util.Arrays;`
`10`		`-import java.util.Set;`
`11`		`-import java.util.concurrent.CopyOnWriteArraySet;`
`12`		`-`
`13`	`9`	`/**`
`14`	`10`	`* small low memory class to keep track of changed fields`
`15`	`11`	`*`
`@@ -58,8 +54,8 @@ public boolean isEmpty() {`
`58`	`54`	`return names.length == 0;`
`59`	`55`	`}`
`60`	`56`
`61`		`- public Set<String> asSet() {`
`62`		`- return new CopyOnWriteArraySet<String>( Arrays.asList( names ) );`
	`57`	`+ public String[] get() {`
	`58`	`+ return names;`
`63`	`59`	`}`
`64`	`60`
`65`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`import java.sql.SQLException;`
`12`	`12`	`import java.util.Comparator;`
`13`	`13`	`import java.util.Map;`
`14`		`-import java.util.Set;`
`15`	`14`
`16`	`15`	`import org.hibernate.EntityMode;`
`17`	`16`	`import org.hibernate.HibernateException;`
`@@ -587,7 +586,7 @@ public Iterable<AttributeDefinition> getAttributes() {`
`587`	`586`	`}`
`588`	`587`
`589`	`588`	`@Override`
`590`		`- public int[] resolveAttributeIndexes(Set<String> attributes) {`
	`589`	`+ public int[] resolveAttributeIndexes(String[] attributeNames) {`
`591`	`590`	`return null;`
`592`	`591`	`}`
`593`	`592`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import java.util.Comparator;`
`11`	`11`	`import java.util.Hashtable;`
`12`	`12`	`import java.util.Map;`
`13`		`-import java.util.Set;`
`14`	`13`
`15`	`14`	`import org.hibernate.EntityMode;`
`16`	`15`	`import org.hibernate.HibernateException;`
`@@ -709,7 +708,7 @@ public Iterable<AttributeDefinition> getAttributes() {`
`709`	`708`	`}`
`710`	`709`
`711`	`710`	`@Override`
`712`		`- public int[] resolveAttributeIndexes(Set<String> attributes) {`
	`711`	`+ public int[] resolveAttributeIndexes(String[] attributeNames) {`
`713`	`712`	`return null;`
`714`	`713`	`}`
`715`	`714`