You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/06/03 02:44:24 UTC
tinkerpop git commit: Changed crew creation for IO tests back to
original
Repository: tinkerpop
Updated Branches:
refs/heads/master 10f0d4089 -> f15cf674f
Changed crew creation for IO tests back to original
Configured the crew to be like it was before changes in TinkerFactory.createTheCrew() that added the IdManager. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f15cf674
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f15cf674
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f15cf674
Branch: refs/heads/master
Commit: f15cf674f1f506e579fc13e4fced659d9470b34b
Parents: 10f0d40
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jun 2 22:42:51 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jun 2 22:42:51 2017 -0400
----------------------------------------------------------------------
gremlin-tools/gremlin-io-test/pom.xml | 12 ++++++++++--
.../apache/tinkerpop/gremlin/structure/io/Model.java | 8 +++++++-
.../io/graphson/_3_2_3/manual-graphson-generator.groovy | 6 +++++-
.../io/graphson/_3_2_4/manual-graphson-generator.groovy | 6 +++++-
.../io/gryo/_3_2_3/manual-gryo-generator.groovy | 6 +++++-
.../io/gryo/_3_2_4/manual-gryo-generator.groovy | 6 +++++-
6 files changed, 37 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f15cf674/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
index 2a3c6ed..625571f 100644
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -110,12 +110,16 @@ import org.apache.tinkerpop.gremlin.driver.message.*
import org.apache.tinkerpop.gremlin.process.traversal.step.*
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
import org.apache.tinkerpop.gremlin.structure.io.Model
+import org.apache.commons.configuration.BaseConfiguration
new File("${project.build.directory}/dev-docs/").mkdirs()
new File("${project.build.directory}/test-case-data/io/graphson/").mkdirs()
new File("${project.build.directory}/test-case-data/io/gryo/").mkdirs()
-graph = TinkerFactory.createTheCrew()
+conf = new BaseConfiguration()
+conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
+graph = TinkerGraph.open(conf)
+TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
model = Model.instance()
@@ -301,11 +305,15 @@ import org.apache.tinkerpop.gremlin.structure.*
import org.apache.tinkerpop.gremlin.structure.io.gryo.*
import org.apache.tinkerpop.gremlin.structure.io.*
import org.apache.tinkerpop.gremlin.process.traversal.*
+import org.apache.commons.configuration.BaseConfiguration
new File("${project.build.directory}/dev-docs/").mkdirs()
new File("${project.build.directory}/test-case-data/io/gryo").mkdirs()
-graph = TinkerFactory.createTheCrew()
+conf = new BaseConfiguration()
+conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
+graph = TinkerGraph.open(conf)
+TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
model = Model.instance()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f15cf674/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index 6ce19f5..9b144fe 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -18,6 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.structure.io;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
@@ -41,6 +43,7 @@ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONCompatibility;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoCompatibility;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import java.io.File;
import java.io.PrintWriter;
@@ -94,7 +97,10 @@ public class Model {
private final Map<String, List<Entry>> entries = new HashMap<>();
private Model() {
- final Graph graph = TinkerFactory.createTheCrew();
+ final Configuration conf = new BaseConfiguration();
+ conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
+ final TinkerGraph graph = TinkerGraph.open(conf);
+ TinkerFactory.generateTheCrew(graph);
final GraphTraversalSource g = graph.traversal();
final Compatibility[] noTypeGraphSONPlusGryo3_2_3 = Compatibilities.with(GryoCompatibility.class).beforeRelease("3.2.4").join(Compatibilities.UNTYPED_GRAPHSON).matchToArray();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f15cf674/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
index ecf61f0..af37164 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
@@ -32,13 +32,17 @@ import org.apache.tinkerpop.gremlin.driver.message.*
import org.apache.tinkerpop.gremlin.process.traversal.step.*
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+import org.apache.commons.configuration.BaseConfiguration
import java.util.concurrent.TimeUnit
new File("dev-docs/").mkdirs()
new File("test-case-data/io/graphson").mkdirs()
-graph = TinkerFactory.createTheCrew()
+conf = new BaseConfiguration()
+conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
+graph = TinkerGraph.open(conf)
+TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
toJson = { o, type, mapper, comment = "", suffix = "" ->
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f15cf674/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy
index 7a0b1f4..1d646f8 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy
@@ -32,13 +32,17 @@ import org.apache.tinkerpop.gremlin.driver.message.*
import org.apache.tinkerpop.gremlin.process.traversal.step.*
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+import org.apache.commons.configuration.BaseConfiguration
import java.util.concurrent.TimeUnit
new File("dev-docs/").mkdirs()
new File("test-case-data/io/graphson").mkdirs()
-graph = TinkerFactory.createTheCrew()
+conf = new BaseConfiguration()
+conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
+graph = TinkerGraph.open(conf)
+TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
toJson = { o, type, mapper, comment = "", suffix = "" ->
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f15cf674/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
index 9eadc19..f641d11 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
@@ -18,6 +18,7 @@
*/
+import org.apache.commons.configuration.BaseConfiguration
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics
import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics
@@ -40,7 +41,10 @@ import java.util.concurrent.TimeUnit
new File("dev-docs/").mkdirs()
new File("test-case-data/io/gryo").mkdirs()
-graph = TinkerFactory.createTheCrew()
+conf = new BaseConfiguration()
+conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
+graph = TinkerGraph.open(conf)
+TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
createStaticTraversalMetrics = {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f15cf674/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy
index 36b23c3..d204d4e 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy
@@ -18,6 +18,7 @@
*/
+import org.apache.commons.configuration.BaseConfiguration
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics
import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics
@@ -40,7 +41,10 @@ import java.util.concurrent.TimeUnit
new File("dev-docs/").mkdirs()
new File("test-case-data/io/gryo").mkdirs()
-graph = TinkerFactory.createTheCrew()
+conf = new BaseConfiguration()
+conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
+graph = TinkerGraph.open(conf)
+TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
createStaticTraversalMetrics = {