jruby · Jul 22, 2016 · Jul 22, 2016 · Jul 22, 2016 · Jul 22, 2016
diff --git a/bench/java/bench_java_coll_member.rb b/bench/java/bench_java_coll_member.rb
@@ -0,0 +1,73 @@
+require 'java'
+require 'benchmark'
+
+TIMES = (ARGV[0] || 5).to_i
+
+CONTENTS = (1..36).to_a
+
+TIMES.times do
+  Benchmark.bm(10) do |bm|
+    bm.report('ArrayList#include? hit ') do
+      list = java.util.ArrayList.new CONTENTS
+      hit = 32
+      1_000_000.times { list.include?(hit) }
+    end
+    bm.report('ArrayList#include? miss') do
+      list = java.util.ArrayList.new CONTENTS
+      miss = 0
+      1_000_000.times { list.include?(miss) }
+    end
+    bm.report('ArrayList#contains hit ') do
+      list = java.util.ArrayList.new CONTENTS
+      hit = 32
+      1_000_000.times { list.contains(hit) }
+    end
+    bm.report('ArrayList#contains miss') do
+      list = java.util.ArrayList.new CONTENTS
+      miss = 0
+      1_000_000.times { list.contains(miss) }
+    end
+
+    bm.report('HashSet#include? hit   ') do
+      list = java.util.HashSet.new CONTENTS
+      hit = 32
+      1_000_000.times { list.include?(hit) }
+    end
+    bm.report('HashSet#include? miss  ') do
+      list = java.util.HashSet.new CONTENTS
+      miss = 0
+      1_000_000.times { list.include?(miss) }
+    end
+    bm.report('HashSet#contains hit   ') do
+      list = java.util.HashSet.new CONTENTS
+      hit = 32
+      1_000_000.times { list.contains(hit) }
+    end
+    bm.report('HashSet#contains miss  ') do
+      list = java.util.HashSet.new CONTENTS
+      miss = 0
+      1_000_000.times { list.contains(miss) }
+    end
+
+    bm.report('LHashSet#include? hit  ') do
+      list = java.util.LinkedHashSet.new CONTENTS
+      hit = 32
+      1_000_000.times { list.include?(hit) }
+    end
+    bm.report('LHashSet#include? miss ') do
+      list = java.util.LinkedHashSet.new CONTENTS
+      miss = 0
+      1_000_000.times { list.include?(miss) }
+    end
+    bm.report('LHashSet#contains hit  ') do
+      list = java.util.LinkedHashSet.new CONTENTS
+      hit = 32
+      1_000_000.times { list.contains(hit) }
+    end
+    bm.report('LHashSet#contains miss ') do
+      list = java.util.LinkedHashSet.new CONTENTS
+      miss = 0
+      1_000_000.times { list.contains(miss) }
+    end
+  end
+end
diff --git a/bench/java/bench_java_list_ext.rb b/bench/java/bench_java_list_ext.rb
@@ -0,0 +1,45 @@
+require 'java'
+require 'benchmark'
+
+TIMES = (ARGV[0] || 5).to_i
+
+TIMES.times do
+  Benchmark.bm(10) do |bm|
+    bm.report('ArrayList') do
+      list = java.util.ArrayList.new
+      one = 1.to_java
+      two = 2.to_java
+      thr = 3.to_java
+      1_000_000.times do
+        list.clear
+
+        list << one; list << two; list << thr
+
+        list[2] = one; list[0] = two; list[1] = thr
+
+        list.index(one)
+        list.rindex(thr)
+
+        list.to_a
+      end
+    end
+    bm.report('LinkedList') do
+      list = java.util.LinkedList.new
+      one = 1.to_java
+      two = 2.to_java
+      thr = 3.to_java
+      1_000_000.times do
+        list.clear
+
+        list << one; list << two; list << thr
+
+        list[2] = one; list[0] = two; list[1] = thr
+
+        list.index(one)
+        list.rindex(thr)
+
+        list.to_a
+      end
+    end
+  end
+end
diff --git a/core/src/main/java/org/jruby/javasupport/ext/JavaUtil.java b/core/src/main/java/org/jruby/javasupport/ext/JavaUtil.java
@@ -137,6 +137,12 @@ public static IRubyObject each_with_index(final ThreadContext context, final IRu
             return JavaLang.Iterable.each_with_index(context, self, block);
         }
 
