You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/15 20:30:02 UTC
incubator-tinkerpop git commit: Fixed TINKERPOP-1105.
DetachedVertexProperties were being serialized as DetachedProperty by
GryoSerializers.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1154 94ffac91b -> 55e5559d0
Fixed TINKERPOP-1105. DetachedVertexProperties were being serialized as DetachedProperty by GryoSerializers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/55e5559d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/55e5559d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/55e5559d
Branch: refs/heads/TINKERPOP-1154
Commit: 55e5559d0ea68843a2dff4d0c3f286a6a6f29f12
Parents: 94ffac9
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Feb 15 12:29:56 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Feb 15 12:29:56 2016 -0700
----------------------------------------------------------------------
.../process/computer/traversal/step/map/ComputerResultStep.java | 5 +++--
.../tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java | 2 +-
.../gremlin/structure/util/detached/DetachedVertex.java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/55e5559d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index 86dce91..d32e750 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -30,6 +30,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierS
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.util.iterator.EmptyIterator;
@@ -60,7 +61,7 @@ public final class ComputerResultStep<S> extends AbstractStep<ComputerResult, S>
public Iterator<Traverser.Admin<S>> attach(final Iterator<Traverser.Admin<S>> iterator, final Graph graph) {
return IteratorUtils.map(iterator, traverser -> {
traverser.setSideEffects(this.getTraversal().getSideEffects()); // necessary to ensure no NPE
- if (this.attachElements && (traverser.get() instanceof Attachable))
+ if (this.attachElements && (traverser.get() instanceof Attachable) && !(traverser.get() instanceof Property))
traverser.set((S) ((Attachable<Element>) traverser.get()).attach(Attachable.Method.get(graph)));
return traverser;
});
@@ -110,7 +111,7 @@ public final class ComputerResultStep<S> extends AbstractStep<ComputerResult, S>
@Override
public ComputerResultStep<S> clone() {
- final ComputerResultStep<S> clone = (ComputerResultStep<S>)super.clone();
+ final ComputerResultStep<S> clone = (ComputerResultStep<S>) super.clone();
clone.currentIterator = EmptyIterator.instance();
return clone;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/55e5559d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
index 42ab74b..314caf1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
@@ -87,7 +87,7 @@ final class GryoSerializers {
@Override
public void write(final Kryo kryo, final Output output, final Property property) {
- kryo.writeClassAndObject(output, DetachedFactory.detach(property));
+ kryo.writeClassAndObject(output, property instanceof VertexProperty ? DetachedFactory.detach((VertexProperty) property, true) : DetachedFactory.detach(property));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/55e5559d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
index 1c5ee92..419003a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
@@ -81,7 +81,7 @@ public class DetachedVertex extends DetachedElement<Vertex> implements Vertex {
this.properties = new HashMap<>();
properties.entrySet().stream().forEach(
entry -> this.properties.put(entry.getKey(), ((List<Map<String, Object>>) entry.getValue()).stream()
- .map(m -> (Property) new DetachedVertexProperty<>(m.get(ID), entry.getKey(), m.get(VALUE), (Map<String, Object>) m.getOrDefault(PROPERTIES, new HashMap<>()), this))
+ .map(m -> new DetachedVertexProperty<>(m.get(ID), entry.getKey(), m.get(VALUE), (Map<String, Object>) m.getOrDefault(PROPERTIES, new HashMap<>()), this))
.collect(Collectors.toList())));
}
}