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/18 22:15:40 UTC

incubator-tinkerpop git commit: fixed a bug in TraversalBiPredicate.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master a31fa6fea -> 9413d6647


fixed a bug in TraversalBiPredicate.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9413d664
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9413d664
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9413d664

Branch: refs/heads/master
Commit: 9413d664794c4899cec95ce58e84085cf1b5b122
Parents: a31fa6f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 18 14:15:06 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 18 14:15:53 2015 -0600

----------------------------------------------------------------------
 .../gremlin/process/traversal/step/filter/WhereStep.java         | 3 +--
 .../org/apache/tinkerpop/gremlin/structure/util/TraversalP.java  | 2 +-
 .../strategy/decoration/PartitionStrategyTraverseTest.java       | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9413d664/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 f9e7573..19e24a3 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
@@ -86,8 +86,7 @@ public final class WhereStep<S> extends FilterStep<S> implements TraversalParent
             }
         }
 
-        this.predicate.setValue(endObject);
-        return this.predicate.test(startObject);
+        return this.predicate.getBiPredicate().test(startObject, endObject);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9413d664/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/TraversalP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/TraversalP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/TraversalP.java
index d26e0b1..1bbaa34 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/TraversalP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/TraversalP.java
@@ -84,7 +84,7 @@ public class TraversalP<S, E> extends P<E> {
             else
                 result = null == end ?
                         TraversalUtil.test(start, traversalP.traversal) :
-                        TraversalUtil.test(start, traversalP.traversal, traversalP.value);
+                        TraversalUtil.test(start, traversalP.traversal, end);
             return traversalP.negate ? !result : result;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9413d664/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTraverseTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTraverseTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTraverseTest.java
index a608728..9e99603 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTraverseTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTraverseTest.java
@@ -175,8 +175,8 @@ public class PartitionStrategyTraverseTest {
             assertEquals(1, s.getHasContainers().size());
             final HasContainer hasContainer = (HasContainer) s.getHasContainers().get(0);
             assertEquals("p", hasContainer.getKey());
-            assertEquals(keySet, hasContainer.getPredicate().getValue());
-            assertEquals(Contains.within, hasContainer.getPredicate().getBiPredicate());
+            assertEquals(keySet, hasContainer.getValue());
+            assertEquals(Contains.within, hasContainer.getBiPredicate());
         });
     }
 }