Merge pull request #3560 from jruby/test-port-highscale-1_7

port NonBlockingHashMapLong from high-scale-lib
jruby · Dec 28, 2015 · 3b1f9eb · 3b1f9eb
2 parents be65c26 + ec05575
commit 3b1f9eb
Showing 4 changed files with 1,571 additions and 7 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -207,11 +207,6 @@
       <artifactId>options</artifactId>
       <version>1.3</version>
     </dependency>
-    <dependency>
-      <groupId>com.boundary</groupId>
-      <artifactId>high-scale-lib</artifactId>
-      <version>1.0.6</version>
-    </dependency>
   </dependencies>
   <properties>
     <anno.sources>${project.basedir}/target/generated-sources</anno.sources>

diff --git a/core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java b/core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
@@ -7,7 +7,6 @@
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 
-import org.cliffc.high_scale_lib.NonBlockingHashMapLong;
 import org.jruby.Ruby;
 import org.jruby.RubyModule;
 import org.jruby.exceptions.RaiseException;
@@ -24,6 +23,7 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.collections.IntHashMap;
+import org.jruby.util.collections.NonBlockingHashMapLong;
 
 import static org.jruby.util.CodegenUtils.prettyParams;
 

diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -49,7 +49,6 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import org.cliffc.high_scale_lib.NonBlockingHashMapLong;
 
 import org.jcodings.Encoding;
 
@@ -104,6 +103,7 @@
 import org.jruby.util.SafePropertyAccessor;
 import org.jruby.util.cli.Options;
 import org.jruby.util.collections.IntHashMap;
+import org.jruby.util.collections.NonBlockingHashMapLong;
 
 import static org.jruby.java.dispatch.CallableSelector.newCallableCache;
 import org.jruby.java.invokers.RubyToJavaInvoker;

diff --git a/core/src/main/java/org/jruby/util/collections/NonBlockingHashMapLong.java b/core/src/main/java/org/jruby/util/collections/NonBlockingHashMapLong.java