You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/09 17:22:57 UTC
incubator-tinkerpop git commit: Added Operator.sumLong for use by
CountGlobalStep. I couldn't get SingletonMap to work for the GroupXXXSteps.
Instead, just made the HashMap they generate have an initial capacity of 1.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1180 [created] 0d79c2ff7
Added Operator.sumLong for use by CountGlobalStep. I couldn't get SingletonMap to work for the GroupXXXSteps. Instead, just made the HashMap they generate have an initial capacity of 1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0d79c2ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0d79c2ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0d79c2ff
Branch: refs/heads/TINKERPOP-1180
Commit: 0d79c2ff7cb89a0fd81f2a2aa555d6d024a6de70
Parents: c06096b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Mar 9 09:22:44 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Mar 9 09:22:44 2016 -0700
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/process/traversal/Operator.java | 6 ++++++
.../gremlin/process/traversal/step/map/CountGlobalStep.java | 2 +-
.../gremlin/process/traversal/step/map/GroupCountStep.java | 2 +-
.../gremlin/process/traversal/step/map/GroupStep.java | 2 +-
.../traversal/step/sideEffect/GroupCountSideEffectStep.java | 2 +-
.../process/traversal/step/sideEffect/GroupSideEffectStep.java | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d79c2ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
index 13406ad..2cf5d82 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
@@ -76,5 +76,11 @@ public enum Operator implements BinaryOperator<Object> {
((Collection) a).addAll((Collection) b);
return a;
}
+ },
+ //////
+ sumLong {
+ public Object apply(final Object a, final Object b) {
+ return (long) a + (long) b;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d79c2ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountGlobalStep.java
index ec475fa..9454243 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountGlobalStep.java
@@ -39,7 +39,7 @@ public final class CountGlobalStep<S> extends ReducingBarrierStep<S, Long> {
public CountGlobalStep(final Traversal.Admin traversal) {
super(traversal);
this.setSeedSupplier(new ConstantSupplier<>(0L));
- this.setReducingBiOperator((BinaryOperator) Operator.sum);
+ this.setReducingBiOperator((BinaryOperator) Operator.sumLong);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d79c2ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
index 2d0b9e1..a0c02fd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
@@ -53,7 +53,7 @@ public final class GroupCountStep<S, E> extends ReducingBarrierStep<S, Map<E, Lo
@Override
public Map<E, Long> projectTraverser(final Traverser.Admin<S> traverser) {
- final Map<E, Long> map = new HashMap<>();
+ final Map<E, Long> map = new HashMap<>(1);
map.put(TraversalUtil.applyNullable(traverser, this.keyTraversal), traverser.bulk());
return map;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d79c2ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
index 164395d..c2000c5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
@@ -92,7 +92,7 @@ public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>>
@Override
public Map<K, V> projectTraverser(final Traverser.Admin<S> traverser) {
- final Map<K, V> map = new HashMap<>();
+ final Map<K, V> map = new HashMap<>(1);
final K key = TraversalUtil.applyNullable(traverser, this.keyTraversal);
if (this.onGraphComputer) {
final TraverserSet traverserSet = new TraverserSet();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d79c2ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
index a82f7e3..e99f727 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
@@ -51,7 +51,7 @@ public final class GroupCountSideEffectStep<S, E> extends SideEffectStep<S> impl
@Override
protected void sideEffect(final Traverser.Admin<S> traverser) {
- final Map<E, Long> map = new HashMap<>();
+ final Map<E, Long> map = new HashMap<>(1);
map.put(TraversalUtil.applyNullable(traverser.asAdmin(), this.keyTraversal), traverser.bulk());
this.getTraversal().getSideEffects().add(this.sideEffectKey, map);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d79c2ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
index 0d2be9c..7050668 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
@@ -77,7 +77,7 @@ public final class GroupSideEffectStep<S, K, V> extends SideEffectStep<S> implem
@Override
protected void sideEffect(final Traverser.Admin<S> traverser) {
- final Map<K, Object> map = new HashMap<>();
+ final Map<K, Object> map = new HashMap<>(1);
final K key = TraversalUtil.applyNullable(traverser, keyTraversal);
if (this.onGraphComputer) {
final TraverserSet traverserSet = new TraverserSet();