You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/05/30 11:27:19 UTC
[1/3] tinkerpop git commit: Fixed folding of multiple `hasId()` into
`GraphStep`.
Repository: tinkerpop
Updated Branches:
refs/heads/master 16d35f19e -> 5ceba08ce
Fixed folding of multiple `hasId()` into `GraphStep`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5c41a827
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c41a827
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c41a827
Branch: refs/heads/master
Commit: 5c41a827f261889012cb368a59a07db8d18f6961
Parents: 2bc5431
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sun May 28 15:41:34 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sun May 28 15:41:34 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, 43 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c41a827/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 03a0bc4..7ab7d13 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,7 +181,8 @@ 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()) && (hasContainer.getBiPredicate() == Compare.eq || hasContainer.getBiPredicate() == Contains.within)) {
+ if (hasContainer.getKey().equals(T.id.getAccessor()) && graphStep.ids.length == 0 &&
+ (hasContainer.getBiPredicate() == Compare.eq || hasContainer.getBiPredicate() == Contains.within)) {
graphStep.addIds(hasContainer.getValue());
return true;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c41a827/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 0a7729c..abaabf9 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,5 +159,15 @@ 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/5c41a827/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 d132eb1..01f20a7 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,6 +104,10 @@ 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() {
@@ -427,6 +431,23 @@ 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
@@ -558,5 +579,15 @@ 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");
+ }
}
}
[3/3] tinkerpop git commit: Merge branch 'tp32'
Posted by dk...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ceba08c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ceba08c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ceba08c
Branch: refs/heads/master
Commit: 5ceba08ce98e5d6ba98edeb3ef0afc14f80eb07a
Parents: 16d35f1 4f7b859
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 30 13:26:59 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 30 13:26:59 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] tinkerpop git commit: Revert "Fixed folding of multiple
`hasId()` into `GraphStep`."
Posted by dk...@apache.org.
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/master
Commit: 4f7b8595bbcd691649e63e49deb9ed0adcaa81e7
Parents: 5c41a82
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sun May 28 22:38:38 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
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");
- }
}
}