Optimize sumByLong and sumByInt Primitive methods for Bags. Partially…

… addresses #448. Signed-off-by: Sirisha Pratha <sirisha.pratha@bnymellon.com>
eclipse · Sep 28, 2020 · d235358 · d235358
1 parent bfc3821
commit d235358
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 10 deletions.
diff --git a/...rc/main/java/org/eclipse/collections/impl/bag/immutable/AbstractImmutableBagIterable.java b/...rc/main/java/org/eclipse/collections/impl/bag/immutable/AbstractImmutableBagIterable.java
@@ -64,7 +64,10 @@ public <K, V> ImmutableMap<K, V> aggregateInPlaceBy(
     public <V> ImmutableObjectLongMap<V> sumByInt(Function<? super T, ? extends V> groupBy, IntFunction<? super T> function)
     {
         MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
-        return this.injectInto(result, PrimitiveFunctions.sumByIntFunction(groupBy, function)).toImmutable();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.intValueOf(each) * (long) occurrences));
+        return result.toImmutable();
     }
 
     @Override
@@ -78,7 +81,10 @@ public <V> ImmutableObjectDoubleMap<V> sumByFloat(Function<? super T, ? extends
     public <V> ImmutableObjectLongMap<V> sumByLong(Function<? super T, ? extends V> groupBy, LongFunction<? super T> function)
     {
         MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
-        return this.injectInto(result, PrimitiveFunctions.sumByLongFunction(groupBy, function)).toImmutable();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.longValueOf(each) * (long) occurrences));
+        return result.toImmutable();
     }
 
     @Override

diff --git a/...ns/src/main/java/org/eclipse/collections/impl/bag/mutable/AbstractMutableBagIterable.java b/...ns/src/main/java/org/eclipse/collections/impl/bag/mutable/AbstractMutableBagIterable.java
@@ -299,7 +299,10 @@ public <K, V> MutableMap<K, V> aggregateInPlaceBy(
     public <V> MutableObjectLongMap<V> sumByInt(Function<? super T, ? extends V> groupBy, IntFunction<? super T> function)
     {
         MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
-        return this.injectInto(result, PrimitiveFunctions.sumByIntFunction(groupBy, function));
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.intValueOf(each) * (long) occurrences));
+        return result;
     }
 
     @Override
@@ -313,7 +316,10 @@ public <V> MutableObjectDoubleMap<V> sumByFloat(Function<? super T, ? extends V>
     public <V> MutableObjectLongMap<V> sumByLong(Function<? super T, ? extends V> groupBy, LongFunction<? super T> function)
     {
         MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
-        return this.injectInto(result, PrimitiveFunctions.sumByLongFunction(groupBy, function));
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.longValueOf(each) * (long) occurrences));
+        return result;
     }
 
     @Override

diff --git a/...ollections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java b/...ollections/src/main/java/org/eclipse/collections/impl/bag/mutable/MultiReaderHashBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Goldman Sachs and others.
+ * Copyright (c) 2020 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -68,6 +68,7 @@
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.api.map.primitive.MutableObjectLongMap;
 import org.eclipse.collections.api.multimap.bag.MutableBagMultimap;
 import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.api.partition.bag.PartitionMutableBag;
@@ -76,6 +77,7 @@
 import org.eclipse.collections.api.tuple.primitive.ObjectIntPair;
 import org.eclipse.collections.impl.collection.mutable.AbstractMultiReaderMutableCollection;
 import org.eclipse.collections.impl.factory.Iterables;
