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 2015/09/08 21:14:17 UTC
[29/50] incubator-tinkerpop git commit: fixed hashCode calculation
for AddPropertyStep
fixed hashCode calculation for AddPropertyStep
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bb78a643
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bb78a643
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bb78a643
Branch: refs/heads/TINKERPOP3-333
Commit: bb78a643e8855d33aabe947a3065ea0b9c54a923
Parents: 97fbdfa
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Sep 2 15:47:07 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Sep 2 15:47:07 2015 +0200
----------------------------------------------------------------------
.../process/traversal/step/sideEffect/AddPropertyStep.java | 3 ++-
.../gremlin/process/traversal/step/util/Parameters.java | 2 +-
.../process/traversal/step/sideEffect/AddPropertyStepTest.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb78a643/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 9ea7785..7c12c0e 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
@@ -123,7 +123,8 @@ public final class AddPropertyStep<S extends Element> extends SideEffectStep<S>
@Override
public int hashCode() {
- return super.hashCode() ^ this.parameters.hashCode() ^ ((null == this.cardinality) ? "null".hashCode() : this.cardinality.hashCode());
+ final int hash = super.hashCode() ^ this.parameters.hashCode();
+ return (null != this.cardinality) ? (hash ^ cardinality.hashCode()) : hash;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb78a643/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
index 01206d9..3f03b59 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
@@ -132,7 +132,7 @@ public final class Parameters implements Cloneable, Serializable {
for (final Map.Entry<Object, List<Object>> entry : this.parameters.entrySet()) {
result ^= entry.getKey().hashCode();
for (final Object value : entry.getValue()) {
- result ^= value.hashCode();
+ result ^= Integer.rotateLeft(value.hashCode(), entry.getKey().hashCode());
}
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb78a643/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepTest.java
index 4ecf311..6d141bc 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepTest.java
@@ -34,8 +34,8 @@ public class AddPropertyStepTest extends StepTest {
protected List<Traversal> getTraversals() {
return Arrays.asList(
__.property("x", 0),
- __.property("x", 1)
- //__.property("y", 0) // TODO: when this is 0 is breaks?! I think this is because of ^ and y being 1 away from x and 0 being one away from x.
+ __.property("x", 1),
+ __.property("y", 0)
);
}
}