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 2015/09/30 18:53:50 UTC
[1/4] incubator-tinkerpop git commit: Fix javadoc in tinkergraph.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp30 675b9c4cd -> 77f374df8
Fix javadoc in tinkergraph.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/34d4b4c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/34d4b4c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/34d4b4c9
Branch: refs/heads/tp30
Commit: 34d4b4c9bd466c915592cd483d8e041c5d484853
Parents: 78cfe5b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 30 12:36:53 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 30 12:36:53 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/34d4b4c9/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 af64e3a..eeb13c8 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
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Stream;
/**
- * An in-sideEffects, reference implementation of the property graph interfaces provided by Gremlin3.
+ * An in-memory, reference implementation of the property graph interfaces provided by TinkerPop.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
[2/4] incubator-tinkerpop git commit: Update javadocs a bit to
include persistence feature of TinkerGraph.
Posted by sp...@apache.org.
Update javadocs a bit to include persistence feature of TinkerGraph.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/38328a2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/38328a2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/38328a2f
Branch: refs/heads/tp30
Commit: 38328a2fb72c97db074d6cb8e53fe01188abdcc9
Parents: 34d4b4c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 30 12:51:01 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 30 12:51:01 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/38328a2f/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 eeb13c8..47d052d 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
@@ -51,7 +51,8 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Stream;
/**
- * An in-memory, reference implementation of the property graph interfaces provided by TinkerPop.
+ * An in-memory (with optional persistence on calls to {@link #close()}), reference implementation of the property
+ * graph interfaces provided by TinkerPop.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
[4/4] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30' into tp30
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30' into tp30
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/77f374df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/77f374df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/77f374df
Branch: refs/heads/tp30
Commit: 77f374df8996c91a5c517e5aad70204a2321fb81
Parents: dc96884 675b9c4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 30 12:53:37 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 30 12:53:37 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/step/branch/RepeatStep.java | 35 ++++++++++++--------
.../process/traversal/util/TraversalRing.java | 6 ++--
3 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-tinkerpop git commit: Update asciidoc with
TinkerGrpah configs for persistence.
Posted by sp...@apache.org.
Update asciidoc with TinkerGrpah configs for persistence.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/dc968843
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dc968843
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dc968843
Branch: refs/heads/tp30
Commit: dc968843871c5965f5ece1bad5f6eaf3ed9850f2
Parents: 38328a2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 30 12:51:23 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 30 12:51:23 2015 -0400
----------------------------------------------------------------------
docs/src/implementations.asciidoc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dc968843/docs/src/implementations.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/implementations.asciidoc b/docs/src/implementations.asciidoc
index 44ec5e5..c9395b2 100644
--- a/docs/src/implementations.asciidoc
+++ b/docs/src/implementations.asciidoc
@@ -449,7 +449,7 @@ TinkerGraph-Gremlin
</dependency>
----
-image:tinkerpop-character.png[width=100,float=left] TinkerGraph is a single machine, in-memory, non-transactional graph engine that provides both OLTP and OLAP functionality. It is deployed with TinkerPop3 and serves as the reference implementation for other vendors to study in order to understand the semantics of the various methods of the TinkerPop3 API. Constructing a simple graph in Java8 is presented below.
+image:tinkerpop-character.png[width=100,float=left] TinkerGraph is a single machine, in-memory (with optional persistence), non-transactional graph engine that provides both OLTP and OLAP functionality. It is deployed with TinkerPop3 and serves as the reference implementation for other vendors to study in order to understand the semantics of the various methods of the TinkerPop3 API. Constructing a simple graph in Java8 is presented below.
[source,java]
Graph g = TinkerGraph.open();
@@ -508,10 +508,14 @@ TinkerGraph has several settings that can be provided on creation via `Configura
|gremlin.tinkergraph.edgeIdManager |The `IdManager` implementation to use for edges.
|gremlin.tinkergraph.vertexPropertyIdManager |The `IdManager` implementation to use for vertex properties.
|gremlin.tinkergraph.defaultVertexPropertyCardinality |The default `VertexProperty.Cardinality` to use when `Vertex.property(k,v)` is called.
+|gremlin.tinkergraph.graphLocation |The path and file name for where TinkerGraph should persist the graph data. If a value is specified here, the the `gremlin.tinkergraph.graphFormat` should also be specified. If this value is not included (default), then the graph will stay in-memory and not be loaded/persisted to disk.
+|gremlin.tinkergraph.graphFormat |The format to use to serialize the graph which may be one of the following: `graphml`, `graphson`, or `gryo`. If a value is specified here, the the `gremlin.tinkergraph.graphLocation` should also be specified. If this value is not included (default), then the graph will stay in-memory and not be loaded/persisted to disk.
|=========================================================
The `IdManager` settings above refer to how TinkerGraph will control identifiers for vertices, edges and vertex properties. There are several options for each of these settings: `ANY`, `LONG`, `INTEGER`, `UUID`, or the fully qualified class name of an `IdManager` implementation on the classpath. When not specified, the default values for all settings is `ANY`, meaning that the graph will work with any object on the JVM as the identifier and will generate new identifiers from `Long` when the identifier is not user supplied. TinkerGraph will also expect the user to understand the types used for identifiers when querying, meaning that `g.V(1)` and `g.V(1L)` could return two different vertices. `LONG`, `INTEGER` and `UUID` settings will try to coerce identifier values to the expected type as well as generate new identifiers with that specified type.
+If the TinkerGraph is configured for persistence with `gremlin.tinkergraph.graphLocation` and `gremlin.tinkergraph.graphFormat`, then the graph will be written to the specified location with the specified format when `Graph.close()` is called. In addition, if these settings are present, TinkerGraph will attempt to load the graph from the specified location.
+
It is important to consider the data being imported to TinkerGraph with respect to `defaultVertexPropertyCardinality` setting. For example, if a `.gryo` file is known to contain multi-property data, be sure to set the default cardinality to `list` or else the data will import as `single`. Consider the following:
[gremlin-groovy]