Optimize containsAll on RichIterable. #1344

eclipse · May 29, 2022 · 324a888 · 324a888
1 parent fc7b8b2
commit 324a888
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 2 deletions.
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/RichIterable.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/RichIterable.java
@@ -297,15 +297,23 @@ else if (inside.size() > 32 && !(inside instanceof SetIterable))
  *
  * @since 1.0
  */
- boolean containsAllIterable(Iterable<?> source);
+ default boolean containsAllIterable(Iterable<?> source)
+ {
+ RichIterable<?> outside = this.toSet();
+ return StreamSupport.stream(source.spliterator(), false).allMatch(outside::contains);
+ }
 
  /**
  * Returns true if all elements in source are contained in this collection.
  *
  * @see Collection#containsAll(Collection)
  * @since 1.0
  */
- boolean containsAll(Collection<?> source);
+ default boolean containsAll(Collection<?> source)
+ {
+ return source instanceof RichIterable ? this.containsAllIterable(source)
+ : source.stream().allMatch(this::contains);
+ }
 
  /**
  * Returns true if all elements in the specified var arg array are contained in this collection.

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBag.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBag.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.bag;
 
+import java.util.Collection;
+
 import org.eclipse.collections.api.bag.primitive.MutableBooleanBag;
 import org.eclipse.collections.api.bag.primitive.MutableByteBag;
 import org.eclipse.collections.api.bag.primitive.MutableCharBag;
@@ -230,6 +232,12 @@ default <V> MutableBag<V> countByEach(Function<? super T, ? extends Iterable<V>>
  @Override
  <V> MutableBag<V> flatCollect(Function<? super T, ? extends Iterable<V>> function);
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableBagIterable.super.containsAll(source);
+ }
+
  /**
  * @since 9.2
  */

diff --git a/...pse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBagIterable.java b/...pse-collections-api/src/main/java/org/eclipse/collections/api/bag/MutableBagIterable.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.bag;
 
+import java.util.Collection;
+
 import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.block.function.Function;
 import org.eclipse.collections.api.block.function.primitive.ObjectIntToObjectFunction;
@@ -43,6 +45,12 @@ public interface MutableBagIterable<T> extends Bag<T>, MutableCollection<T>
  */
  int addOccurrences(T item, int occurrences);
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableCollection.super.containsAll(source);
+ }
+
  boolean removeOccurrences(Object item, int occurrences);
 
  boolean setOccurrences(T item, int occurrences);

diff --git a/...ollections-api/src/main/java/org/eclipse/collections/api/bag/sorted/MutableSortedBag.java b/...ollections-api/src/main/java/org/eclipse/collections/api/bag/sorted/MutableSortedBag.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.bag.sorted;
 
+import java.util.Collection;
+
 import org.eclipse.collections.api.bag.MutableBag;
 import org.eclipse.collections.api.bag.MutableBagIterable;
 import org.eclipse.collections.api.block.function.Function;
@@ -49,6 +51,12 @@
 public interface MutableSortedBag<T>
  extends SortedBag<T>, MutableBagIterable<T>, Cloneable
 {
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableBagIterable.super.containsAll(source);
+ }
+
  @Override
  MutableSortedBag<T> selectByOccurrences(IntPredicate predicate);
 

diff --git a/...ections-api/src/main/java/org/eclipse/collections/api/collection/FixedSizeCollection.java b/...ections-api/src/main/java/org/eclipse/collections/api/collection/FixedSizeCollection.java
@@ -156,6 +156,12 @@ public interface FixedSizeCollection<T>
  @Override
  boolean retainAllIterable(Iterable<?> iterable);
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableCollection.super.containsAll(source);
+ }
+
  /**
  * @throws UnsupportedOperationException the {@code clear} method is not supported by this collection.
  */

