Apply comments

maropu · maropu · commit 30d28bcd4537 · 2016-06-23T00:30:51.000+09:00
diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeMapData.java b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeMapData.java
@@ -21,6 +21,8 @@
 
 import org.apache.spark.sql.catalyst.util.MapData;
 import org.apache.spark.unsafe.Platform;
+import org.apache.spark.unsafe.array.ByteArrayMethods;
+import org.apache.spark.unsafe.hash.Murmur3_x86_32;
 
 /**
  * An Unsafe implementation of Map which is backed by raw memory instead of Java objects.
@@ -120,17 +122,18 @@ public UnsafeMapData copy() {
   }
 
   @Override
-  public boolean equals(Object o) {
-    if (o instanceof UnsafeMapData) {
-      UnsafeMapData other = (UnsafeMapData) o;
-      return this.keyArray().equals(other.keyArray()) &&
-        this.valueArray().equals(other.valueArray());
+  public boolean equals(Object other) {
+    if (other instanceof UnsafeMapData) {
+      UnsafeMapData o = (UnsafeMapData) other;
+      return sizeInBytes == o.sizeInBytes &&
+        ByteArrayMethods.arrayEquals(baseObject, baseOffset, o.baseObject, o.baseOffset,
+                sizeInBytes);
     }
     return false;
   }
 
   @Override
   public int hashCode() {
-    return keyArray().hashCode() * 37 + valueArray().hashCode();
+    return Murmur3_x86_32.hashUnsafeBytes(baseObject, baseOffset, sizeInBytes, 42);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`
`22`	`22`	`import org.apache.spark.sql.catalyst.util.MapData;`
`23`	`23`	`import org.apache.spark.unsafe.Platform;`
	`24`	`+import org.apache.spark.unsafe.array.ByteArrayMethods;`
	`25`	`+import org.apache.spark.unsafe.hash.Murmur3_x86_32;`
`24`	`26`
`25`	`27`	`/**`
`26`	`28`	`* An Unsafe implementation of Map which is backed by raw memory instead of Java objects.`
`@@ -120,17 +122,18 @@ public UnsafeMapData copy() {`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`@Override`
`123`		`- public boolean equals(Object o) {`
`124`		`- if (o instanceof UnsafeMapData) {`
`125`		`- UnsafeMapData other = (UnsafeMapData) o;`
`126`		`- return this.keyArray().equals(other.keyArray()) &&`
`127`		`- this.valueArray().equals(other.valueArray());`
	`125`	`+ public boolean equals(Object other) {`
	`126`	`+ if (other instanceof UnsafeMapData) {`
	`127`	`+ UnsafeMapData o = (UnsafeMapData) other;`
	`128`	`+ return sizeInBytes == o.sizeInBytes &&`
	`129`	`+ ByteArrayMethods.arrayEquals(baseObject, baseOffset, o.baseObject, o.baseOffset,`
	`130`	`+ sizeInBytes);`
`128`	`131`	`}`
`129`	`132`	`return false;`
`130`	`133`	`}`
`131`	`134`
`132`	`135`	`@Override`
`133`	`136`	`public int hashCode() {`
`134`		`- return keyArray().hashCode() * 37 + valueArray().hashCode();`
	`137`	`+ return Murmur3_x86_32.hashUnsafeBytes(baseObject, baseOffset, sizeInBytes, 42);`
`135`	`138`	`}`
`136`	`139`	`}`