+import org.eclipse.collections.impl.map.mutable.primitive.ObjectLongHashMap;
 import org.eclipse.collections.impl.utility.LazyIterate;
 
 /**
@@ -606,6 +608,26 @@ public T detectWithOccurrences(ObjectIntPredicate<? super T> predicate)
         }
     }
 
+    @Override
+    public <V> MutableObjectLongMap<V> sumByInt(Function<? super T, ? extends V> groupBy, IntFunction<? super T> function)
+    {
+        MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.intValueOf(each) * (long) occurrences));
+        return result;
+    }
+
+    @Override
+    public <V> MutableObjectLongMap<V> sumByLong(Function<? super T, ? extends V> groupBy, LongFunction<? super T> function)
+    {
+        MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.longValueOf(each) * (long) occurrences));
+        return result;
+    }
+
     @Override
     public void forEachWithOccurrences(ObjectIntProcedure<? super T> procedure)
     {

diff --git a/...e-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/UnmodifiableBag.java b/...e-collections/src/main/java/org/eclipse/collections/impl/bag/mutable/UnmodifiableBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Goldman Sachs and others.
+ * Copyright (c) 2020 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -47,13 +47,15 @@
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.api.map.primitive.MutableObjectLongMap;
 import org.eclipse.collections.api.multimap.bag.MutableBagMultimap;
 import org.eclipse.collections.api.ordered.OrderedIterable;
 import org.eclipse.collections.api.partition.bag.PartitionMutableBag;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.api.tuple.primitive.ObjectIntPair;
 import org.eclipse.collections.impl.collection.mutable.AbstractUnmodifiableMutableCollection;
+import org.eclipse.collections.impl.map.mutable.primitive.ObjectLongHashMap;
 
 /**
  * An unmodifiable view of a bag.
@@ -463,4 +465,24 @@ public MutableSet<T> selectUnique()
     {
         return this.getMutableBag().selectUnique();
     }
+
+    @Override
+    public <V> MutableObjectLongMap<V> sumByInt(Function<? super T, ? extends V> groupBy, IntFunction<? super T> function)
+    {
+        MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.intValueOf(each) * (long) occurrences));
+        return result;
+    }
+
+    @Override
+    public <V> MutableObjectLongMap<V> sumByLong(Function<? super T, ? extends V> groupBy, LongFunction<? super T> function)
+    {
+        MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.longValueOf(each) * (long) occurrences));
+        return result;
+    }
 }
diff --git a/.../src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/UnmodifiableSortedBag.java b/.../src/main/java/org/eclipse/collections/impl/bag/sorted/mutable/UnmodifiableSortedBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Goldman Sachs and others.
+ * Copyright (c) 2020 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -45,6 +45,7 @@
 import org.eclipse.collections.api.list.primitive.MutableIntList;
 import org.eclipse.collections.api.list.primitive.MutableLongList;
 import org.eclipse.collections.api.list.primitive.MutableShortList;
+import org.eclipse.collections.api.map.primitive.MutableObjectLongMap;
 import org.eclipse.collections.api.map.sorted.MutableSortedMap;
 import org.eclipse.collections.api.multimap.sortedbag.MutableSortedBagMultimap;
 import org.eclipse.collections.api.ordered.OrderedIterable;
@@ -55,6 +56,7 @@
 import org.eclipse.collections.api.tuple.primitive.ObjectIntPair;
 import org.eclipse.collections.impl.collection.mutable.AbstractUnmodifiableMutableCollection;
 import org.eclipse.collections.impl.collection.mutable.UnmodifiableCollectionSerializationProxy;
+import org.eclipse.collections.impl.map.mutable.primitive.ObjectLongHashMap;
 
 /**
  * An unmodifiable view of a SortedBag.
@@ -560,4 +562,22 @@ public MutableSortedSet<T> selectUnique()
     {
         return this.getSortedBag().selectUnique();
     }
+
+    @Override
+    public <V> MutableObjectLongMap<V> sumByInt(Function<? super T, ? extends V> groupBy, IntFunction<? super T> function)
+    {
+        MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(groupBy.valueOf(each), function.intValueOf(each) * (long) occurrences));
+        return result;
+    }
+
+    @Override
+    public <V> MutableObjectLongMap<V> sumByLong(Function<? super T, ? extends V> groupBy, LongFunction<? super T> function)
+    {
+        MutableObjectLongMap<V> result = ObjectLongHashMap.newMap();
+        this.forEachWithOccurrences((each, occurrences) -> result.addToValue(
+                groupBy.valueOf(each),
+                function.longValueOf(each) * (long) occurrences));
+        return result;
+    }
 }
diff --git a/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableTestCase.java b/unit-tests-java8/src/test/java/org/eclipse/collections/test/RichIterableTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Goldman Sachs and others.
+ * Copyright (c) 2020 Goldman Sachs and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -998,7 +998,7 @@ default void RichIterable_iterationOrder()
         assertEquals(expectedIterationOrder, sumOfLongIterationOrder);
 
         /*
-         * TODO: Fix sumByPrimitive methods for bags, to only iterate once per item, not per occurrence.
+         * TODO: Fix sumByDouble and sumByFloat methods for bags, to only iterate once per item, not per occurrence.
         MutableCollection<Integer> sumByDoubleIterationOrder1 = this.newMutableForFilter();
         MutableCollection<Integer> sumByDoubleIterationOrder2 = this.newMutableForFilter();
         this.getInstanceUnderTest().sumByDouble(
@@ -1026,6 +1026,7 @@ default void RichIterable_iterationOrder()
                 });
         assertEquals(expectedIterationOrder, sumByFloatIterationOrder1);
         assertEquals(expectedIterationOrder, sumByFloatIterationOrder2);
+        */
 
         MutableCollection<Integer> sumByIntIterationOrder1 = this.newMutableForFilter();
         MutableCollection<Integer> sumByIntIterationOrder2 = this.newMutableForFilter();
@@ -1054,7 +1055,6 @@ default void RichIterable_iterationOrder()
                 });
         assertEquals(expectedIterationOrder, sumByLongIterationOrder1);
         assertEquals(expectedIterationOrder, sumByLongIterationOrder2);
-        */
 
         MutableCollection<Integer> expectedInjectIntoIterationOrder = this.allowsDuplicates()
                 ? this.newMutableForFilter(4, 4, 4, 4, 3, 3, 3, 2, 2, 1)