You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/07/08 04:12:43 UTC
spark git commit: [SPARK-8878][SQL] Improve unit test coverage for
bitwise expressions.
Repository: spark
Updated Branches:
refs/heads/master 68a4a1697 -> 5d603dfe4
[SPARK-8878][SQL] Improve unit test coverage for bitwise expressions.
Author: Reynold Xin <rx...@databricks.com>
Closes #7273 from rxin/bitwise-unittest and squashes the following commits:
60c5667 [Reynold Xin] [SPARK-8878][SQL] Improve unit test coverage for bitwise expressions.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5d603dfe
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5d603dfe
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5d603dfe
Branch: refs/heads/master
Commit: 5d603dfe497ded78d8f09711578f1e764e6e4e91
Parents: 68a4a16
Author: Reynold Xin <rx...@databricks.com>
Authored: Tue Jul 7 19:12:40 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Tue Jul 7 19:12:40 2015 -0700
----------------------------------------------------------------------
.../expressions/BitwiseFunctionsSuite.scala | 108 +++++++++++--------
1 file changed, 61 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/5d603dfe/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseFunctionsSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseFunctionsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseFunctionsSuite.scala
index c9bbc7a..648fbf5 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseFunctionsSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseFunctionsSuite.scala
@@ -18,63 +18,77 @@
package org.apache.spark.sql.catalyst.expressions
import org.apache.spark.SparkFunSuite
-import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.types._
class BitwiseFunctionsSuite extends SparkFunSuite with ExpressionEvalHelper {
- test("Bitwise operations") {
- val row = create_row(1, 2, 3, null)
- val c1 = 'a.int.at(0)
- val c2 = 'a.int.at(1)
- val c3 = 'a.int.at(2)
- val c4 = 'a.int.at(3)
-
- checkEvaluation(BitwiseAnd(c1, c4), null, row)
- checkEvaluation(BitwiseAnd(c1, c2), 0, row)
- checkEvaluation(BitwiseAnd(c1, Literal.create(null, IntegerType)), null, row)
- checkEvaluation(
- BitwiseAnd(Literal.create(null, IntegerType), Literal.create(null, IntegerType)), null, row)
-
- checkEvaluation(BitwiseOr(c1, c4), null, row)
- checkEvaluation(BitwiseOr(c1, c2), 3, row)
- checkEvaluation(BitwiseOr(c1, Literal.create(null, IntegerType)), null, row)
- checkEvaluation(
- BitwiseOr(Literal.create(null, IntegerType), Literal.create(null, IntegerType)), null, row)
-
- checkEvaluation(BitwiseXor(c1, c4), null, row)
- checkEvaluation(BitwiseXor(c1, c2), 3, row)
- checkEvaluation(BitwiseXor(c1, Literal.create(null, IntegerType)), null, row)
- checkEvaluation(
- BitwiseXor(Literal.create(null, IntegerType), Literal.create(null, IntegerType)), null, row)
-
- checkEvaluation(BitwiseNot(c4), null, row)
- checkEvaluation(BitwiseNot(c1), -2, row)
- checkEvaluation(BitwiseNot(Literal.create(null, IntegerType)), null, row)
-
- checkEvaluation(c1 & c2, 0, row)
- checkEvaluation(c1 | c2, 3, row)
- checkEvaluation(c1 ^ c2, 3, row)
- checkEvaluation(~c1, -2, row)
+ test("BitwiseNOT") {
+ def check(input: Any, expected: Any): Unit = {
+ val expr = BitwiseNot(Literal(input))
+ assert(expr.dataType === Literal(input).dataType)
+ checkEvaluation(expr, expected)
+ }
+
+ check(1.toByte, ~1.toByte)
+ check(1000.toShort, ~1000.toShort)
+ check(1000000, ~1000000)
+ check(123456789123L, ~123456789123L)
+
+ checkEvaluation(BitwiseNot(Literal.create(null, IntegerType)), null)
}
- test("unary BitwiseNOT") {
- checkEvaluation(BitwiseNot(1), -2)
- assert(BitwiseNot(1).dataType === IntegerType)
- assert(BitwiseNot(1).eval(EmptyRow).isInstanceOf[Int])
+ test("BitwiseAnd") {
+ def check(input1: Any, input2: Any, expected: Any): Unit = {
+ val expr = BitwiseAnd(Literal(input1), Literal(input2))
+ assert(expr.dataType === Literal(input1).dataType)
+ checkEvaluation(expr, expected)
+ }
+
+ check(1.toByte, 2.toByte, 1.toByte & 2.toByte)
+ check(1000.toShort, 2.toShort, 1000.toShort & 2.toShort)
+ check(1000000, 4, 1000000 & 4)
+ check(123456789123L, 5L, 123456789123L & 5L)
+
+ val nullLit = Literal.create(null, IntegerType)
+ checkEvaluation(BitwiseAnd(nullLit, Literal(1)), null)
+ checkEvaluation(BitwiseAnd(Literal(1), nullLit), null)
+ checkEvaluation(BitwiseAnd(nullLit, nullLit), null)
+ }
- checkEvaluation(BitwiseNot(1.toLong), -2.toLong)
- assert(BitwiseNot(1.toLong).dataType === LongType)
- assert(BitwiseNot(1.toLong).eval(EmptyRow).isInstanceOf[Long])
+ test("BitwiseOr") {
+ def check(input1: Any, input2: Any, expected: Any): Unit = {
+ val expr = BitwiseOr(Literal(input1), Literal(input2))
+ assert(expr.dataType === Literal(input1).dataType)
+ checkEvaluation(expr, expected)
+ }
- checkEvaluation(BitwiseNot(1.toShort), -2.toShort)
- assert(BitwiseNot(1.toShort).dataType === ShortType)
- assert(BitwiseNot(1.toShort).eval(EmptyRow).isInstanceOf[Short])
+ check(1.toByte, 2.toByte, 1.toByte | 2.toByte)
+ check(1000.toShort, 2.toShort, 1000.toShort | 2.toShort)
+ check(1000000, 4, 1000000 | 4)
+ check(123456789123L, 5L, 123456789123L | 5L)
- checkEvaluation(BitwiseNot(1.toByte), -2.toByte)
- assert(BitwiseNot(1.toByte).dataType === ByteType)
- assert(BitwiseNot(1.toByte).eval(EmptyRow).isInstanceOf[Byte])
+ val nullLit = Literal.create(null, IntegerType)
+ checkEvaluation(BitwiseOr(nullLit, Literal(1)), null)
+ checkEvaluation(BitwiseOr(Literal(1), nullLit), null)
+ checkEvaluation(BitwiseOr(nullLit, nullLit), null)
}
+ test("BitwiseXor") {
+ def check(input1: Any, input2: Any, expected: Any): Unit = {
+ val expr = BitwiseXor(Literal(input1), Literal(input2))
+ assert(expr.dataType === Literal(input1).dataType)
+ checkEvaluation(expr, expected)
+ }
+
+ check(1.toByte, 2.toByte, 1.toByte ^ 2.toByte)
+ check(1000.toShort, 2.toShort, 1000.toShort ^ 2.toShort)
+ check(1000000, 4, 1000000 ^ 4)
+ check(123456789123L, 5L, 123456789123L ^ 5L)
+
+ val nullLit = Literal.create(null, IntegerType)
+ checkEvaluation(BitwiseXor(nullLit, Literal(1)), null)
+ checkEvaluation(BitwiseXor(Literal(1), nullLit), null)
+ checkEvaluation(BitwiseXor(nullLit, nullLit), null)
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org