diff --git a/...llections-api/src/main/java/org/eclipse/collections/api/collection/MutableCollection.java b/...llections-api/src/main/java/org/eclipse/collections/api/collection/MutableCollection.java
@@ -563,6 +563,12 @@ default <V> MutableMap<V, T> groupByUniqueKey(Function<? super T, ? extends V> f
  */
  boolean retainAllIterable(Iterable<?> iterable);
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return RichIterable.super.containsAll(source);
+ }
+
  @Override
  default <K, V> MutableMap<K, V> aggregateInPlaceBy(
  Function<? super T, ? extends K> groupBy,

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/FixedSizeList.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/FixedSizeList.java
@@ -10,6 +10,7 @@
 
 package org.eclipse.collections.api.list;
 
+import java.util.Collection;
 import java.util.Comparator;
 
 import org.eclipse.collections.api.block.procedure.Procedure;
@@ -41,6 +42,12 @@ public interface FixedSizeList<T>
  @Override
  FixedSizeList<T> tap(Procedure<? super T> procedure);
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableList.super.containsAll(source);
+ }
+
  @Override
  default FixedSizeList<T> sortThis(Comparator<? super T> comparator)
  {

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MutableList.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/list/MutableList.java
@@ -10,6 +10,7 @@
 
 package org.eclipse.collections.api.list;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -394,6 +395,12 @@ default MutableList<T> shuffleThis(Random random)
  return this;
  }
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableCollection.super.containsAll(source);
+ }
+
  /**
  * Converts the MutableList to the default ImmutableList implementation.
  *

diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/FixedSizeSet.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/FixedSizeSet.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.set;
 
+import java.util.Collection;
+
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.collection.FixedSizeCollection;
 
@@ -33,4 +35,10 @@ public interface FixedSizeSet<T>
 
  @Override
  FixedSizeSet<T> tap(Procedure<? super T> procedure);
+
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return FixedSizeCollection.super.containsAll(source);
+ }
 }
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MultiReaderSet.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MultiReaderSet.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.set;
 
+import java.util.Collection;
+
 import org.eclipse.collections.api.block.procedure.Procedure;
 
 /**
@@ -23,4 +25,10 @@ public interface MultiReaderSet<T>
  void withReadLockAndDelegate(Procedure<? super MutableSet<T>> procedure);
 
  void withWriteLockAndDelegate(Procedure<? super MutableSet<T>> procedure);
+
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableSet.super.containsAll(source);
+ }
 }
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSet.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSet.java
@@ -10,6 +10,8 @@
 
 package org.eclipse.collections.api.set;
 
+import java.util.Collection;
+
 import org.eclipse.collections.api.block.function.Function;
 import org.eclipse.collections.api.block.function.Function2;
 import org.eclipse.collections.api.block.function.primitive.BooleanFunction;
@@ -196,6 +198,12 @@ default <P, V> MutableSet<V> flatCollectWith(Function2<? super T, ? super P, ? e
  @Override
  MutableSet<UnsortedSetIterable<T>> powerSet();
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableSetIterable.super.containsAll(source);
+ }
+
  /**
  * Converts the MutableSet to the default ImmutableSet implementation.
  *

diff --git a/...pse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSetIterable.java b/...pse-collections-api/src/main/java/org/eclipse/collections/api/set/MutableSetIterable.java
@@ -10,6 +10,7 @@
 
 package org.eclipse.collections.api.set;
 
+import java.util.Collection;
 import java.util.Set;
 
 import org.eclipse.collections.api.block.function.Function;
@@ -98,4 +99,10 @@ default MutableSetIterable<T> withoutAll(Iterable<? extends T> elements)
  this.removeAllIterable(elements);
  return this;
  }
+
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableCollection.super.containsAll(source);
+ }
 }
diff --git a/...ollections-api/src/main/java/org/eclipse/collections/api/set/sorted/MutableSortedSet.java b/...ollections-api/src/main/java/org/eclipse/collections/api/set/sorted/MutableSortedSet.java
@@ -10,6 +10,7 @@
 
 package org.eclipse.collections.api.set.sorted;
 
+import java.util.Collection;
 import java.util.SortedSet;
 
 import org.eclipse.collections.api.block.function.Function;
@@ -237,6 +238,12 @@ default <P, V> MutableList<V> flatCollectWith(Function2<? super T, ? super P, ?
  @Override
  MutableSortedSet<T> tailSet(T fromElement);
 
+ @Override
+ default boolean containsAll(Collection<?> source)
+ {
+ return MutableSetIterable.super.containsAll(source);
+ }
+
  /**
  * @since 11.0
  */

diff --git a/unit-tests/src/test/java/org/eclipse/collections/impl/AbstractRichIterableTestCase.java b/unit-tests/src/test/java/org/eclipse/collections/impl/AbstractRichIterableTestCase.java
@@ -232,7 +232,12 @@ public void containsAllIterable()
  {
  RichIterable<Integer> collection = this.newWith(1, 2, 3, 4);
  Assert.assertTrue(collection.containsAllIterable(Lists.mutable.with(1, 2)));
+ Assert.assertTrue(collection.containsAllIterable(Lists.mutable.with(1, 1, 2, 2, 2, 3)));
  Assert.assertFalse(collection.containsAllIterable(Lists.mutable.with(1, 5)));
+ Assert.assertTrue(Interval.oneTo(100).containsAllIterable(collection));
+ Assert.assertFalse(Interval.fromTo(2, 100).containsAllIterable(collection));
+ Assert.assertTrue(this.newWith(Interval.oneTo(100).toArray()).containsAllIterable(Interval.oneTo(50)));
+ Assert.assertFalse(this.newWith(Interval.fromTo(5, 100).toArray()).containsAllIterable(Interval.fromTo(200, 250)));
  }
 
  @Test
@@ -309,6 +314,11 @@ public void containsAllCollection()
  RichIterable<Integer> collection = this.newWith(1, 2, 3, 4);
  Assert.assertTrue(collection.containsAll(Lists.mutable.with(1, 2)));
  Assert.assertFalse(collection.containsAll(Lists.mutable.with(1, 5)));
+ Assert.assertFalse(collection.containsAll(Arrays.asList(1, 2, 5)));
+ Assert.assertTrue(collection.containsAll(Interval.oneTo(4)));
+ Assert.assertFalse(collection.containsAll(Interval.fromTo(5, 100)));
+ Assert.assertTrue(this.newWith(Interval.oneTo(100).toArray()).containsAll(Interval.oneTo(50)));
+ Assert.assertFalse(this.newWith(Interval.fromTo(5, 100).toArray()).containsAll(Interval.fromTo(50, 150)));
  }
 
  @Test