address review comments

apache · Jul 14, 2017 · 08776e1 · 08776e1
1 parent e33ec8e
commit 08776e1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.../src/test/scala/org/apache/spark/util/collection/unsafe/sort/PrefixComparatorsSuite.scala b/.../src/test/scala/org/apache/spark/util/collection/unsafe/sort/PrefixComparatorsSuite.scala
@@ -82,6 +82,19 @@ class PrefixComparatorsSuite extends SparkFunSuite with PropertyChecks {
         (prefixComparisonResult > 0 && compareBinary(x, y) > 0))
     }
 
+    val binaryRegressionTests = Seq(
+      (Array[Byte](1), Array[Byte](-1)),
+      (Array[Byte](1, 1, 1, 1, 1), Array[Byte](1, 1, 1, 1, -1)),
+      (Array[Byte](1, 1, 1, 1, 1, 1, 1, 1, 1), Array[Byte](1, 1, 1, 1, 1, 1, 1, 1, -1)),
+      (Array[Byte](1), Array[Byte](1, 1, 1, 1)),
+      (Array[Byte](1, 1, 1, 1, 1), Array[Byte](1, 1, 1, 1, 1, 1, 1, 1, 1)),
+      (Array[Byte](-1), Array[Byte](-1, -1, -1, -1)),
+      (Array[Byte](-1, -1, -1, -1, -1), Array[Byte](-1, -1, -1, -1, -1, -1, -1, -1, -1))
+    )
+    binaryRegressionTests.foreach { case (b1, b2) =>
+      testPrefixComparison(b1, b2)
+    }
+
     // scalastyle:off
     val regressionTests = Table(
       ("s1", "s2"),

diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/OrderingSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/OrderingSuite.scala
@@ -145,13 +145,10 @@ class OrderingSuite extends SparkFunSuite with ExpressionEvalHelper {
       (Array[Byte](1, 1, 1, 1, 1, 1, 1, 1, 1), Array[Byte](1, 1, 1, 1, 1, 1, 1, 1, -1))
       )
     data.foreach { case (b1, b2) =>
-      val rowOrdering = InterpretedOrdering.forSchema(Seq(BinaryType, BinaryType))
+      val rowOrdering = InterpretedOrdering.forSchema(Seq(BinaryType))
       val genOrdering = GenerateOrdering.generate(
-        BoundReference(0, BinaryType, nullable = true).asc ::
-          BoundReference(1, BinaryType, nullable = true).asc :: Nil)
-      val rowType = StructType(
-        StructField("b1", BinaryType, nullable = true) ::
-          StructField("b2", BinaryType, nullable = true) :: Nil)
+        BoundReference(0, BinaryType, nullable = true).asc :: Nil)
+      val rowType = StructType(StructField("b", BinaryType, nullable = true) :: Nil)
       val toCatalyst = CatalystTypeConverters.createToCatalystConverter(rowType)
       val rowB1 = toCatalyst(Row(b1)).asInstanceOf[InternalRow]
       val rowB2 = toCatalyst(Row(b2)).asInstanceOf[InternalRow]