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/15 19:35:40 UTC
incubator-tinkerpop git commit: bug. sorry for the bad build.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 33d814558 -> e7efccb75
bug. sorry for the bad build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e7efccb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e7efccb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e7efccb7
Branch: refs/heads/master
Commit: e7efccb750bf98fa845c1779d25dddeb47bf97d7
Parents: 33d8145
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri May 15 11:35:27 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri May 15 11:35:27 2015 -0600
----------------------------------------------------------------------
.../traversal/step/filter/WhereStep.java | 24 +++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e7efccb7/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 eb9b83a..f20518b 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
@@ -69,17 +69,19 @@ public final class WhereStep<S> extends FilterStep<S> implements TraversalParent
final Object startObject;
final Object endObject;
- if (!this.hasStartAndEndKeys()) {
+ if (this.noStartAndEndKeys()) {
startObject = traverser.get();
endObject = null;
- } else if (Scope.local == this.scope) {
- final Map<String, Object> map = (Map<String, Object>) traverser.get();
- startObject = null == this.startKey ? traverser.get() : map.get(this.startKey);
- endObject = null == this.endKey ? null : map.get(this.endKey);
} else {
- final Path path = traverser.path();
- startObject = null == this.startKey ? traverser.get() : path.hasLabel(this.startKey) ? path.get(this.startKey) : traverser.sideEffects(this.startKey);
- endObject = null == this.endKey ? null : path.hasLabel(this.endKey) ? path.get(this.endKey) : traverser.sideEffects(this.endKey);
+ if (Scope.local == this.scope) {
+ final Map<String, Object> map = (Map<String, Object>) traverser.get();
+ startObject = null == this.startKey ? traverser.get() : map.get(this.startKey);
+ endObject = null == this.endKey ? null : map.get(this.endKey);
+ } else {
+ final Path path = traverser.path();
+ startObject = null == this.startKey ? traverser.get() : path.hasLabel(this.startKey) ? path.get(this.startKey) : traverser.sideEffects(this.startKey);
+ endObject = null == this.endKey ? null : path.hasLabel(this.endKey) ? path.get(this.endKey) : traverser.sideEffects(this.endKey);
+ }
}
return this.predicate.getBiPredicate().test(startObject, endObject);
@@ -105,7 +107,7 @@ public final class WhereStep<S> extends FilterStep<S> implements TraversalParent
@Override
public Set<TraverserRequirement> getRequirements() {
- return this.getSelfAndChildRequirements(Scope.local == this.scope || !this.hasStartAndEndKeys() ?
+ return this.getSelfAndChildRequirements(Scope.local == this.scope || this.noStartAndEndKeys() ?
TraverserRequirement.OBJECT : TraverserRequirement.OBJECT, TraverserRequirement.PATH, TraverserRequirement.SIDE_EFFECTS);
}
@@ -118,7 +120,7 @@ public final class WhereStep<S> extends FilterStep<S> implements TraversalParent
return this.scope;
}
- private boolean hasStartAndEndKeys() {
- return null != this.endKey && null != this.startKey;
+ private boolean noStartAndEndKeys() {
+ return null == this.endKey && null == this.startKey;
}
}