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/02/11 20:45:18 UTC
[12/15] incubator-tinkerpop git commit: merged master/ and fixed
conflicts.
merged master/ and fixed conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f80e5c15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f80e5c15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f80e5c15
Branch: refs/heads/master
Commit: f80e5c158095d45ca9b28d5536bdc5b2186def1e
Parents: 577ffcd 26aedc7
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Feb 9 14:11:35 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Feb 9 14:11:35 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 ++
docs/src/dev/developer/release.asciidoc | 67 ++++++------
.../process/computer/GiraphComputation.java | 3 +-
.../computer/traversal/TraverserExecutor.java | 101 +++++++++++--------
.../traversal/step/map/CountGlobalStep.java | 21 +++-
.../traversal/step/map/GroupCountStep.java | 16 +--
.../process/traversal/step/map/GroupStep.java | 9 +-
.../traversal/step/map/GroupStepV3d0.java | 9 +-
.../traversal/step/map/MaxGlobalStep.java | 23 +++--
.../traversal/step/map/MinGlobalStep.java | 22 ++--
.../traversal/step/map/SumGlobalStep.java | 23 +++--
.../process/traversal/step/map/TreeStep.java | 10 --
.../step/util/ReducingBarrierStep.java | 50 ++++-----
.../gremlin/util/iterator/DoubleIterator.java | 12 ++-
.../gremlin/util/iterator/IteratorUtils.java | 39 ++++++-
.../gremlin/util/iterator/MultiIterator.java | 2 +-
.../gremlin/util/iterator/SingleIterator.java | 9 +-
pom.xml | 12 ++-
.../process/computer/TinkerMessenger.java | 13 +--
19 files changed, 275 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f80e5c15/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
index 32a16a7,069d57e..18de6ec
--- 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
@@@ -27,6 -27,8 +27,7 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
-import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent;
++import org.apache.tinkerpop.gremlin.process.traversal.step.GraphComputing;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
@@@ -55,7 -57,7 +56,7 @@@ import java.util.function.Supplier
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
- public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>> implements MapReducer, TraversalParent {
-public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>> implements MapReducer, EngineDependent, TraversalParent {
++public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>> implements MapReducer, GraphComputing, TraversalParent {
private char state = 'k';
@@@ -71,6 -74,11 +73,11 @@@
}
@Override
- public void onEngine(final TraversalEngine traversalEngine) {
- this.byPass = traversalEngine.isComputer();
++ public void onGraphComputer() {
++ this.byPass = true;
+ }
+
+ @Override
public List<Traversal.Admin<?, ?>> getLocalChildren() {
final List<Traversal.Admin<?, ?>> children = new ArrayList<>(4);
if (null != this.keyTraversal)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f80e5c15/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStepV3d0.java
index 04acf62,a988d4e..5db42f7
--- 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
@@@ -25,7 -25,9 +25,8 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent;
++import org.apache.tinkerpop.gremlin.process.traversal.step.GraphComputing;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
@@@ -55,7 -57,7 +56,7 @@@ import java.util.function.Supplier
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@Deprecated
- public final class GroupStepV3d0<S, K, V, R> extends ReducingBarrierStep<S, Map<K, R>> implements MapReducer, TraversalParent {
-public final class GroupStepV3d0<S, K, V, R> extends ReducingBarrierStep<S, Map<K, R>> implements MapReducer, EngineDependent, TraversalParent {
++public final class GroupStepV3d0<S, K, V, R> extends ReducingBarrierStep<S, Map<K, R>> implements MapReducer, GraphComputing, TraversalParent {
private char state = 'k';
@@@ -70,6 -73,11 +72,11 @@@
}
@Override
- public void onEngine(final TraversalEngine traversalEngine) {
- this.byPass = traversalEngine.isComputer();
++ public void onGraphComputer() {
++ this.byPass = true;
+ }
+
+ @Override
public <A, B> List<Traversal.Admin<A, B>> getLocalChildren() {
final List<Traversal.Admin<A, B>> children = new ArrayList<>(3);
if (null != this.keyTraversal)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f80e5c15/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ReducingBarrierStep.java
index f875ac0,fb7ecb7..ea94499
--- 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
@@@ -43,8 -42,8 +42,10 @@@ import java.util.function.Supplier
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
- public abstract class ReducingBarrierStep<S, E> extends AbstractStep<S, E> implements MapReducer, GraphComputing, Barrier {
++
+ public abstract class ReducingBarrierStep<S, E> extends AbstractStep<S, E> implements MapReducer, Barrier {
+
+
public static final String REDUCING = Graph.Hidden.hide("reducing");
protected Supplier<E> seedSupplier;
@@@ -66,9 -64,19 +66,18 @@@
this.reducingBiFunction = reducingBiFunction;
}
- @Override
+ public void reset() {
+ super.reset();
+ this.done = false;
+ this.seed = null;
+ }
+
@Override
- public void onGraphComputer() {
- this.byPass = true;
+ public void addStarts(final Iterator<Traverser<S>> starts) {
+ if (starts.hasNext()) {
+ this.done = false;
+ super.addStarts(starts);
+ }
}
@Override