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 2015/06/03 02:12:25 UTC
[20/50] [abbrv] incubator-tinkerpop git commit: a stub for default
cardinality in TinkerGraph. @spmallette.
a stub for default cardinality in TinkerGraph. @spmallette.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2b3a682f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2b3a682f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2b3a682f
Branch: refs/heads/preprocessor
Commit: 2b3a682f5fd7df8135c5b8f15a6b923c007ca32c
Parents: 1e7e161
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri May 29 12:58:35 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri May 29 12:58:35 2015 -0600
----------------------------------------------------------------------
.../gremlin/neo4j/structure/Neo4jGraph.java | 10 ++++++++++
.../gremlin/tinkergraph/structure/TinkerGraph.java | 15 ++++++++++++---
.../gremlin/tinkergraph/structure/TinkerVertex.java | 4 ++--
3 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2b3a682f/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
index 07aa0ef..34a527f 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
@@ -22,11 +22,13 @@ import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationConverter;
import org.apache.tinkerpop.gremlin.neo4j.process.traversal.step.sideEffect.CypherStartStep;
+import org.apache.tinkerpop.gremlin.neo4j.process.traversal.strategy.optimization.Neo4jGraphStepStrategy;
import org.apache.tinkerpop.gremlin.neo4j.process.util.Neo4jCypherIterator;
import org.apache.tinkerpop.gremlin.neo4j.structure.trait.MultiMetaNeo4jTrait;
import org.apache.tinkerpop.gremlin.neo4j.structure.trait.Neo4jTrait;
import org.apache.tinkerpop.gremlin.neo4j.structure.trait.NoMultiNoMetaNeo4jTrait;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -67,6 +69,14 @@ import java.util.stream.Stream;
@Graph.OptIn(Graph.OptIn.SUITE_GROOVY_ENVIRONMENT_PERFORMANCE)
public final class Neo4jGraph implements Graph, WrappedGraph<Neo4jGraphAPI> {
+ static {
+ TraversalStrategies.GlobalCache.registerStrategies(Neo4jGraph.class, TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone().addStrategies(Neo4jGraphStepStrategy.instance()));
+ }
+
+ private static final Configuration EMPTY_CONFIGURATION = new BaseConfiguration() {{
+ this.setProperty(Graph.GRAPH, Neo4jGraph.class.getName());
+ }};
+
protected Features features = new Neo4jGraphFeatures();
protected Neo4jGraphAPI baseGraph;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2b3a682f/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index bb127c4..f76d8f2 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -76,6 +76,7 @@ public final class TinkerGraph implements Graph {
public static final String CONFIG_VERTEX_ID = "gremlin.tinkergraph.vertexIdManager";
public static final String CONFIG_EDGE_ID = "gremlin.tinkergraph.edgeIdManager";
public static final String CONFIG_VERTEX_PROPERTY_ID = "gremlin.tinkergraph.vertexPropertyIdManager";
+ public static final String CONFIG_DEFAULT_VERTEX_PROPERTY_CARDINALITY = "gremlin.tinkergraph.defaultVertexPropertyCardinality";
private final TinkerGraphFeatures features = new TinkerGraphFeatures();
@@ -91,6 +92,7 @@ public final class TinkerGraph implements Graph {
protected final IdManager<?> vertexIdManager;
protected final IdManager<?> edgeIdManager;
protected final IdManager<?> vertexPropertyIdManager;
+ //protected final VertexProperty.Cardinality defaultVertexPropertyCardinality;
private final Configuration configuration;
@@ -99,9 +101,10 @@ public final class TinkerGraph implements Graph {
*/
private TinkerGraph(final Configuration configuration) {
this.configuration = configuration;
- vertexIdManager = selectIdManager(configuration, CONFIG_VERTEX_ID, Vertex.class);
- edgeIdManager = selectIdManager(configuration, CONFIG_EDGE_ID, Edge.class);
- vertexPropertyIdManager = selectIdManager(configuration, CONFIG_VERTEX_PROPERTY_ID, VertexProperty.class);
+ this.vertexIdManager = selectIdManager(configuration, CONFIG_VERTEX_ID, Vertex.class);
+ this.edgeIdManager = selectIdManager(configuration, CONFIG_EDGE_ID, Edge.class);
+ this.vertexPropertyIdManager = selectIdManager(configuration, CONFIG_VERTEX_PROPERTY_ID, VertexProperty.class);
+ //this.defaultVertexPropertyCardinality = VertexProperty.Cardinality.valueOf(configuration.getString(CONFIG_DEFAULT_VERTEX_PROPERTY_CARDINALITY, "single"));
}
/**
@@ -310,6 +313,12 @@ public final class TinkerGraph implements Graph {
public boolean willAllowId(final Object id) {
return vertexIdManager.allow(id);
}
+
+ /*@Override
+ public VertexProperty.Cardinality getCardinality(final String key) {
+ return VertexProperty.Cardinality.single;
+ //return defaultVertexPropertyCardinality;
+ }*/
}
public class TinkerGraphEdgeFeatures implements Features.EdgeFeatures {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2b3a682f/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
index cd27376..2378e97 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
@@ -82,10 +82,10 @@ public final class TinkerVertex extends TinkerElement implements Vertex {
}
}
- @Override
+ /*@Override
public <V> VertexProperty<V> property(final String key, final V value, final Object... keyValues) {
return this.property(VertexProperty.Cardinality.single, key, value, keyValues);
- }
+ }*/
@Override
public <V> VertexProperty<V> property(final VertexProperty.Cardinality cardinality, final String key, final V value, final Object... keyValues) {