HPPCRT-46: Remove CurstomHash and replace by equals/hashCode override…

…s in normal hash containers.
vsonnier · Oct 21, 2015 · 7e92f04 · 7e92f04
1 parent 34a9160
commit 7e92f04
Show file tree

Hide file tree

Showing 21 changed files with 454 additions and 3,633 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,7 @@
+[0.7.2]
+** API-breaking changes
+HPPCRT-46: Remove CurstomHash and replace by equals/hashCode overrides in normal hash containers.
+
 [0.7.1]
 ** Bug fixes
 HPPCRT-45: API with intervals arguments is inconsistent with JDK conventions.

diff --git a/README.txt b/README.txt
@@ -45,7 +45,7 @@ Stable version is available on Maven:
 <dependency>
     <groupId>com.github.vsonnier</groupId>
     <artifactId>hppcrt</artifactId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
 </dependency>
 ````
 

diff --git a/hppcrt-benchmarks/pom.xml b/hppcrt-benchmarks/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>com.github.vsonnier</groupId>
         <artifactId>hppcrt-parent</artifactId>
-        <version>0.7.2-SNAPSHOT</version>
+        <version>0.7.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <!-- Project info. -->
     <artifactId>hppcrt-benchmarks</artifactId>
-    <version>0.7.2-SNAPSHOT</version>
+    <version>0.7.2</version>
     <packaging>jar</packaging>
 
     <name>HPPC-RT Benchmarks</name>
@@ -24,14 +24,14 @@
         <commons-lang.version>2.6</commons-lang.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.11</jmh.version>
+        <jmh.version>1.11.1</jmh.version>
         <javac.target>1.7</javac.target>
         <uberjar.name>benchmarks</uberjar.name>
 
         <hppc.version>0.7.1</hppc.version>
-        <fastutil.version>7.0.6</fastutil.version>
+        <fastutil.version>7.0.7</fastutil.version>
         <gs.version>6.2.0</gs.version>
-        <koloboke.version>0.6.7</koloboke.version>
+        <koloboke.version>0.6.8</koloboke.version>
         <javolution.version>6.0.0</javolution.version>
     </properties>
 

diff --git a/...chmarks/src/main/java/com/carrotsearch/hppcrt/implementations/HashMapImplementations.java b/...chmarks/src/main/java/com/carrotsearch/hppcrt/implementations/HashMapImplementations.java
@@ -79,20 +79,6 @@ public boolean isHashQualityApplicable() {
         }
     },
 
-    HPPCRT_OBJ_INT_STRATEGY
-    {
-        @Override
-        public MapImplementation<?> getInstance(final int size, final float loadFactor)
-        {
-            return new HppcrtObjectIntCustomMap(size, loadFactor);
-        }
-
-        @Override
-        public boolean isHashQualityApplicable() {
-
-            return true;
-        }
-    },
 
     HPPC_OBJ_INT {
         @Override

diff --git a/...marks/src/main/java/com/carrotsearch/hppcrt/implementations/HppcrtObjectIntCustomMap.java b/...marks/src/main/java/com/carrotsearch/hppcrt/implementations/HppcrtObjectIntCustomMap.java
diff --git a/hppcrt-benchmarks/src/main/java/com/carrotsearch/hppcrt/misc/HppcMapSyntheticBench.java b/hppcrt-benchmarks/src/main/java/com/carrotsearch/hppcrt/misc/HppcMapSyntheticBench.java
@@ -15,11 +15,9 @@
 import com.carrotsearch.hppcrt.lists.LongArrayList;
 import com.carrotsearch.hppcrt.lists.ObjectArrayList;
 import com.carrotsearch.hppcrt.maps.IntLongHashMap;
-import com.carrotsearch.hppcrt.maps.ObjectLongCustomHashMap;
 import com.carrotsearch.hppcrt.maps.ObjectLongHashMap;
 import com.carrotsearch.hppcrt.maps.ObjectLongIdentityHashMap;
 import com.carrotsearch.hppcrt.procedures.LongProcedure;
-import com.carrotsearch.hppcrt.strategies.ObjectHashingStrategy;
 
 public final class HppcMapSyntheticBench
 {
@@ -137,25 +135,7 @@ public boolean equals(final Object obj)
         }
     }
 
