Graph providers should no longer rely on the test suite to validate that hyphens work for property keys.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/22ad4601 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/22ad4601 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/22ad4601 Branch: refs/heads/master Commit: 22ad4601cf524142bc3f43b6bbec41b8c32dae71 Parents: 8f8c41a Author: Mathias Bogaert <[email protected]> Authored: Fri Jun 3 11:49:33 2016 +0100 Committer: Mathias Bogaert <[email protected]> Committed: Thu Jul 7 17:34:38 2016 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.1.x-incubating.asciidoc | 5 +++++ .../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 2 +- .../process/traversal/step/map/GroovyAddEdgeTest.groovy | 4 ++-- .../gremlin/process/traversal/step/map/AddEdgeTest.java | 8 ++++---- .../strategy/decoration/PartitionStrategyProcessTest.java | 8 ++++---- .../org/apache/tinkerpop/gremlin/structure/EdgeTest.java | 2 +- .../org/apache/tinkerpop/gremlin/structure/io/IoTest.java | 6 +++--- 8 files changed, 21 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 3ec73e5..cbe6100 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -35,6 +35,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET) * Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations. * Improved `TinkerGraph` performance when iterating vertices and edges. * Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation. +* Graph providers should no longer rely on the test suite to validate that hyphens work for property keys. * Optimized a few special cases in `RangeByIsCountStrategy`. * Added more "invalid" variable bindings to the list used by Gremlin Server to validate incoming bindings on requests. * Named the thread pool used by Gremlin Server sessions: "gremlin-server-session-$n". http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/docs/src/upgrade/release-3.1.x-incubating.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc index 060d842..dc9ad73 100644 --- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc +++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc @@ -85,6 +85,11 @@ changes there may prove important for the provider's implementation. Graph Database Providers ^^^^^^^^^^^^^^^^^^^^^^^^ +Property Keys and Hyphens ++++++++++++++++++++++++++ + +Graph providers should no longer rely on the test suite to validate that hyphens work for property keys. + Vertex and Edge Counts ++++++++++++++++++++++ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index 473628f..dbec9d8 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java @@ -719,7 +719,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { ((Mutating) this.asAdmin().getEndStep()).addPropertyMutations(propertyKeyValues); return (GraphTraversal<S, Edge>) this; } else { - // addInE("a", "co-developer", "b", "year", 2009) + // addInE("a", "codeveloper", "b", "year", 2009) this.addE(edgeLabelOrSecondVertexKey); if (direction.equals(Direction.OUT)) this.from(firstVertexKeyOrEdgeLabel).to((String) propertyKeyValues[0]); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy index eb78aa2..f76692f 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy @@ -48,7 +48,7 @@ public abstract class GroovyAddEdgeTest { @Override public Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X() { - TraversalScriptHelper.compute("g.V.as('a').out('created').in('created').where(neq('a')).as('b').addE('co-developer').from('a').to('b').property('year', 2009)", g) + TraversalScriptHelper.compute("g.V.as('a').out('created').in('created').where(neq('a')).as('b').addE('codeveloper').from('a').to('b').property('year', 2009)", g) } @Override @@ -74,7 +74,7 @@ public abstract class GroovyAddEdgeTest { @Override public Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X() { - TraversalScriptHelper.compute("g.V.as('a').out('created').in('created').where(neq('a')).as('b').select('a','b').addInE('a', 'co-developer', 'b', 'year', 2009)", g) + TraversalScriptHelper.compute("g.V.as('a').out('created').in('created').where(neq('a')).as('b').select('a','b').addInE('a', 'codeveloper', 'b', 'year', 2009)", g) } @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java index 9bd6695..85bdd21 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java @@ -210,7 +210,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { int count = 0; while (traversal.hasNext()) { final Edge edge = traversal.next(); - assertEquals("co-developer", edge.label()); + assertEquals("codeveloper", edge.label()); assertEquals(2009, (int) edge.value("year")); assertEquals(1, IteratorUtils.count(edge.properties())); assertEquals("person", edge.inVertex().label()); @@ -235,7 +235,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { int count = 0; while (traversal.hasNext()) { final Edge edge = traversal.next(); - assertEquals("co-developer", edge.label()); + assertEquals("codeveloper", edge.label()); assertEquals(2009, (int) edge.value("year")); assertEquals(1, IteratorUtils.count(edge.properties())); assertEquals("person", edge.inVertex().label()); @@ -321,7 +321,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { @Override public Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X() { - return g.V().as("a").out("created").in("created").where(P.neq("a")).as("b").addE("co-developer").from("a").to("b").property("year", 2009); + return g.V().as("a").out("created").in("created").where(P.neq("a")).as("b").addE("codeveloper").from("a").to("b").property("year", 2009); } @Override @@ -348,7 +348,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest { @Override public Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X() { - return g.V().as("a").out("created").in("created").where(P.neq("a")).as("b").select("a", "b").addInE("a", "co-developer", "b", "year", 2009); + return g.V().as("a").out("created").in("created").where(P.neq("a")).as("b").select("a", "b").addInE("a", "codeveloper", "b", "year", 2009); } @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyProcessTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyProcessTest.java index e4cea45..747ff65 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyProcessTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyProcessTest.java @@ -414,14 +414,14 @@ public class PartitionStrategyProcessTest extends AbstractGremlinProcessTest { final Vertex vA = sourceAA.addV().property("any", "a").next(); final Vertex vAA = sourceAA.addV().property("any", "aa").next(); - final Edge eAtoAA = sourceAA.withSideEffect("vAA", vAA).V(vA.id()).addE("a->a").to("vAA").next(); + final Edge eAtoAA = sourceAA.withSideEffect("vAA", vAA).V(vA.id()).addE("aTOa").to("vAA").next(); final Vertex vB = sourceBA.addV().property("any", "b").next(); - sourceBA.withSideEffect("vB", vB).V(vA.id()).addE("a->b").to("vB").next(); + sourceBA.withSideEffect("vB", vB).V(vA.id()).addE("aTOb").to("vB").next(); final Vertex vC = sourceCAB.addV().property("any", "c").next(); - final Edge eBtovC = sourceCAB.withSideEffect("vC", vC).V(vB.id()).addE("b->c").to("vC").next(); - final Edge eAtovC = sourceCAB.withSideEffect("vC", vC).V(vA.id()).addE("a->c").to("vC").next(); + final Edge eBtovC = sourceCAB.withSideEffect("vC", vC).V(vB.id()).addE("bTOc").to("vC").next(); + final Edge eAtovC = sourceCAB.withSideEffect("vC", vC).V(vA.id()).addE("aTOc").to("vC").next(); assertEquals(0, IteratorUtils.count(sourceC.V())); assertEquals(0, IteratorUtils.count(sourceC.E())); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java index 68770e9..6b11244 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java @@ -106,7 +106,7 @@ public class EdgeTest { public void shouldHaveExceptionConsistencyWhenUsingNullVertex() { final Vertex v = graph.addVertex(); try { - v.addEdge("to-nothing", null); + v.addEdge("tonothing", null); fail("Call to Vertex.addEdge() should throw an exception when vertex is null"); } catch (Exception ex) { validateException(Graph.Exceptions.argumentCanNotBeNull("vertex"), ex); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22ad4601/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java index 2673f4d..5a624f4 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java @@ -270,7 +270,7 @@ public class IoTest { final Vertex v1 = source.addVertex(); final Vertex v2 = source.addVertex(); v1.addEdge("CONTROL", v2); - v1.addEdge("SELF-LOOP", v1); + v1.addEdge("SELFLOOP", v1); final Configuration targetConf = graphProvider.newGraphConfiguration("target", this.getClass(), name.getMethodName(), null); final Graph target = graphProvider.openTestGraph(targetConf); @@ -299,7 +299,7 @@ public class IoTest { final Vertex v1 = source.addVertex(); final Vertex v2 = source.addVertex(); v1.addEdge("CONTROL", v2); - v1.addEdge("SELF-LOOP", v1); + v1.addEdge("SELFLOOP", v1); final Configuration targetConf = graphProvider.newGraphConfiguration("target", this.getClass(), name.getMethodName(), null); final Graph target = graphProvider.openTestGraph(targetConf);; @@ -444,7 +444,7 @@ public class IoTest { final Vertex v1 = source.addVertex(); final Vertex v2 = source.addVertex(); v1.addEdge("CONTROL", v2); - v1.addEdge("SELF-LOOP", v1); + v1.addEdge("SELFLOOP", v1); final Configuration targetConf = graphProvider.newGraphConfiguration("target", this.getClass(), name.getMethodName(), null); final Graph target = graphProvider.openTestGraph(targetConf);
