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/08/01 19:44:20 UTC
[1/2] incubator-tinkerpop git commit: TINKERPOP3-782 #comment Fixed
up TraversalXXXStep with respect to requirements of local children.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master eaaba8c6d -> 227333563
TINKERPOP3-782 #comment Fixed up TraversalXXXStep with respect to requirements of local children.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2879463a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2879463a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2879463a
Branch: refs/heads/master
Commit: 2879463aaa9efb67c8dcf57c44126b9cd83b239e
Parents: 5311329
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat Aug 1 11:43:51 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat Aug 1 11:43:51 2015 -0600
----------------------------------------------------------------------
.../process/traversal/step/filter/TraversalFilterStep.java | 7 +++++++
.../process/traversal/step/map/TraversalFlatMapStep.java | 2 +-
.../gremlin/process/traversal/step/map/TraversalMapStep.java | 2 +-
.../traversal/step/sideEffect/TraversalSideEffectStep.java | 7 +++++++
4 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2879463a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TraversalFilterStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TraversalFilterStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TraversalFilterStep.java
index b3036cd..af7e9b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TraversalFilterStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TraversalFilterStep.java
@@ -24,11 +24,13 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.Collections;
import java.util.List;
+import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -68,4 +70,9 @@ public final class TraversalFilterStep<S> extends FilterStep<S> implements Trave
public int hashCode() {
return super.hashCode() ^ this.filterTraversal.hashCode();
}
+
+ @Override
+ public Set<TraverserRequirement> getRequirements() {
+ return this.getSelfAndChildRequirements();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2879463a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalFlatMapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalFlatMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalFlatMapStep.java
index 9ac8727..c8d8e69 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalFlatMapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalFlatMapStep.java
@@ -74,6 +74,6 @@ public final class TraversalFlatMapStep<S, E> extends FlatMapStep<S, E> implemen
@Override
public Set<TraverserRequirement> getRequirements() {
- return this.getSelfAndChildRequirements(TraverserRequirement.OBJECT);
+ return this.getSelfAndChildRequirements();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2879463a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMapStep.java
index d3cda3b..de459f4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMapStep.java
@@ -75,6 +75,6 @@ public final class TraversalMapStep<S, E> extends MapStep<S, E> implements Trave
@Override
public Set<TraverserRequirement> getRequirements() {
- return this.getSelfAndChildRequirements(TraverserRequirement.OBJECT);
+ return this.getSelfAndChildRequirements();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2879463a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TraversalSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TraversalSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TraversalSideEffectStep.java
index 9183456..e220991 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TraversalSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TraversalSideEffectStep.java
@@ -24,12 +24,14 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -70,4 +72,9 @@ public final class TraversalSideEffectStep<S> extends SideEffectStep<S> implemen
public int hashCode() {
return super.hashCode() ^ this.sideEffectTraversal.hashCode();
}
+
+ @Override
+ public Set<TraverserRequirement> getRequirements() {
+ return this.getSelfAndChildRequirements();
+ }
}
[2/2] incubator-tinkerpop git commit: Merge branch 'tp30'
Posted by ok...@apache.org.
Merge branch 'tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/22733356
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/22733356
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/22733356
Branch: refs/heads/master
Commit: 2273335636fccf79134de75bc1436e76b802e8f7
Parents: eaaba8c 2879463
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat Aug 1 11:44:06 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat Aug 1 11:44:06 2015 -0600
----------------------------------------------------------------------
.../process/traversal/step/filter/TraversalFilterStep.java | 7 +++++++
.../process/traversal/step/map/TraversalFlatMapStep.java | 2 +-
.../gremlin/process/traversal/step/map/TraversalMapStep.java | 2 +-
.../traversal/step/sideEffect/TraversalSideEffectStep.java | 7 +++++++
4 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------