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/01 15:26:36 UTC
[25/50] incubator-tinkerpop git commit: All the ReducingBarrierSteps
inherent their MemoryComputeKey from abstract ReducingBarrierStep. There key
is now step.getId(),
not longer ReducingBarrierStep.REDUCING as you can now have multiple reducers
in the sa
All the ReducingBarrierSteps inherent their MemoryComputeKey from abstract ReducingBarrierStep. There key is now step.getId(), not longer ReducingBarrierStep.REDUCING as you can now have multiple reducers in the same OLAP job. Updated ComputerResultStep accordingly. Next up will be such that ComputerResultStep does not do ANY introspection into TraversalVertexProgramStep -- it simply pulls ~traversers from GraphComputer.Memory. And thats all there is to it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c4b9e741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c4b9e741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c4b9e741
Branch: refs/heads/master
Commit: c4b9e741421d2af895bdf3c37166f952209d72d4
Parents: e6d9d6d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 25 11:37:44 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 25 11:37:44 2016 -0700
----------------------------------------------------------------------
.../computer/traversal/TraversalVertexProgram.java | 13 +++++++------
.../process/computer/traversal/TraverserExecutor.java | 2 +-
.../traversal/step/map/ComputerResultStep.java | 3 ---
.../process/traversal/step/map/CountGlobalStep.java | 6 ------
.../gremlin/process/traversal/step/map/FoldStep.java | 6 ------
.../process/traversal/step/map/GroupCountStep.java | 5 -----
.../gremlin/process/traversal/step/map/GroupStep.java | 5 -----
.../process/traversal/step/map/GroupStepV3d0.java | 5 -----
.../process/traversal/step/map/MaxGlobalStep.java | 5 -----
.../process/traversal/step/map/MeanGlobalStep.java | 7 +------
.../process/traversal/step/map/MinGlobalStep.java | 5 -----
.../process/traversal/step/map/SumGlobalStep.java | 5 -----
.../gremlin/process/traversal/step/map/TreeStep.java | 8 --------
.../traversal/step/util/ReducingBarrierStep.java | 10 +++++++---
14 files changed, 16 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 8d8e245..b21df22 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -30,6 +30,7 @@ import org.apache.tinkerpop.gremlin.process.computer.VertexComputeKey;
import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce.TraverserMapReduce;
import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -146,10 +147,7 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
public void setup(final Memory memory) {
memory.set(VOTE_TO_HALT, true);
for (final ReducingBarrierStep<?, ?> reducingBarrierStep : TraversalHelper.getStepsOfAssignableClassRecursively(ReducingBarrierStep.class, this.traversal.get())) {
- memory.set(ReducingBarrierStep.REDUCING, reducingBarrierStep.getSeedSupplier().get());
- }
- for (final RangeGlobalStep<?> reducingBarrierStep : TraversalHelper.getStepsOfAssignableClassRecursively(RangeGlobalStep.class, this.traversal.get())) {
- memory.set(reducingBarrierStep.getId(), new TraverserSet<>());
+ memory.set(reducingBarrierStep.getId(), reducingBarrierStep.getSeedSupplier().get());
}
}
@@ -204,19 +202,22 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
public boolean terminate(final Memory memory) {
final boolean voteToHalt = memory.<Boolean>get(VOTE_TO_HALT);
if (voteToHalt) {
+ final TraverserSet<?> localTraversers = new TraverserSet<>();
for (final GraphComputing<Object> graphComputing : TraversalHelper.getStepsOfAssignableClassRecursively(GraphComputing.class, this.traversal.get())) {
graphComputing.getMemoryComputeKey().ifPresent(memoryKey -> {
final String key = memoryKey.getKey();
if (memory.exists(key)) {
if (graphComputing instanceof RangeGlobalStep || graphComputing instanceof TailGlobalStep) {
- memory.set(TraverserMapReduce.TRAVERSERS, ((TraverserSet) graphComputing.generateFinalResult(memory.get(key))).iterator());
+ localTraversers.addAll(((TraverserSet) graphComputing.generateFinalResult(memory.get(key))));
+ } else if (graphComputing instanceof ReducingBarrierStep) {
+ localTraversers.add(this.traversal.get().getTraverserGenerator().generate(graphComputing.generateFinalResult(memory.get(key)), (Step) graphComputing, 1l));
} else {
memory.set(key, graphComputing.generateFinalResult(memory.get(key)));
}
-
}
});
}
+ memory.set(TraverserMapReduce.TRAVERSERS, localTraversers.iterator());
return true;
} else {
memory.set(VOTE_TO_HALT, true);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
index 95141f4..ccbbc20 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
@@ -109,7 +109,7 @@ public final class TraverserExecutor {
private static void drainStep(final Step<?, ?> step, final TraverserSet<?> aliveTraversers, final TraverserSet<?> haltedTraversers, final Memory memory) {
if (step instanceof ReducingBarrierStep) {
- memory.add(ReducingBarrierStep.REDUCING, step.next().get());
+ memory.add(step.getId(), step.next().get());
} else if (step instanceof RangeGlobalStep || step instanceof TailGlobalStep) {
((Bypassing) step).setBypass(true);
final TraverserSet<?> traverserSet = new TraverserSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index 37d14c1..52d7a78 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -26,7 +26,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierStep;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -89,8 +88,6 @@ public final class ComputerResultStep<S> extends AbstractStep<ComputerResult, S>
}
this.currentIterator = this.getTraversal().getTraverserGenerator().generateIterator(IteratorUtils.of((S) sideEffects), (Step) this, 1l);
}
- } else if (result.memory().exists(ReducingBarrierStep.REDUCING)) {
- this.currentIterator = this.getTraversal().getTraverserGenerator().generateIterator(IteratorUtils.of(result.memory().get(ReducingBarrierStep.REDUCING)), (Step) this, 1l);
} else {
this.currentIterator = result.memory().get(TraverserMapReduce.TRAVERSERS);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/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 98a27fc..a2c2ff9 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
@@ -49,17 +49,11 @@ public final class CountGlobalStep<S> extends ReducingBarrierStep<S, Long> {
return traverser.bulk();
}
-
@Override
public Set<TraverserRequirement> getRequirements() {
return REQUIREMENTS;
}
- @Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, CountBiOperator.INSTANCE, false, false));
- }
-
///////////
public static class CountBiOperator implements BinaryOperator<Long>, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
index 49b3961..04b7324 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
@@ -55,12 +55,6 @@ public final class FoldStep<S, E> extends ReducingBarrierStep<S, E> {
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, this.getBiOperator(), false, false));
- }
-
-
- @Override
public E projectTraverser(final Traverser.Admin<S> traverser) {
if (this.listFold) {
final List<S> list = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/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 433ad50..31912fe 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
@@ -73,11 +73,6 @@ public final class GroupCountStep<S, E> extends ReducingBarrierStep<S, Map<E, Lo
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, GroupCountBiOperator.instance(), false, false));
- }
-
- @Override
public void modulateBy(final Traversal.Admin<?, ?> keyTraversal) throws UnsupportedOperationException {
this.keyTraversal = this.integrateChild(keyTraversal);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/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 d86132b..3a13bd5 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,11 +92,6 @@ public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>>
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, GroupBiOperator.computerInstance(), false, false));
- }
-
- @Override
public Map<K, V> projectTraverser(final Traverser.Admin<S> traverser) {
return GroupStep.doInitialProjection(traverser, (Traversal.Admin) this.keyTraversal, this.onGraphComputer ? this.valueTraversal : null);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java
index ade485b..64473f3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java
@@ -60,11 +60,6 @@ public final class GroupStepV3d0<S, K, V, R> extends ReducingBarrierStep<S, Map<
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, GroupBiOperatorV3d0.INSTANCE, false, false));
- }
-
- @Override
public Map<K, R> projectTraverser(final Traverser.Admin<S> traverser) {
final K key = TraversalUtil.applyNullable(traverser, this.keyTraversal);
final BulkSet<V> values = new BulkSet<>();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
index 70788ed..2cb7f7c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
@@ -52,11 +52,6 @@ public final class MaxGlobalStep<S extends Number> extends ReducingBarrierStep<S
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, MaxGlobalBiOperator.INSTANCE, false, false));
- }
-
- @Override
public Set<TraverserRequirement> getRequirements() {
return Collections.singleton(TraverserRequirement.OBJECT);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
index 327e684..9c65437 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
@@ -61,11 +61,6 @@ public final class MeanGlobalStep<S extends Number, E extends Number> extends Re
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, MeanGlobalBiOperator.INSTANCE, false, false));
- }
-
- @Override
public Object generateFinalResult(final Object a) {
return ((MeanNumber) a).getFinal();
}
@@ -74,7 +69,7 @@ public final class MeanGlobalStep<S extends Number, E extends Number> extends Re
public static final class MeanGlobalBiOperator<S extends Number> implements BinaryOperator<S>, Serializable {
- private static MeanGlobalBiOperator INSTANCE = new MeanGlobalBiOperator();
+ private static final MeanGlobalBiOperator INSTANCE = new MeanGlobalBiOperator();
@Override
public S apply(final S mutatingSeed, final S number) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
index a90419e..1e9c68a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
@@ -56,11 +56,6 @@ public final class MinGlobalStep<S extends Number> extends ReducingBarrierStep<S
return Collections.singleton(TraverserRequirement.OBJECT);
}
- @Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, MinGlobalBiOperator.INSTANCE, false, false));
- }
-
/////
public static class MinGlobalBiOperator<S extends Number> implements BinaryOperator<S>, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
index 42bbad0..a138603 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
@@ -61,11 +61,6 @@ public final class SumGlobalStep<S extends Number> extends ReducingBarrierStep<S
return REQUIREMENTS;
}
- @Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, SumGlobalBiOperator.INSTANCE, false, false));
- }
-
/////
public static class SumGlobalBiOperator<S extends Number> implements BinaryOperator<S>, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java
index cf1e61a..21e9391 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-import org.apache.tinkerpop.gremlin.process.computer.MemoryComputeKey;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
@@ -35,7 +34,6 @@ import org.apache.tinkerpop.gremlin.util.function.TreeSupplier;
import java.io.Serializable;
import java.util.List;
-import java.util.Optional;
import java.util.Set;
import java.util.function.BinaryOperator;
import java.util.function.Supplier;
@@ -54,12 +52,6 @@ public final class TreeStep<S> extends ReducingBarrierStep<S, Tree> implements T
}
@Override
- public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(REDUCING, TreeBiOperator.instance(), false, false));
- }
-
-
- @Override
public List<Traversal.Admin<Object, Object>> getLocalChildren() {
return this.traversalRing.getTraversals();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c4b9e741/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
index e54fdca..d919630 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.util;
+import org.apache.tinkerpop.gremlin.process.computer.MemoryComputeKey;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
@@ -25,9 +26,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.GraphComputing;
import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.structure.Graph;
import java.util.Iterator;
+import java.util.Optional;
import java.util.function.BinaryOperator;
import java.util.function.Supplier;
@@ -37,8 +38,6 @@ import java.util.function.Supplier;
public abstract class ReducingBarrierStep<S, E> extends AbstractStep<S, E> implements Barrier, GraphComputing {
- public static final String REDUCING = Graph.Hidden.hide("reducing");
-
protected Supplier<E> seedSupplier;
protected BinaryOperator<E> reducingBiOperator;
protected boolean onGraphComputer = false;
@@ -117,4 +116,9 @@ public abstract class ReducingBarrierStep<S, E> extends AbstractStep<S, E> imple
public void onGraphComputer() {
this.onGraphComputer = true;
}
+
+ @Override
+ public Optional<MemoryComputeKey> getMemoryComputeKey() {
+ return Optional.of(MemoryComputeKey.of(this.getId(), this.getBiOperator(), false, true));
+ }
}