+        @JRubyMethod(name = { "include?", "member?" })
+        public static RubyBoolean include_p(final ThreadContext context, final IRubyObject self, final IRubyObject obj) {
+            final java.util.Collection coll = unwrapJavaObject(self);
+            return context.runtime.newBoolean( coll.contains( obj.toJava(java.lang.Object.class) ) );
+        }
+
         // NOTE: first might conflict with some Java types (e.g. java.util.Deque) thus providing a ruby_ alias
         @JRubyMethod(name = { "first", "ruby_first" }) // re-def Enumerable#first
         public static IRubyObject first(final ThreadContext context, final IRubyObject self) {

diff --git a/core/src/main/ruby/jruby/java/java_ext/java.util.rb b/core/src/main/ruby/jruby/java/java_ext/java.util.rb
@@ -19,6 +19,16 @@ def each_with_index(&block)
     # stub implemented in org.jruby.javasupport.ext.JavaUtil.java
   end
 
+  # Re-implemented for efficiency, so that we do not (`#each`) loop over the collection
+  # for types where its not necessary (e.g. *java.util.Set* instances), using (native) `contains`.
+  # @see Java::java::lang::Iterable#include?
+  # @return [true, false]
+  # @since 9.1.3
+  def include?(obj)
+    # stub implemented in org.jruby.javasupport.ext.JavaUtil.java
+  end
+  alias member? include?
+
   # `Enumerable#first`
   # @note Might collide with *java.util.Deque#getFirst* in which case you want to alias its ruby_ name
   #       so that the Ruby version is used e.g. `java.util.ArrayDeque.class_eval { alias first ruby_first }`

diff --git a/spec/java_integration/extensions/collection_spec.rb b/spec/java_integration/extensions/collection_spec.rb
@@ -154,6 +154,41 @@
     expect( set.to_a ).to eql ['0']
   end
 
+  it '#include?' do
+    set = java.util.LinkedHashSet.new [1, 2, 3]
+    expect( set.include? 1 ).to be true
+    expect( set.member? 2 ).to be true
+    expect( set.contains 3 ).to be true
+    set.add 4; set.add 5.to_java
+    expect( set.include? 4 ).to be true
+    expect( set.include? 5 ).to be true
+    expect( set.contains 4 ).to be true
+    expect( set.contains 5 ).to be true
+    expect( set.contains 4.to_java ).to be true
+    expect( set.contains 5.to_java ).to be true
+    expect( set.contains 5.to_java(:byte) ).to be false
+    expect( set.contains 5.to_java(:short) ).to be false
+    expect( set.contains 6 ).to be false
+    expect( set.include? 6 ).to be false
+    expect( set.include? 4.to_java(:byte) ).to be false
+    expect( set.include? 4.to_java(:short) ).to be false
+    expect( set.include? 2.to_java ).to be true
+    expect( set.include? 2.to_java(:short) ).to be false
+  end
+
+  it '#include? (specific)' do
+    pending 'due Java numeric conversion can not add to_java(:xxx) to collection'
+
+    set = java.util.LinkedHashSet.new [2]
+    set << 1.to_java(:short)
+    expect( set.include? 1.to_java ).to be true
+    expect( set.include? 1.to_java(:short) ).to be true
+
+    set.add 3.to_java(:short)
+    expect( set.contains 3.to_java ).to be true
+    expect( set.contains 3.to_java(:short) ).to be true
+  end
+
   it "should respect to_ary objects defined on iteration" do
     class Pair
       def initialize(a, b)