tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [36/50] [abbrv] tinkerpop git commit: GryoVersion.3_0 ... epic. @spmallette making my life easy. OrderedTraverser registered and private no-arg constructor added. More AkkaActorsProcessActorsTest cases passing. The only ones that are failing have to do w
Date Thu, 19 Jan 2017 21:06:57 GMT
GryoVersion.3_0 ... epic. @spmallette making my life easy. OrderedTraverser registered and
private no-arg constructor added. More AkkaActorsProcessActorsTest cases passing. The only
ones that are failing have to do with GroupStep.GroupBiOperator. So lost as to why its a problem.
:|


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

Branch: refs/heads/TINKERPOP-1564
Commit: 22325591f242e1216e46c2e52c70a23177236adf
Parents: 2aa1dc3
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Wed Jan 11 18:31:42 2017 -0700
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Thu Jan 19 13:01:41 2017 -0700

----------------------------------------------------------------------
 .../gremlin/akka/process/actors/io/GryoSerializer.java       | 2 ++
 .../process/traversal/traverser/util/OrderedTraverser.java   | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22325591/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/GryoSerializer.java
b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/GryoSerializer.java
index 1ffa361..188ba9f 100644
--- a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/GryoSerializer.java
+++ b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/GryoSerializer.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.actors.traversal.message.StartMessag
 import org.apache.tinkerpop.gremlin.process.actors.traversal.message.Terminate;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoPool;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
 import org.apache.tinkerpop.shaded.kryo.io.Input;
 import org.apache.tinkerpop.shaded.kryo.io.Output;
 import scala.Option;
@@ -48,6 +49,7 @@ public final class GryoSerializer implements Serializer {
                 initializeMapper(builder ->
                         builder.referenceTracking(true).
                                 registrationRequired(true).
+                                version(GryoVersion.V3_0).
                                 addCustom(
                                         Terminate.class,
                                         StartMessage.class,

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22325591/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/OrderedTraverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/OrderedTraverser.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/OrderedTraverser.java
index 1294562..b85a18b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/OrderedTraverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/OrderedTraverser.java
@@ -35,7 +35,11 @@ import java.util.function.Function;
 public final class OrderedTraverser<T> implements Traverser.Admin<T> {
 
     private Traverser.Admin<T> internal;
-    private final int order;
+    private int order;
+
+    private OrderedTraverser() {
+        // for serialization
+    }
 
     public OrderedTraverser(final Traverser.Admin<T> internal, final int order) {
         this.internal = internal instanceof OrderedTraverser ? ((OrderedTraverser) internal).internal
: internal;
@@ -113,7 +117,7 @@ public final class OrderedTraverser<T> implements Traverser.Admin<T>
{
 
     @Override
     public Admin<T> detach() {
-        this.internal.detach();
+        this.internal = this.internal.detach();
         return this;
     }
 


Mime
View raw message