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/06/11 00:13:18 UTC
incubator-tinkerpop git commit: WhereStep doesn't need
Requirement.OBJECT if its a Scope.global.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d82f474cd -> 2c9de60b6
WhereStep doesn't need Requirement.OBJECT if its a Scope.global.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2c9de60b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2c9de60b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2c9de60b
Branch: refs/heads/master
Commit: 2c9de60b6e08aded19e2ac26632bf86e87ce13b4
Parents: d82f474
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jun 10 16:13:13 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jun 10 16:13:13 2015 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java | 2 +-
.../apache/tinkerpop/gremlin/process/traversal/util/ScopeP.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c9de60b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
index 116448c..cfe2d3a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
@@ -131,7 +131,7 @@ public final class WhereStep<S> extends FilterStep<S> implements TraversalParent
public Set<TraverserRequirement> getRequirements() {
return this.getSelfAndChildRequirements(Scope.local == this.scope ?
new TraverserRequirement[]{TraverserRequirement.OBJECT, TraverserRequirement.SIDE_EFFECTS} :
- new TraverserRequirement[]{TraverserRequirement.OBJECT, TraverserRequirement.PATH, TraverserRequirement.SIDE_EFFECTS});
+ new TraverserRequirement[]{TraverserRequirement.PATH, TraverserRequirement.SIDE_EFFECTS});
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c9de60b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ScopeP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ScopeP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ScopeP.java
index 33d03b3..4e95639 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ScopeP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ScopeP.java
@@ -39,7 +39,7 @@ public final class ScopeP<V> extends P<V> {
public ScopeP(final P<?> predicate) {
super((BiPredicate) predicate.getBiPredicate(), (V) EMPTY_OBJECT);
- this.key = predicate.getValue() instanceof Collection ? ((Collection<String>) predicate.getValue()).iterator().next() : (String) predicate.getValue(); // HACK: for within("x") as it sees that as an array
+ this.key = predicate.getValue() instanceof Collection ? ((Collection<String>) predicate.getValue()).iterator().next() : (String) predicate.getValue(); // HACK: for within("x") -- it sees that as an array
}
public void bind(final Scoping scopingStep, final Traverser.Admin<?> traverser) {