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 2015/05/22 21:32:48 UTC
incubator-tinkerpop git commit: dah. back to the rght
TraverserMapReduce using IteratorUtils.map(bulk(1)).
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master da73a924c -> 0373599ea
dah. back to the rght TraverserMapReduce using IteratorUtils.map(bulk(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/0373599e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0373599e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0373599e
Branch: refs/heads/master
Commit: 0373599eaaf80b1e32be76b3f9266dd852b7fdc3
Parents: da73a92
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri May 22 13:33:00 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri May 22 13:33:00 2015 -0600
----------------------------------------------------------------------
.../sideEffect/mapreduce/TraverserMapReduce.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0373599e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java
index 8744f05..14bb472 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/sideEffect/mapreduce/TraverserMapReduce.java
@@ -52,7 +52,7 @@ public final class TraverserMapReduce extends StaticMapReduce<Comparable, Traver
private Optional<CollectingBarrierStep<?>> collectingBarrierStep = Optional.empty();
private Optional<RangeGlobalStep<?>> rangeGlobalStep = Optional.empty();
private Optional<TailGlobalStep<?>> tailGlobalStep = Optional.empty();
- private Optional<DedupGlobalStep<?>> dedupGlobalStep = Optional.empty();
+ private boolean dedupGlobal = false;
private TraverserMapReduce() {
}
@@ -78,13 +78,13 @@ public final class TraverserMapReduce extends StaticMapReduce<Comparable, Traver
if (traversalEndStep instanceof TailGlobalStep)
this.tailGlobalStep = Optional.of(((TailGlobalStep) traversalEndStep).clone());
if (traversalEndStep instanceof DedupGlobalStep)
- this.dedupGlobalStep = Optional.of(((DedupGlobalStep) traversalEndStep).clone());
+ this.dedupGlobal = true;
}
@Override
public boolean doStage(final Stage stage) {
- return stage.equals(Stage.MAP) || this.collectingBarrierStep.isPresent() || this.rangeGlobalStep.isPresent() || this.tailGlobalStep.isPresent() || this.dedupGlobalStep.isPresent();
+ return stage.equals(Stage.MAP) || this.collectingBarrierStep.isPresent() || this.rangeGlobalStep.isPresent() || this.tailGlobalStep.isPresent() || this.dedupGlobal;
}
@Override
@@ -133,11 +133,11 @@ public final class TraverserMapReduce extends StaticMapReduce<Comparable, Traver
tailGlobalStep.setBypass(false);
tailGlobalStep.addStarts(IteratorUtils.map(keyValues, keyValue -> (Traverser) keyValue.getValue()));
return (Iterator) tailGlobalStep;
- } else if (this.dedupGlobalStep.isPresent()) {
- final DedupGlobalStep<?> dedupGlobalStep = this.dedupGlobalStep.get();
- dedupGlobalStep.setBypass(false);
- dedupGlobalStep.addStarts(IteratorUtils.map(keyValues, keyValue -> (Traverser) keyValue.getValue()));
- return (Iterator) dedupGlobalStep;
+ } else if (this.dedupGlobal) {
+ return IteratorUtils.map(keyValues, keyValue -> {
+ keyValue.getValue().asAdmin().setBulk(1l);
+ return keyValue.getValue();
+ });
} else {
return IteratorUtils.map(keyValues, KeyValue::getValue);
}