tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [05/50] [abbrv] tinkerpop git commit: Reverted createClassic() to how it was...
Date Mon, 19 Jun 2017 11:00:26 GMT
Reverted createClassic() to how it was...

with an integer IdManager. Caused some test failures which didn't have a clear explanation.
Probably best to just leave as-was CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa9a9135
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa9a9135
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa9a9135

Branch: refs/heads/TINKERPOP-1489
Commit: fa9a91352f73d1d1f5f344aa3a1893679985c515
Parents: 3c77afb
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Sat Jun 3 05:37:59 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Sat Jun 3 05:37:59 2017 -0400

----------------------------------------------------------------------
 .../tinkergraph/structure/TinkerFactory.java      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa9a9135/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
index 71d1cc2..0520ee2 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
@@ -33,7 +33,11 @@ public final class TinkerFactory {
     private TinkerFactory() {}
 
     public static TinkerGraph createClassic() {
-        final TinkerGraph g = getTinkerGraphWithIntManager();
+        final Configuration conf = new BaseConfiguration();
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
+        final TinkerGraph g = TinkerGraph.open(conf);
         generateClassic(g);
         return g;
     }
@@ -54,7 +58,7 @@ public final class TinkerFactory {
     }
 
     public static TinkerGraph createModern() {
-        final TinkerGraph g = getTinkerGraphWithIntManager();
+        final TinkerGraph g = getTinkerGraphWithNumberManager();
         generateModern(g);
         return g;
     }
@@ -75,7 +79,7 @@ public final class TinkerFactory {
     }
 
     public static TinkerGraph createTheCrew() {
-        final Configuration conf = getIntIdManagerConfiguration();
+        final Configuration conf = getNumberIdManagerConfiguration();
         conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY,
VertexProperty.Cardinality.list.name());
         final TinkerGraph g = TinkerGraph.open(conf);
         generateTheCrew(g);
@@ -132,16 +136,16 @@ public final class TinkerFactory {
         g.variables().set("comment", "this graph was created to provide examples and test
coverage for tinkerpop3 api advances");
     }
 
-    private static TinkerGraph getTinkerGraphWithIntManager() {
-        final Configuration conf = getIntIdManagerConfiguration();
+    private static TinkerGraph getTinkerGraphWithNumberManager() {
+        final Configuration conf = getNumberIdManagerConfiguration();
         return TinkerGraph.open(conf);
     }
 
-    private static Configuration getIntIdManagerConfiguration() {
+    private static Configuration getNumberIdManagerConfiguration() {
         final Configuration conf = new BaseConfiguration();
         conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
         conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
-        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, TinkerGraph.DefaultIdManager.LONG.name());
         return conf;
     }
 }


Mime
View raw message