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/04/24 21:56:25 UTC
[1/2] incubator-tinkerpop git commit: Minor updates to GraphReader
javadoc.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 506f6323c -> 8048b1e11
Minor updates to GraphReader javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9de25cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9de25cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9de25cfa
Branch: refs/heads/master
Commit: 9de25cfa5ad994082aa627b0f9251b58424877aa
Parents: f9f98bd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 24 15:55:57 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 24 15:55:57 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/GraphReader.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9de25cfa/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index 5aad86f..5682c19 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -38,7 +38,9 @@ import java.util.function.Function;
public interface GraphReader {
/**
- * Reads an entire graph from an {@link InputStream}.
+ * Reads an entire graph from an {@link InputStream}. This method is mean to load an empty {@link Graph}.
+ * It is up to individual implementations to manage transactions, but it is not required or enforced. Consult
+ * the documentation of an implementation to understand the approach it takes.
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
*/
@@ -46,6 +48,8 @@ public interface GraphReader {
/**
* Reads a single vertex from an {@link InputStream}. This method will read vertex properties but not edges.
+ * It is expected that the user will manager their own transaction context with respect to this method (i.e.
+ * implementations should not commit the transaction for the user).
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
* @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
@@ -55,7 +59,8 @@ public interface GraphReader {
/**
* Reads a single vertex from an {@link InputStream}. This method will read vertex properties as well as edges
- * given the direction supplied as an argument.
+ * given the direction supplied as an argument. It is expected that the user will manager their own transaction
+ * context with respect to this method (i.e. implementations should not commit the transaction for the user).
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
* @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
@@ -72,8 +77,10 @@ public interface GraphReader {
/**
* Reads a set of vertices from an {@link InputStream} which were written by
- * {@link GraphWriter#writeVertices(OutputStream, Iterator)}. This method
- * will read vertex properties as well as edges given the direction supplied as an argument.
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator)}. This method will read vertex properties as well as
+ * edges given the direction supplied as an argument. It is expected that the user will manager their own
+ * transaction context with respect to this method (i.e. implementations should not commit the transaction for
+ * the user).
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
* @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
@@ -89,7 +96,9 @@ public interface GraphReader {
final Direction attachEdgesOfThisDirection) throws IOException;
/**
- * Reads a single edge from an {@link InputStream}.
+ * Reads a single edge from an {@link InputStream}. It is expected that the user will manager their own
+ * transaction context with respect to this method (i.e. implementations should not commit the transaction for
+ * the user).
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
* @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8048b1e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8048b1e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8048b1e1
Branch: refs/heads/master
Commit: 8048b1e11ab8efd2947e3a048162b885920c16ad
Parents: 9de25cf 506f632
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 24 15:56:14 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 24 15:56:14 2015 -0400
----------------------------------------------------------------------
.../hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------