Repository: tinkerpop Updated Branches: refs/heads/tp32 5c41a827f -> 4f7b8595b
Revert "Fixed folding of multiple `hasId()` into `GraphStep`." This reverts commit 5c41a827f261889012cb368a59a07db8d18f6961, which was not supposed to go directly into `tp32/`. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4f7b8595 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f7b8595 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4f7b8595 Branch: refs/heads/tp32 Commit: 4f7b8595bbcd691649e63e49deb9ed0adcaa81e7 Parents: 5c41a82 Author: Daniel Kuppitz <[email protected]> Authored: Sun May 28 22:38:38 2017 +0200 Committer: Daniel Kuppitz <[email protected]> Committed: Sun May 28 22:38:38 2017 +0200 ---------------------------------------------------------------------- .../process/traversal/step/map/GraphStep.java | 3 +- .../traversal/step/filter/GroovyHasTest.groovy | 10 ------- .../process/traversal/step/filter/HasTest.java | 31 -------------------- 3 files changed, 1 insertion(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f7b8595/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java index 7ab7d13..03a0bc4 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java @@ -181,8 +181,7 @@ public class GraphStep<S, E extends Element> extends AbstractStep<S, E> implemen * @return true if the {@link HasContainer} updated ids and thus, was processed. */ public static boolean processHasContainerIds(final GraphStep<?, ?> graphStep, final HasContainer hasContainer) { - if (hasContainer.getKey().equals(T.id.getAccessor()) && graphStep.ids.length == 0 && - (hasContainer.getBiPredicate() == Compare.eq || hasContainer.getBiPredicate() == Contains.within)) { + if (hasContainer.getKey().equals(T.id.getAccessor()) && (hasContainer.getBiPredicate() == Compare.eq || hasContainer.getBiPredicate() == Contains.within)) { graphStep.addIds(hasContainer.getValue()); return true; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f7b8595/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy index abaabf9..0a7729c 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy @@ -159,15 +159,5 @@ public abstract class GroovyHasTest { public Traversal<Vertex, String> get_g_V_hasNotXageX_name() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasNot('age').name"); } - - @Override - public Traversal<Vertex, Vertex> get_g_V_hasIdX1X_hasIdX2X(final Object v1Id, final Object v2Id) { - new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasId(v1Id).hasId(v2Id)", "v1Id", v1Id, "v2Id", v2Id) - } - - @Override - public Traversal<Vertex, Vertex> get_g_V_hasLabelXpersonX_hasLabelXsoftwareX() { - new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').hasId('software')") - } } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f7b8595/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java index 01f20a7..d132eb1 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java @@ -104,10 +104,6 @@ public abstract class HasTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, String> get_g_V_hasNotXageX_name(); - public abstract Traversal<Vertex, Vertex> get_g_V_hasIdX1X_hasIdX2X(final Object v1Id, final Object v2Id); - - public abstract Traversal<Vertex, Vertex> get_g_V_hasLabelXpersonX_hasLabelXsoftwareX(); - @Test @LoadGraphWith(MODERN) public void g_V_outXcreatedX_hasXname__mapXlengthX_isXgtX3XXX_name() { @@ -431,23 +427,6 @@ public abstract class HasTest extends AbstractGremlinProcessTest { checkResults(Arrays.asList("lop", "ripple"), traversal); } - @Test - @LoadGraphWith(MODERN) - public void g_V_hasIdX1X_hasIdX2X() { - final Traversal<Vertex, Vertex> traversal = get_g_V_hasIdX1X_hasIdX2X( - convertToVertexId("marko"), convertToVertexId("vadas") - ); - printTraversalForm(traversal); - assertFalse(traversal.hasNext()); - } - - @Test - @LoadGraphWith(MODERN) - public void g_V_hasLabelXpersonX_hasLabelXsoftwareX() { - final Traversal<Vertex, Vertex> traversal = get_g_V_hasLabelXpersonX_hasLabelXsoftwareX(); - printTraversalForm(traversal); - assertFalse(traversal.hasNext()); - } public static class Traversals extends HasTest { @Override @@ -579,15 +558,5 @@ public abstract class HasTest extends AbstractGremlinProcessTest { public Traversal<Vertex, String> get_g_V_hasNotXageX_name() { return g.V().hasNot("age").values("name"); } - - @Override - public Traversal<Vertex, Vertex> get_g_V_hasIdX1X_hasIdX2X(final Object v1Id, final Object v2Id) { - return g.V().hasId(v1Id).hasId(v2Id); - } - - @Override - public Traversal<Vertex, Vertex> get_g_V_hasLabelXpersonX_hasLabelXsoftwareX() { - return g.V().hasLabel("person").hasId("software"); - } } }
