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/11/03 17:17:43 UTC
tinkerpop git commit: removed null initialization of fields and
removed a stream() usage.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1428 b64443540 -> 525d8ea38
removed null initialization of fields and removed a stream() usage.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/525d8ea3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/525d8ea3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/525d8ea3
Branch: refs/heads/TINKERPOP-1428
Commit: 525d8ea38863f912eb3f2dce515cf7a8d4b7003c
Parents: b644435
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Nov 3 11:17:38 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Nov 3 11:17:38 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/GroupStep.java | 10 ++++++----
.../traversal/step/sideEffect/GroupSideEffectStep.java | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/525d8ea3/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 737c5f9..174c1ad 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
@@ -59,9 +59,9 @@ import java.util.function.BinaryOperator;
public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>> implements ByModulating, TraversalParent {
private char state = 'k';
- private Traversal.Admin<S, K> keyTraversal = null;
- private Traversal.Admin<S, ?> preTraversal = null;
- private Traversal.Admin<S, V> valueTraversal = null;
+ private Traversal.Admin<S, K> keyTraversal;
+ private Traversal.Admin<S, ?> preTraversal;
+ private Traversal.Admin<S, V> valueTraversal;
public GroupStep(final Traversal.Admin traversal) {
super(traversal);
@@ -95,7 +95,9 @@ public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>>
final TraverserSet traverserSet = new TraverserSet<>();
this.preTraversal.reset();
this.preTraversal.addStart(traverser);
- this.preTraversal.getEndStep().forEachRemaining(traverserSet::add);
+ while(this.preTraversal.hasNext()) {
+ traverserSet.add(this.preTraversal.nextTraverser());
+ }
map.put(TraversalUtil.applyNullable(traverser, this.keyTraversal), (V) traverserSet);
}
return map;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/525d8ea3/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 f2699e0..cf69c4c 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
@@ -43,9 +43,9 @@ import java.util.Set;
public final class GroupSideEffectStep<S, K, V> extends SideEffectStep<S> implements SideEffectCapable<Map<K, ?>, Map<K, V>>, TraversalParent, ByModulating {
private char state = 'k';
- private Traversal.Admin<S, K> keyTraversal = null;
- private Traversal.Admin<S, ?> preTraversal = null;
- private Traversal.Admin<S, V> valueTraversal = null;
+ private Traversal.Admin<S, K> keyTraversal;
+ private Traversal.Admin<S, ?> preTraversal;
+ private Traversal.Admin<S, V> valueTraversal;
///
private String sideEffectKey;
@@ -81,7 +81,9 @@ public final class GroupSideEffectStep<S, K, V> extends SideEffectStep<S> implem
final TraverserSet traverserSet = new TraverserSet<>();
this.preTraversal.reset();
this.preTraversal.addStart(traverser.split());
- this.preTraversal.getEndStep().forEachRemaining(traverserSet::add);
+ while(this.preTraversal.hasNext()) {
+ traverserSet.add(this.preTraversal.nextTraverser());
+ }
map.put(TraversalUtil.applyNullable(traverser, this.keyTraversal), (V) traverserSet);
}
this.getTraversal().getSideEffects().add(this.sideEffectKey, map);