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/29 15:22:01 UTC

[1/2] tinkerpop git commit: TINKERPOP-1698 Cleaned up comments

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1698 8fb6d63ec -> 18fd172f1


TINKERPOP-1698 Cleaned up comments


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

Branch: refs/heads/TINKERPOP-1698
Commit: f911c009d74c32df636604f57783fdd09ca2c37f
Parents: 8fb6d63
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 11:14:10 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 11:14:10 2017 -0400

----------------------------------------------------------------------
 .../gremlin/structure/io/gryo/GryoSerializersV3d0.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f911c009/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
index 82fa178..8a57a06 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
@@ -78,8 +78,10 @@ public final class GryoSerializersV3d0 {
 
             // temporary try/catch perhaps? need this to get SparkSingleIterationStrategyTest to work. Trying to grab
             // the label of the adjacent vertex ends in error if there's a StarEdge in the ComputerGraph$ComputerEdge.
-            // maybe this gets fixed up when TINKERPOP-1592 is in play. hopefully this serializer will get better
-            // with that
+            // apparently this is how we handle things in DetachedElement. i'll write here in the comments what was
+            // written there:
+            //
+            // ghetto
             try {
                 output.writeString(edge.inVertex().label());
             } catch (Exception ex) {
@@ -88,10 +90,7 @@ public final class GryoSerializersV3d0 {
 
             kryo.writeClassAndObject(output, edge.outVertex().id());
 
-            // temporary try/catch perhaps? need this to get SparkSingleIterationStrategyTest to work. Trying to grab
-            // the label of the adjacent vertex ends in error if there's a StarEdge in the ComputerGraph$ComputerEdge.
-            // maybe this gets fixed up when TINKERPOP-1592 is in play. hopefully this serializer will get better
-            // with that
+            // same nonsense as above for a default label
             try {
                 output.writeString(edge.outVertex().label());
             } catch (Exception ex) {


[2/2] tinkerpop git commit: TINKERPOP-1698 Update the upgrade docs for gryo 3.0

Posted by sp...@apache.org.
TINKERPOP-1698 Update the upgrade docs for gryo 3.0


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

Branch: refs/heads/TINKERPOP-1698
Commit: 18fd172f1ec45ca09dbe7a349d47db236ee61a87
Parents: f911c00
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 11:21:36 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 11:21:36 2017 -0400

----------------------------------------------------------------------
 docs/src/upgrade/release-3.3.x.asciidoc | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18fd172f/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 53fc0b3..8fd949b 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -36,6 +36,7 @@ GraphSON 2.0
 ^^^^^^^^^^^^
 
 TODO - RE-READ THIS WHOLE SECTION - IT MIGHT BE A MESS WITH GRAPHSON 3.0 CHANGES COMING IN
+SHOULD PROBABLY FOLD THESE CHANGES DOWN INTO THE "Changes to IO" SECTION AND ONE SOLID SECTION
 
 Both TinkerGraph and Gremlin Server have been defaulted to work with GraphSON 2.0. For TinkerGraph this means that
 the following commands:
@@ -109,6 +110,15 @@ Changes to IO
 ** `RequestMessage`
 ** `ResponseMessage`
 
+Gryo 3.0
+++++++++
+
+Gryo 3.0 fixes a number of inconsistencies with Gryo 1.0 and hopefully marks a point where Gryo is better versioned
+over time. Gryo 3.0 is not compatible with Gryo 1.0 and is now the default version of Gryo exposed by TinkerPop in
+Gremlin Server and IO.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1698[TINKERPOP-1698]
+
 Graphite and Ganglia
 ^^^^^^^^^^^^^^^^^^^^