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 2015/08/27 15:57:30 UTC
incubator-tinkerpop git commit: simplified AddPropertyStep where
Vertex typecast can be assumed from either cardinality or vertex meta
properties. TINKERPOP3-783 and TINKERPOP3-333 #references
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 7f8495cf5 -> eea0838af
simplified AddPropertyStep where Vertex typecast can be assumed from either cardinality or vertex meta properties. TINKERPOP3-783 and TINKERPOP3-333 #references
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/eea0838a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/eea0838a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/eea0838a
Branch: refs/heads/master
Commit: eea0838afb7073ad92fb11fe86292772c468c713
Parents: 7f8495c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Aug 27 07:57:20 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Aug 27 07:57:20 2015 -0600
----------------------------------------------------------------------
.../traversal/step/sideEffect/AddPropertyStep.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eea0838a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStep.java
index 3405ce9..02ac53c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStep.java
@@ -84,11 +84,11 @@ public final class AddPropertyStep<S extends Element> extends SideEffectStep<S>
final Object[] vertexPropertyKeyValues = this.parameters.getKeyValues(traverser, T.key, T.value);
final Element element = traverser.get();
- final boolean runtimeAsVertex = element instanceof Vertex;
+
if (this.callbackRegistry != null) {
final Property currentProperty = traverser.get().property(key);
- final boolean newProperty = runtimeAsVertex ? currentProperty == VertexProperty.empty() : currentProperty == Property.empty();
+ final boolean newProperty = element instanceof Vertex ? currentProperty == VertexProperty.empty() : currentProperty == Property.empty();
final Event.ElementPropertyChangedEvent evt;
if (element instanceof Vertex)
evt = new Event.VertexPropertyChangedEvent(DetachedFactory.detach((Vertex) element, true), newProperty ? null : DetachedFactory.detach((VertexProperty) currentProperty, true), value, vertexPropertyKeyValues);
@@ -104,8 +104,8 @@ public final class AddPropertyStep<S extends Element> extends SideEffectStep<S>
if (null != this.cardinality)
((Vertex) element).property(this.cardinality, key, value, vertexPropertyKeyValues);
- else if(runtimeAsVertex)
- ((Vertex)element).property(key,value,vertexPropertyKeyValues);
+ else if (vertexPropertyKeyValues.length > 0)
+ ((Vertex) element).property(key, value, vertexPropertyKeyValues);
else
element.property(key, value);
}
@@ -121,7 +121,6 @@ public final class AddPropertyStep<S extends Element> extends SideEffectStep<S>
return this.callbackRegistry;
}
-
@Override
public int hashCode() {
return super.hashCode() ^ this.parameters.hashCode() ^ ((null == this.cardinality) ? "null".hashCode() : this.cardinality.hashCode());
@@ -134,7 +133,7 @@ public final class AddPropertyStep<S extends Element> extends SideEffectStep<S>
@Override
public AddPropertyStep<S> clone() {
- final AddPropertyStep<S> clone = (AddPropertyStep<S>)super.clone();
+ final AddPropertyStep<S> clone = (AddPropertyStep<S>) super.clone();
clone.parameters = this.parameters.clone();
return clone;
}