Apply comments

maropu · maropu · commit fe6f31b23cd6 · 2015-08-05T16:22:49.000+09:00
diff --git a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/PrefixComparators.java b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/PrefixComparators.java
@@ -75,9 +75,9 @@ public static long computePrefix(byte[] bytes) {
          */
         final int minLen = Math.min(bytes.length, 8);
         long p = 0;
-        for (int i = 1; i <= minLen; ++i) {
-          p |= (128L + PlatformDependent.UNSAFE.getByte(bytes, BYTE_ARRAY_OFFSET + i - 1))
-              << (64 - 8 * i);
+        for (int i = 0; i < minLen; ++i) {
+          p |= (128L + PlatformDependent.UNSAFE.getByte(bytes, BYTE_ARRAY_OFFSET + i))
+              << (56 - 8 * i);
         }
         return p;
       }
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala
@@ -78,7 +78,7 @@ case class SortPrefix(child: SortOrder) extends UnaryExpression {
         (DoublePrefixComparator.computePrefix(Double.NegativeInfinity),
           s"$DoublePrefixCmp.computePrefix((double)$input)")
       case StringType => (0L, s"$input.getPrefix()")
-      case BinaryType => (0L, s"$BinaryPrefixCmp.computePrefix((byte[])$input)")
+      case BinaryType => (0L, s"$BinaryPrefixCmp.computePrefix($input)")
       case dt: DecimalType if dt.precision - dt.scale <= Decimal.MAX_LONG_DIGITS =>
         val prefix = if (dt.precision <= Decimal.MAX_LONG_DIGITS) {
           s"$input.toUnscaledLong()"

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,9 @@ public static long computePrefix(byte[] bytes) {`
`75`	`75`	`*/`
`76`	`76`	`final int minLen = Math.min(bytes.length, 8);`
`77`	`77`	`long p = 0;`
`78`		`- for (int i = 1; i <= minLen; ++i) {`
`79`		`- p \|= (128L + PlatformDependent.UNSAFE.getByte(bytes, BYTE_ARRAY_OFFSET + i - 1))`
`80`		`- << (64 - 8 * i);`
	`78`	`+ for (int i = 0; i < minLen; ++i) {`
	`79`	`+ p \|= (128L + PlatformDependent.UNSAFE.getByte(bytes, BYTE_ARRAY_OFFSET + i))`
	`80`	`+ << (56 - 8 * i);`
`81`	`81`	`}`
`82`	`82`	`return p;`
`83`	`83`	`}`