tinkerpop git commit: TINKERPOP-1874 Added tests around P
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1874 [created] 261b93b64 TINKERPOP-1874 Added tests around P Validates various forms of serialization with focus on GraphSON and GLVs (where there were problems). Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/261b93b6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/261b93b6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/261b93b6 Branch: refs/heads/TINKERPOP-1874 Commit: 261b93b646c503068328d291224b430e4618410b Parents: 231bbb6 Author: Stephen MalletteAuthored: Thu Jan 18 17:07:21 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 17:07:21 2018 -0500 -- ...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 29 ++ .../traversal/step/filter/GroovyHasTest.groovy | 20 +++ gremlin-test/features/filter/Has.feature| 44 ++ .../process/traversal/step/filter/HasTest.java | 60 4 files changed, 153 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/261b93b6/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java -- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java index 28107d0..5b009e1 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java @@ -19,6 +19,7 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson; import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser; +import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper; import org.junit.Test; @@ -31,6 +32,7 @@ import java.time.Instant; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -254,6 +256,33 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest extends AbstractGraphSONT assertEquals(o, serializeDeserialize(mapper, o, Traverser.class)); } +@Test +public void shouldHandleVariantsOfP() throws Exception { +final List variantsOfP = Arrays.asList( +P.between(1,2), +P.eq(1), +P.gt(1), +P.gte(1), +P.inside(1,2), +P.lt(1), +P.lte(1), +P.neq(1), +P.not(P.eq(1)), +P.outside(1,2), +P.within(1), +P.within(1,2,3,4), +P.within(Arrays.asList(1,2,3,4)), +P.without(1), +P.without(1,2,3,4), +P.without(Arrays.asList(1,2,3,4)), +P.eq(1).and(P.eq(2)), +P.eq(1).or(P.eq(2))); + +for (P p : variantsOfP) { +assertEquals(p, serializeDeserialize(mapper, p, P.class)); +} +} + // Class needs to be defined as statics as it's a nested class. public static class FunObject { private String val; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/261b93b6/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 c70a50d..19bdf42 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 @@ -191,5 +191,25 @@ public abstract class GroovyHasTest { public Traversal get_g_V_notXhasIdXwithinXemptyXXX_count() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.not(hasId(within([]))).count") } + +@Override +public Traversal get_g_V_hasXage_withinX27X_count() { +
tinkerpop git commit: Improved the method for dealing with the python build problem with radish
Repository: tinkerpop Updated Branches: refs/heads/tp32 b54c9740a -> 231bbb659 Improved the method for dealing with the python build problem with radish The issue is definitely related to the colorful version bump with radish (and PyHamcrest, maybe others??) depend on. Rather than exclude the dependencies and manually import stuff which was messy, David Brown suggested the fix that just involved an environment variable. He is currently looking into opening an issue with colorful for the problem. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/231bbb65 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/231bbb65 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/231bbb65 Branch: refs/heads/tp32 Commit: 231bbb6596646db3a6238b1014f9d43b25fc7cfd Parents: b54c974 Author: Stephen MalletteAuthored: Thu Jan 18 14:02:05 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 14:02:05 2018 -0500 -- gremlin-python/pom.xml | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/231bbb65/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index ec8a8d3..3bbf82c 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -315,27 +315,17 @@ limitations under the License. failonerror="true"> - - - - - + - - - - - + @@ -433,6 +423,7 @@ limitations under the License. +
[1/2] tinkerpop git commit: Improved the method for dealing with the python build problem with radish
Repository: tinkerpop Updated Branches: refs/heads/master 19a211b33 -> 3126c4441 Improved the method for dealing with the python build problem with radish The issue is definitely related to the colorful version bump with radish (and PyHamcrest, maybe others??) depend on. Rather than exclude the dependencies and manually import stuff which was messy, David Brown suggested the fix that just involved an environment variable. He is currently looking into opening an issue with colorful for the problem. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/231bbb65 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/231bbb65 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/231bbb65 Branch: refs/heads/master Commit: 231bbb6596646db3a6238b1014f9d43b25fc7cfd Parents: b54c974 Author: Stephen MalletteAuthored: Thu Jan 18 14:02:05 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 14:02:05 2018 -0500 -- gremlin-python/pom.xml | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/231bbb65/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index ec8a8d3..3bbf82c 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -315,27 +315,17 @@ limitations under the License. failonerror="true"> - - - - - + - - - - - + @@ -433,6 +423,7 @@ limitations under the License. +
[2/2] tinkerpop git commit: Merge branch 'tp32'
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/3126c444 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3126c444 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3126c444 Branch: refs/heads/master Commit: 3126c44412f515afb185b20f0fb8fc7287808c17 Parents: 19a211b 231bbb6 Author: Stephen MalletteAuthored: Thu Jan 18 14:04:20 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 14:04:20 2018 -0500 -- gremlin-python/pom.xml | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3126c444/gremlin-python/pom.xml --
[2/3] tinkerpop git commit: TINKERPOP-1868 Remove unnecessary spaces
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/535b309e/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs -- diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs index ed4b867..d8e26ad 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs @@ -65,1614 +65,1614 @@ namespace Gremlin.Net.Process.Traversal /// /// Adds the V step to this . /// -public GraphTraversal< S , Vertex > V (params object[] vertexIdsOrElements) +public GraphTraversalV (params object[] vertexIdsOrElements) { -var args = new List< object >(0 + vertexIdsOrElements.Length) {}; +var args = new List(0 + vertexIdsOrElements.Length) {}; args.AddRange(vertexIdsOrElements); Bytecode.AddStep("V", args.ToArray()); -return Wrap< S , Vertex >(this); +return Wrap(this); } /// /// Adds the addE step to this . /// -public GraphTraversal< S , Edge > AddE (Direction direction, string firstVertexKeyOrEdgeLabel, string edgeLabelOrSecondVertexKey, params object[] propertyKeyValues) +public GraphTraversalAddE (Direction direction, string firstVertexKeyOrEdgeLabel, string edgeLabelOrSecondVertexKey, params object[] propertyKeyValues) { -var args = new List< object >(3 + propertyKeyValues.Length) {direction, firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey}; +var args = new List(3 + propertyKeyValues.Length) {direction, firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey}; args.AddRange(propertyKeyValues); Bytecode.AddStep("addE", args.ToArray()); -return Wrap< S , Edge >(this); +return Wrap(this); } /// /// Adds the addE step to this . /// -public GraphTraversal< S , Edge > AddE (string edgeLabel) +public GraphTraversalAddE (string edgeLabel) { Bytecode.AddStep("addE", edgeLabel); -return Wrap< S , Edge >(this); +return Wrap(this); } /// /// Adds the addInE step to this . /// -public GraphTraversal< S , Edge > AddInE (string firstVertexKeyOrEdgeLabel, string edgeLabelOrSecondVertexKey, params object[] propertyKeyValues) +public GraphTraversalAddInE (string firstVertexKeyOrEdgeLabel, string edgeLabelOrSecondVertexKey, params object[] propertyKeyValues) { -var args = new List< object >(2 + propertyKeyValues.Length) {firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey}; +var args = new List(2 + propertyKeyValues.Length) {firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey}; args.AddRange(propertyKeyValues); Bytecode.AddStep("addInE", args.ToArray()); -return Wrap< S , Edge >(this); +return Wrap(this); } /// /// Adds the addOutE step to this . /// -public GraphTraversal< S , Edge > AddOutE (string firstVertexKeyOrEdgeLabel, string edgeLabelOrSecondVertexKey, params object[] propertyKeyValues) +public GraphTraversalAddOutE (string firstVertexKeyOrEdgeLabel, string edgeLabelOrSecondVertexKey, params object[] propertyKeyValues) { -var args = new List< object >(2 + propertyKeyValues.Length) {firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey}; +var args = new List(2 + propertyKeyValues.Length) {firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey}; args.AddRange(propertyKeyValues); Bytecode.AddStep("addOutE", args.ToArray()); -return Wrap< S , Edge >(this); +return Wrap(this); } /// /// Adds the addV step to this . /// -public GraphTraversal< S , Vertex > AddV () +public GraphTraversalAddV () { Bytecode.AddStep("addV"); -return Wrap< S , Vertex >(this); +return Wrap(this); } /// /// Adds the addV step to this . /// -public GraphTraversal< S , Vertex > AddV (params object[] propertyKeyValues) +public GraphTraversalAddV (params object[] propertyKeyValues) { -var args = new List< object >(0 + propertyKeyValues.Length) {}; +var args = new List(0 + propertyKeyValues.Length) {}; args.AddRange(propertyKeyValues); Bytecode.AddStep("addV",
[1/3] [tinkerpop] Git Push Summary
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1868 944c2c871 -> 535b309e6
[3/3] tinkerpop git commit: TINKERPOP-1868 Remove unnecessary spaces
TINKERPOP-1868 Remove unnecessary spaces Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/535b309e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/535b309e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/535b309e Branch: refs/heads/TINKERPOP-1868 Commit: 535b309e61f1dc5291c25f3ff36e42d008c264ab Parents: 944c2c8 Author: florianhockmannAuthored: Thu Jan 18 19:37:07 2018 +0100 Committer: florianhockmann Committed: Thu Jan 18 19:37:07 2018 +0100 -- gremlin-dotnet/glv/GraphTraversal.template | 6 +- .../glv/GraphTraversalSource.template | 6 +- gremlin-dotnet/glv/generate.groovy | 3 +- .../Process/Traversal/GraphTraversal.cs | 758 +-- .../Process/Traversal/GraphTraversalSource.cs | 32 +- 5 files changed, 403 insertions(+), 402 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/535b309e/gremlin-dotnet/glv/GraphTraversal.template -- diff --git a/gremlin-dotnet/glv/GraphTraversal.template b/gremlin-dotnet/glv/GraphTraversal.template index 810516f..6738467 100644 --- a/gremlin-dotnet/glv/GraphTraversal.template +++ b/gremlin-dotnet/glv/GraphTraversal.template @@ -65,10 +65,10 @@ namespace Gremlin.Net.Process.Traversal /// /// Adds the <%= method.methodName %> step to this . /// -public GraphTraversal< <%= method.t1 %> , <%= method.t2 %> > <%= toCSharpMethodName.call(method.methodName) %><%= method.tParam %> (<%= method.parameters %>) +public GraphTraversal<$method.t1, $method.t2> <%= toCSharpMethodName.call(method.methodName) %><%= method.tParam %> (<%= method.parameters %>) { <% if (method.parameters.contains("params ")) { - %>var args = new List< <%= method.argsListType %> >(<%= method.paramNames.init().size() %> + <%= method.paramNames.last() %>.Length) {<%= method.paramNames.init().join(", ") %>}; + %>var args = new List<$method.argsListType>(<%= method.paramNames.init().size() %> + <%= method.paramNames.last() %>.Length) {<%= method.paramNames.init().join(", ") %>}; args.AddRange(<%= method.paramNames.last() %>); Bytecode.AddStep("<%= method.methodName %>", args.ToArray());<% } @@ -76,7 +76,7 @@ namespace Gremlin.Net.Process.Traversal %>Bytecode.AddStep("<%= method.methodName %>"<% if (method.parameters) out << ', '+ method.paramNames.join(", ") %>);<% } %> -return Wrap< <%= method.t1 %> , <%= method.t2 %> >(this); +return Wrap<$method.t1, $method.t2>(this); } <% } %> } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/535b309e/gremlin-dotnet/glv/GraphTraversalSource.template -- diff --git a/gremlin-dotnet/glv/GraphTraversalSource.template b/gremlin-dotnet/glv/GraphTraversalSource.template index f8b0acf..afa4297 100644 --- a/gremlin-dotnet/glv/GraphTraversalSource.template +++ b/gremlin-dotnet/glv/GraphTraversalSource.template @@ -127,11 +127,11 @@ namespace Gremlin.Net.Process.Traversal /// Spawns a off this graph traversal source and adds the <%= method.methodName %> step to that /// traversal. /// -public GraphTraversal< <%= method.typeNames.join(",") %> > <%= toCSharpMethodName.call(method.methodName) %><%= method.tParam %>(<%= method.parameters %>) +public GraphTraversal<$method.typeNameString> <%= toCSharpMethodName.call(method.methodName) %><%= method.tParam %>(<%= method.parameters %>) { -var traversal = new GraphTraversal< <%= method.typeNames.join(",") %> >(TraversalStrategies, new Bytecode(Bytecode)); +var traversal = new GraphTraversal<$method.typeNameString>(TraversalStrategies, new Bytecode(Bytecode)); <% if (method.parameters.contains("params ")) { - %>var args = new List< <%= method.argsListType %> >(<%= method.paramNames.init().size() %> + <%= method.paramNames.last() %>.Length) {<%= method.paramNames.init().join(", ") %>}; + %>var args = new List<$method.argsListType>(<%= method.paramNames.init().size() %> + <%= method.paramNames.last() %>.Length) {<%= method.paramNames.init().join(", ") %>}; args.AddRange(<%= method.paramNames.last() %>); traversal.Bytecode.AddStep("<%= method.methodName %>", args.ToArray());<% } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/535b309e/gremlin-dotnet/glv/generate.groovy -- diff --git
[2/2] tinkerpop git commit: Merge branch 'tp32'
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/19a211b3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/19a211b3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/19a211b3 Branch: refs/heads/master Commit: 19a211b3344a5ed050a758d153f3832f5af7d716 Parents: d67b2ab b54c974 Author: Stephen MalletteAuthored: Thu Jan 18 07:11:05 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 07:11:05 2018 -0500 -- gremlin-python/pom.xml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a211b3/gremlin-python/pom.xml --
tinkerpop git commit: Fixed build problems with python given dep issues with radish
Repository: tinkerpop Updated Branches: refs/heads/tp32 7b37a256a -> b54c9740a Fixed build problems with python given dep issues with radish Radish uses colorful which just bumped version and ends up breaking something in radish. Manually loaded deps for now until that is resolved in radish. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b54c9740 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b54c9740 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b54c9740 Branch: refs/heads/tp32 Commit: b54c9740ae1efd08b0a26b780ee109641728b9e8 Parents: 7b37a25 Author: Stephen MalletteAuthored: Thu Jan 18 07:10:04 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 07:10:04 2018 -0500 -- gremlin-python/pom.xml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b54c9740/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index c6373bd..ec8a8d3 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -315,17 +315,27 @@ limitations under the License. failonerror="true"> + - + + + + + + + + - +
[1/2] tinkerpop git commit: Fixed build problems with python given dep issues with radish
Repository: tinkerpop Updated Branches: refs/heads/master d67b2abf7 -> 19a211b33 Fixed build problems with python given dep issues with radish Radish uses colorful which just bumped version and ends up breaking something in radish. Manually loaded deps for now until that is resolved in radish. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b54c9740 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b54c9740 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b54c9740 Branch: refs/heads/master Commit: b54c9740ae1efd08b0a26b780ee109641728b9e8 Parents: 7b37a25 Author: Stephen MalletteAuthored: Thu Jan 18 07:10:04 2018 -0500 Committer: Stephen Mallette Committed: Thu Jan 18 07:10:04 2018 -0500 -- gremlin-python/pom.xml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b54c9740/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index c6373bd..ec8a8d3 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -315,17 +315,27 @@ limitations under the License. failonerror="true"> + - + + + + + + + + - +