From 84e5a198b8579a5bc74b52b2737dd3bbc61fe196 Mon Sep 17 00:00:00 2001 From: Christian Wulf <chw@informatik.uni-kiel.de> Date: Thu, 14 May 2015 16:31:43 +0200 Subject: [PATCH] updated version of hppc --- pom.xml | 2 +- src/main/java/teetime/stage/FileExtensionSwitch.java | 5 +++-- src/main/java/teetime/stage/util/CountingMap.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b5eab90f..4d1acb81 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ <dependency> <groupId>com.carrotsearch</groupId> <artifactId>hppc</artifactId> - <version>0.6.1</version> + <version>0.7.1</version> </dependency> </dependencies> diff --git a/src/main/java/teetime/stage/FileExtensionSwitch.java b/src/main/java/teetime/stage/FileExtensionSwitch.java index 77415a47..cecf2598 100644 --- a/src/main/java/teetime/stage/FileExtensionSwitch.java +++ b/src/main/java/teetime/stage/FileExtensionSwitch.java @@ -20,14 +20,15 @@ import java.io.File; import teetime.framework.AbstractConsumerStage; import teetime.framework.OutputPort; -import com.carrotsearch.hppc.ObjectObjectOpenHashMap; +import com.carrotsearch.hppc.ObjectObjectHashMap; +import com.carrotsearch.hppc.ObjectObjectMap; import com.google.common.io.Files; public final class FileExtensionSwitch extends AbstractConsumerStage<File> { private final OutputPort<File> unknownFileExtensionOutputPort = createOutputPort(File.class); - private final ObjectObjectOpenHashMap<String, OutputPort<File>> fileExtensions = new ObjectObjectOpenHashMap<String, OutputPort<File>>(); + private final ObjectObjectMap<String, OutputPort<File>> fileExtensions = new ObjectObjectHashMap<String, OutputPort<File>>(); @Override protected void execute(final File file) { diff --git a/src/main/java/teetime/stage/util/CountingMap.java b/src/main/java/teetime/stage/util/CountingMap.java index de171472..8ef17003 100644 --- a/src/main/java/teetime/stage/util/CountingMap.java +++ b/src/main/java/teetime/stage/util/CountingMap.java @@ -15,8 +15,8 @@ */ package teetime.stage.util; +import com.carrotsearch.hppc.ObjectIntHashMap; import com.carrotsearch.hppc.ObjectIntMap; -import com.carrotsearch.hppc.ObjectIntOpenHashMap; import com.carrotsearch.hppc.procedures.ObjectIntProcedure; /** @@ -31,7 +31,7 @@ import com.carrotsearch.hppc.procedures.ObjectIntProcedure; */ public final class CountingMap<T> { - private final ObjectIntMap<T> map = new ObjectIntOpenHashMap<T>(); + private final ObjectIntMap<T> map = new ObjectIntHashMap<T>(); /** * Increments the value of key by one. -- GitLab