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 2017/10/19 19:45:56 UTC
tinkerpop git commit: fixed a bug with the PropertiesStep test. We
have a serialization issue (have always had it) where we don't couple the
Vertex with the VertexProperty. Thus,
StartStep has to be smart about not trying to attach VertexProperties. CTR.
Repository: tinkerpop
Updated Branches:
refs/heads/master c12f45ca9 -> a11088ba4
fixed a bug with the PropertiesStep test. We have a serialization issue (have always had it) where we don't couple the Vertex with the VertexProperty. Thus, StartStep has to be smart about not trying to attach VertexProperties. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a11088ba
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a11088ba
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a11088ba
Branch: refs/heads/master
Commit: a11088ba42b158648576cb77d6275d783440ad23
Parents: c12f45c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Oct 19 13:45:53 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Oct 19 13:45:53 2017 -0600
----------------------------------------------------------------------
.../process/traversal/step/sideEffect/StartStep.java | 5 ++++-
.../gremlin/python/jsr223/PythonTranslator.java | 11 +++++------
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a11088ba/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StartStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StartStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StartStep.java
index 77d4a48..329f84b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StartStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StartStep.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -68,7 +69,9 @@ public class StartStep<S> extends AbstractStep<S, S> {
}
///
final Traverser.Admin<S> start = this.starts.next();
- if (start.get() instanceof Attachable && this.getTraversal().getGraph().isPresent())
+ if (start.get() instanceof Attachable &&
+ this.getTraversal().getGraph().isPresent() &&
+ (!(start.get() instanceof VertexProperty) || null != ((VertexProperty) start.get()).element()))
start.set(((Attachable<S>) start.get()).attach(Attachable.Method.get(this.getTraversal().getGraph().get())));
return start;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a11088ba/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
index 1fb98a1..568ca03 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
@@ -26,7 +26,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
@@ -196,11 +195,11 @@ public class PythonTranslator implements Translator.ScriptTranslator {
return "Vertex(" + convertToString(vertex.id()) + "," + convertToString(vertex.label()) + ")";
} else if (object instanceof Edge) {
final Edge edge = (Edge) object;
- return "Edge(" + convertToString(edge.id()) + ", " +
- "Vertex(" + convertToString(edge.outVertex().id()) + ")," +
- convertToString(edge.label()) +
- ",Vertex(" + convertToString(edge.inVertex().id()) + "))";
- } else { // VertexProperty
+ return "Edge(" + convertToString(edge.id()) + "," +
+ convertToString(edge.outVertex()) + "," +
+ convertToString(edge.label()) + "," +
+ convertToString(edge.inVertex()) + ")";
+ } else {
final VertexProperty vertexProperty = (VertexProperty) object;
return "VertexProperty(" + convertToString(vertexProperty.id()) + "," +
convertToString(vertexProperty.label()) + "," +