aboutsummaryrefslogtreecommitdiff
path: root/sql/core
diff options
context:
space:
mode:
authorzhichao.li <zhichao.li@intel.com>2015-07-03 15:39:16 -0700
committerDavies Liu <davies.liu@gmail.com>2015-07-03 15:39:16 -0700
commitab535b9a1dab40ea7335ff9abb9b522fc2b5ed66 (patch)
tree45bbfbecf27e9875da72a1b0a036500746c63c21 /sql/core
parent2848f4da47d5c395de93ab9960bd905edfbd3439 (diff)
downloadspark-ab535b9a1dab40ea7335ff9abb9b522fc2b5ed66.tar.gz
spark-ab535b9a1dab40ea7335ff9abb9b522fc2b5ed66.tar.bz2
spark-ab535b9a1dab40ea7335ff9abb9b522fc2b5ed66.zip
[SPARK-8226] [SQL] Add function shiftrightunsigned
Author: zhichao.li <zhichao.li@intel.com> Closes #7035 from zhichao-li/shiftRightUnsigned and squashes the following commits: 6bcca5a [zhichao.li] change coding style 3e9f5ae [zhichao.li] python style d85ae0b [zhichao.li] add shiftrightunsigned
Diffstat (limited to 'sql/core')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/functions.scala20
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/MathExpressionsSuite.scala17
2 files changed, 37 insertions, 0 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
index 0d5d49c3dd..4b70dc5fdd 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
@@ -1344,6 +1344,26 @@ object functions {
def shiftRight(e: Column, numBits: Int): Column = ShiftRight(e.expr, lit(numBits).expr)
/**
+ * Unsigned shift the the given value numBits right. If the given value is a long value,
+ * it will return a long value else it will return an integer value.
+ *
+ * @group math_funcs
+ * @since 1.5.0
+ */
+ def shiftRightUnsigned(columnName: String, numBits: Int): Column =
+ shiftRightUnsigned(Column(columnName), numBits)
+
+ /**
+ * Unsigned shift the the given value numBits right. If the given value is a long value,
+ * it will return a long value else it will return an integer value.
+ *
+ * @group math_funcs
+ * @since 1.5.0
+ */
+ def shiftRightUnsigned(e: Column, numBits: Int): Column =
+ ShiftRightUnsigned(e.expr, lit(numBits).expr)
+
+ /**
* Shift the the given value numBits right. If the given value is a long value, it will return
* a long value else it will return an integer value.
*
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/MathExpressionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/MathExpressionsSuite.scala
index dc8f994adb..24bef21b99 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/MathExpressionsSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/MathExpressionsSuite.scala
@@ -304,6 +304,23 @@ class MathExpressionsSuite extends QueryTest {
Row(21.toLong, 21, 21.toShort, 21.toByte, null))
}
+ test("shift right unsigned") {
+ val df = Seq[(Long, Integer, Short, Byte, Integer, Integer)]((-42, 42, 42, 42, 42, null))
+ .toDF("a", "b", "c", "d", "e", "f")
+
+ checkAnswer(
+ df.select(
+ shiftRightUnsigned('a, 1), shiftRightUnsigned('b, 1), shiftRightUnsigned('c, 1),
+ shiftRightUnsigned('d, 1), shiftRightUnsigned('f, 1)),
+ Row(9223372036854775787L, 21, 21.toShort, 21.toByte, null))
+
+ checkAnswer(
+ df.selectExpr(
+ "shiftRightUnsigned(a, 1)", "shiftRightUnsigned(b, 1)", "shiftRightUnsigned(c, 1)",
+ "shiftRightUnsigned(d, 1)", "shiftRightUnsigned(f, 1)"),
+ Row(9223372036854775787L, 21, 21.toShort, 21.toByte, null))
+ }
+
test("binary log") {
val df = Seq[(Integer, Integer)]((123, null)).toDF("a", "b")
checkAnswer(