From 13eb37c860c8f672d0e9d9065d0333f981db71e3 Mon Sep 17 00:00:00 2001
From: hyukjinkwon <gurwls223@gmail.com>
Date: Wed, 3 May 2017 13:08:25 -0700
Subject: [PATCH] [MINOR][SQL] Fix the test title from =!= to <=>, remove a
duplicated test and add a test for =!=
## What changes were proposed in this pull request?
This PR proposes three things as below:
- This test looks not testing `<=>` and identical with the test above, `===`. So, it removes the test.
```diff
- test("<=>") {
- checkAnswer(
- testData2.filter($"a" === 1),
- testData2.collect().toSeq.filter(r => r.getInt(0) == 1))
-
- checkAnswer(
- testData2.filter($"a" === $"b"),
- testData2.collect().toSeq.filter(r => r.getInt(0) == r.getInt(1)))
- }
```
- Replace the test title from `=!=` to `<=>`. It looks the test actually testing `<=>`.
```diff
+ private lazy val nullData = Seq(
+ (Some(1), Some(1)), (Some(1), Some(2)), (Some(1), None), (None, None)).toDF("a", "b")
+
...
- test("=!=") {
+ test("<=>") {
- val nullData = spark.createDataFrame(sparkContext.parallelize(
- Row(1, 1) ::
- Row(1, 2) ::
- Row(1, null) ::
- Row(null, null) :: Nil),
- StructType(Seq(StructField("a", IntegerType), StructField("b", IntegerType))))
-
checkAnswer(
nullData.filter($"b" <=> 1),
...
```
- Add the tests for `=!=` which looks not existing.
```diff
+ test("=!=") {
+ checkAnswer(
+ nullData.filter($"b" =!= 1),
+ Row(1, 2) :: Nil)
+
+ checkAnswer(nullData.filter($"b" =!= null), Nil)
+
+ checkAnswer(
+ nullData.filter($"a" =!= $"b"),
+ Row(1, 2) :: Nil)
+ }
```
## How was this patch tested?
Manually running the tests.
Author: hyukjinkwon <gurwls223@gmail.com>
Closes #17842 from HyukjinKwon/minor-test-fix.
---
.../spark/sql/ColumnExpressionSuite.scala | 31 +++++++++----------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
index b0f398dab7..bc708ca88d 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/ColumnExpressionSuite.scala
@@ -39,6 +39,9 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
StructType(Seq(StructField("a", BooleanType), StructField("b", BooleanType))))
}
+ private lazy val nullData = Seq(
+ (Some(1), Some(1)), (Some(1), Some(2)), (Some(1), None), (None, None)).toDF("a", "b")
+
test("column names with space") {
val df = Seq((1, "a")).toDF("name with space", "name.with.dot")
@@ -283,23 +286,6 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
}
test("<=>") {
- checkAnswer(
- testData2.filter($"a" === 1),
- testData2.collect().toSeq.filter(r => r.getInt(0) == 1))
-
- checkAnswer(
- testData2.filter($"a" === $"b"),
- testData2.collect().toSeq.filter(r => r.getInt(0) == r.getInt(1)))
- }
-
- test("=!=") {
- val nullData = spark.createDataFrame(sparkContext.parallelize(
- Row(1, 1) ::
- Row(1, 2) ::
- Row(1, null) ::
- Row(null, null) :: Nil),
- StructType(Seq(StructField("a", IntegerType), StructField("b", IntegerType))))
-
checkAnswer(
nullData.filter($"b" <=> 1),
Row(1, 1) :: Nil)
@@ -321,7 +307,18 @@ class ColumnExpressionSuite extends QueryTest with SharedSQLContext {
checkAnswer(
nullData2.filter($"a" <=> null),
Row(null) :: Nil)
+ }
+ test("=!=") {
+ checkAnswer(
+ nullData.filter($"b" =!= 1),
+ Row(1, 2) :: Nil)
+
+ checkAnswer(nullData.filter($"b" =!= null), Nil)
+
+ checkAnswer(
+ nullData.filter($"a" =!= $"b"),
+ Row(1, 2) :: Nil)
}
test(">") {
--
GitLab