You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/05/25 13:55:16 UTC
svn commit: r1745486 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util:
Int2ObjHashMap.java Obj2IntIdentityHashMap.java
Author: schor
Date: Wed May 25 13:55:15 2016
New Revision: 1745486
URL: http://svn.apache.org/viewvc?rev=1745486&view=rev
Log:
[UIMA-4674] insure capacity is power of 2
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java?rev=1745486&r1=1745485&r2=1745486&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java Wed May 25 13:55:15 2016
@@ -200,6 +200,7 @@ public class Int2ObjHashMap<T> {
public Int2ObjHashMap(Class<T> clazz, int initialCapacity) {
this.componentType = clazz;
+ initialCapacity = Misc.nextHigherPowerOf2(initialCapacity);
this.initialCapacity = initialCapacity;
newTableKeepSize(initialCapacity);
size = 0;
@@ -218,7 +219,7 @@ public class Int2ObjHashMap<T> {
private Int2ObjHashMap(Class<T> clazz, int initialCapacity,
int sizeWhichTriggersExpansion, int size, int[] keys, T [] values) {
this.componentType = clazz;
- this.initialCapacity = initialCapacity;
+ this.initialCapacity = Misc.nextHigherPowerOf2(initialCapacity);
this.sizeWhichTriggersExpansion = sizeWhichTriggersExpansion;
this.histogram = null;
this.size = size;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java?rev=1745486&r1=1745485&r2=1745486&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java Wed May 25 13:55:15 2016
@@ -78,6 +78,7 @@ public class Obj2IntIdentityHashMap<T> {
*/
public Obj2IntIdentityHashMap(int initialCapacity, Class<T> clazz, T removedMarker) {
this.componentType = clazz;
+ initialCapacity = Misc.nextHigherPowerOf2(initialCapacity);
this.initialCapacity = initialCapacity;
newTableKeepSize(initialCapacity);
size = 0;