-    /**
-     * Testing for strategies
-     */
-    private final ObjectHashingStrategy<ComparableInt> INTHOLDER_TRIVIAL_STRATEGY = new ObjectHashingStrategy<ComparableInt>() {
-
-        @Override
-        public int computeHashCode(final ComparableInt o)
-        {
-            return o.value;
-        }
-
-        @Override
-        public boolean equals(final ComparableInt o1, final ComparableInt o2)
-        {
-            return o1.value == o2.value;
-        }
-    };
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Constructor
      */
@@ -732,14 +712,6 @@ ObjectLongHashMap.<ComparableInt> newInstance(HppcMapSyntheticBench.COUNT, HashC
                     getKind, HASH_QUALITY.BAD, dis);
             System.gc();
         }
-
-        // use specialized strategy to overcome the bad hash behaviour above.
-        runMapIntegerObjectLong("ObjectLongOpenCustomHashMap with strategy",
-                ObjectLongCustomHashMap.<ComparableInt> newInstance(
-                        HppcMapSyntheticBench.COUNT, HashContainers.DEFAULT_LOAD_FACTOR,
-                        this.INTHOLDER_TRIVIAL_STRATEGY),
-                        HppcMapSyntheticBench.COUNT, HashContainers.DEFAULT_LOAD_FACTOR, getKind, HASH_QUALITY.BAD, Distribution.HIGHBITS);
-        System.gc();
     }
 
     public void runMapIterationBench()
@@ -756,26 +728,26 @@ private Generator getGenerator(final Distribution disKind, final int pushedEleme
 
         switch (disKind)
         {
-            case RANDOM:
-                generator = disGene.RANDOM;
-                break;
+        case RANDOM:
+            generator = disGene.RANDOM;
+            break;
 
-            case CONTIGUOUS:
-                generator = disGene.LINEAR;
-                break;
+        case CONTIGUOUS:
+            generator = disGene.LINEAR;
+            break;
 
-            case HIGHBITS:
-                generator = disGene.HIGHBITS;
-                break;
+        case HIGHBITS:
+            generator = disGene.HIGHBITS;
+            break;
 
-            default:
-                throw new RuntimeException();
+        default:
+            throw new RuntimeException();
         }
 
         return generator;
     }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * main
      */

diff --git a/hppcrt-template-processor/pom.xml b/hppcrt-template-processor/pom.xml
@@ -5,14 +5,14 @@
   <parent>
     <groupId>com.github.vsonnier</groupId>
     <artifactId>hppcrt-parent</artifactId>
-    <version>0.7.2-SNAPSHOT</version>
+    <version>0.7.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <!-- Project info. -->
   <groupId>com.github.vsonnier</groupId>
   <artifactId>hppcrt-template-processor</artifactId>
-  <version>0.7.2-SNAPSHOT</version>
+  <version>0.7.2</version>
   <packaging>jar</packaging>
 
   <name>HPPC-RT Template Processor</name>

diff --git a/hppcrt/pom.xml b/hppcrt/pom.xml
@@ -6,14 +6,14 @@
 	<parent>
 		<groupId>com.github.vsonnier</groupId>
 		<artifactId>hppcrt-parent</artifactId>
-		<version>0.7.2-SNAPSHOT</version>
+		<version>0.7.2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<!-- Project info. -->
 	<groupId>com.github.vsonnier</groupId>
 	<artifactId>hppcrt</artifactId>
-	<version>0.7.2-SNAPSHOT</version>
+	<version>0.7.2</version>
 	<packaging>jar</packaging>
 
 	<name>HPPC-RT Collections</name>