Fix errors in Float and Double comparators

xinyunh · xinyunh · commit e48caf9c6d1b · 2015-08-19T14:40:07.000-07:00
diff --git a/src/main/scala/org/apache/spark/sql/hbase/util/comparators.scala b/src/main/scala/org/apache/spark/sql/hbase/util/comparators.scala
@@ -148,8 +148,11 @@ object LongComparator {
 
 class LongComparator(value: Array[Byte]) extends CustomComparator(value) {
   override def compareTo(value: HBaseRawType, offset: Int, length: Int): Int = {
-    (StringBytesUtils.toLong(this.value, 0, this.value.length) -
-      StringBytesUtils.toLong(value, offset, length)).toInt
+    val r = StringBytesUtils.toLong(this.value, 0, this.value.length) -
+      StringBytesUtils.toLong(value, offset, length)
+    if (r > 0) 1
+    else if (r == 0) 0
+    else -1
   }
 }
 
@@ -175,8 +178,11 @@ object DoubleComparator {
 
 class DoubleComparator(value: Array[Byte]) extends CustomComparator(value) {
   override def compareTo(value: HBaseRawType, offset: Int, length: Int): Int = {
-    (StringBytesUtils.toDouble(this.value, 0, this.value.length) -
-      StringBytesUtils.toDouble(value, offset, length)).toInt
+    val r = StringBytesUtils.toDouble(this.value, 0, this.value.length) -
+      StringBytesUtils.toDouble(value, offset, length)
+    if (r > 0) 1
+    else if (r == 0) 0
+    else -1
   }
 }
 
@@ -202,8 +208,11 @@ object FloatComparator {
 
 class FloatComparator(value: Array[Byte]) extends CustomComparator(value) {
   override def compareTo(value: HBaseRawType, offset: Int, length: Int): Int = {
-    (StringBytesUtils.toFloat(this.value, 0, this.value.length) -
-      StringBytesUtils.toFloat(value, offset, length)).toInt
+    val r = StringBytesUtils.toFloat(this.value, 0, this.value.length) -
+      StringBytesUtils.toFloat(value, offset, length)
+    if (r > 0) 1
+    else if (r == 0) 0
+    else -1
   }
 }
 
diff --git a/src/test/scala/org/apache/spark/sql/hbase/HBaseBasicOperationSuite.scala b/src/test/scala/org/apache/spark/sql/hbase/HBaseBasicOperationSuite.scala
@@ -77,7 +77,7 @@ class HBaseBasicOperationSuite extends TestBaseWithSplitData {
            |          col5 LONG, col6 FLOAT, col7 DOUBLE,
            |          PRIMARY KEY(col1))
            |          MAPPED BY (ht2, COLS=[col2=cf1.cq11, col3=cf1.cq12, col4=cf1.cq13,
-           |          col5=cf2.cq21, col6=cf2.cq22, col7=cf2.cq23])""".stripMargin
+           |          col5=cf2.cq21, col6=cf2.cq22, col7=cf2.cq23]) In StringFormat""".stripMargin
     )
 
     assert(sql( """SELECT * FROM tb1""").collect().length == 0)
@@ -86,15 +86,15 @@ class HBaseBasicOperationSuite extends TestBaseWithSplitData {
     sql( """INSERT INTO TABLE tb1 VALUES ("row3", true , 555 , 999  , 100000, 500.05, 10000.01)""")
     sql( """SELECT col1 FROM tb1 where col2<true order by col2""")
       .collect().zip(Seq("row1", "row2")).foreach{case (r,s) => assert(r.getString(0) == s)}
-    sql( """SELECT col1 FROM tb1 where col3>500 order by col3""")
+    sql( """SELECT * FROM tb1 where col3>500 order by col3""")
       .collect().zip(Seq("row3", "row1")).foreach{case (r,s) => assert(r.getString(0) == s)}
-    sql( """SELECT col1 FROM tb1 where col4>5000 order by col4""")
+    sql( """SELECT * FROM tb1 where col4>5000 order by col4""")
       .collect().zip(Seq("row1", "row2")).foreach{case (r,s) => assert(r.getString(0) == s)}
-    sql( """SELECT col1 FROM tb1 where col5>50000 order by col5""")
+    sql( """SELECT * FROM tb1 where col5>50000 order by col5""")
       .collect().zip(Seq("row3")).foreach{case (r,s) => assert(r.getString(0) == s)}
-    sql( """SELECT col1 FROM tb1 where col6>500 order by col6""")
+    sql( """SELECT * FROM tb1 where col6>500 order by col6""")
       .collect().zip(Seq("row3", "row2")).foreach{case (r,s) => assert(r.getString(0) == s)}
-    sql( """SELECT col1 FROM tb1 where col7>5000 order by col7""")
+    sql( """SELECT * FROM tb1 where col7>5000 order by col7""")
       .collect().zip(Seq("row2", "row3")).foreach{case (r,s) => assert(r.getString(0) == s)}
 
     sql( """DROP TABLE tb1""")

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,11 @@ object LongComparator {`
`148`	`148`
`149`	`149`	`class LongComparator(value: Array[Byte]) extends CustomComparator(value) {`
`150`	`150`	`override def compareTo(value: HBaseRawType, offset: Int, length: Int): Int = {`
`151`		`- (StringBytesUtils.toLong(this.value, 0, this.value.length) -`
`152`		`- StringBytesUtils.toLong(value, offset, length)).toInt`
	`151`	`+ val r = StringBytesUtils.toLong(this.value, 0, this.value.length) -`
	`152`	`+ StringBytesUtils.toLong(value, offset, length)`
	`153`	`+ if (r > 0) 1`
	`154`	`+ else if (r == 0) 0`
	`155`	`+ else -1`
`153`	`156`	`}`
`154`	`157`	`}`
`155`	`158`
`@@ -175,8 +178,11 @@ object DoubleComparator {`
`175`	`178`
`176`	`179`	`class DoubleComparator(value: Array[Byte]) extends CustomComparator(value) {`
`177`	`180`	`override def compareTo(value: HBaseRawType, offset: Int, length: Int): Int = {`
`178`		`- (StringBytesUtils.toDouble(this.value, 0, this.value.length) -`
`179`		`- StringBytesUtils.toDouble(value, offset, length)).toInt`
	`181`	`+ val r = StringBytesUtils.toDouble(this.value, 0, this.value.length) -`
	`182`	`+ StringBytesUtils.toDouble(value, offset, length)`
	`183`	`+ if (r > 0) 1`
	`184`	`+ else if (r == 0) 0`
	`185`	`+ else -1`
`180`	`186`	`}`
`181`	`187`	`}`
`182`	`188`
`@@ -202,8 +208,11 @@ object FloatComparator {`
`202`	`208`
`203`	`209`	`class FloatComparator(value: Array[Byte]) extends CustomComparator(value) {`
`204`	`210`	`override def compareTo(value: HBaseRawType, offset: Int, length: Int): Int = {`
`205`		`- (StringBytesUtils.toFloat(this.value, 0, this.value.length) -`
`206`		`- StringBytesUtils.toFloat(value, offset, length)).toInt`
	`211`	`+ val r = StringBytesUtils.toFloat(this.value, 0, this.value.length) -`
	`212`	`+ StringBytesUtils.toFloat(value, offset, length)`
	`213`	`+ if (r > 0) 1`
	`214`	`+ else if (r == 0) 0`
	`215`	`+ else -1`
`207`	`216`	`}`
`208`	`217`	`}`
`209`	`218`