You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/10/19 16:48:39 UTC
[1/2] accumulo git commit: ACCUMULO-4029 more better hashCode
Repository: accumulo
Updated Branches:
refs/heads/1.7 6b7333098 -> 1f28ee760
ACCUMULO-4029 more better hashCode
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5ca779a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ca779a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ca779a0
Branch: refs/heads/1.7
Commit: 5ca779a0e5c33f83a3215c0a0211d01747a0a19f
Parents: 3f1346c
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Oct 19 10:47:48 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Oct 19 10:47:48 2015 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 5b052c3..e4e229c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -598,7 +598,7 @@ public class Mutation implements Writable {
@Override
public int hashCode() {
- return toThrift(false).hashCode();
+ return serializedSnapshot().hashCode();
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5ca779a0/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
index 740baa7..21272ff 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
@@ -580,6 +580,8 @@ public class MutationTest {
assertEquals(m1, m1);
assertEquals(m1, m2);
assertEquals(m2, m1);
+ assertEquals(m2.hashCode(), m1.hashCode());
+ assertFalse(0 == m1.hashCode());
assertFalse(m1.equals(m3));
assertFalse(m3.equals(m1));
assertFalse(m1.equals(m4));
[2/2] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ec...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f28ee76
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f28ee76
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f28ee76
Branch: refs/heads/1.7
Commit: 1f28ee760f774e2453abde93dd912af3d01c5fa5
Parents: 6b73330 5ca779a
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Oct 19 10:47:59 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Oct 19 10:47:59 2015 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +-
core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f28ee76/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f28ee76/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
----------------------------------------------------------------------