This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 5c3ef795448 [SPARK-37960][SQL][FOLLOWUP] Make the testing CASE WHEN
query more reasonable
5c3ef795448 is described below
commit 5c3ef79544814473e49d356f36cf100aca9afe57
Author: Jiaan Geng <[email protected]>
AuthorDate: Mon Apr 11 13:48:07 2022 +0800
[SPARK-37960][SQL][FOLLOWUP] Make the testing CASE WHEN query more
reasonable
### What changes were proposed in this pull request?
Some testing CASE WHEN queries are not carefully written and do not make
sense. In the future, the optimizer may get smarter and get rid of the CASE
WHEN completely, and then we loose test coverage.
This PR updates some CASE WHEN queries to make them more reasonable.
### Why are the changes needed?
future-proof test coverage.
### Does this PR introduce _any_ user-facing change?
'No'.
### How was this patch tested?
N/A
Closes #36125 from beliefer/SPARK-37960_followup3.
Authored-by: Jiaan Geng <[email protected]>
Signed-off-by: Wenchen Fan <[email protected]>
(cherry picked from commit 4e118383f58d23d5515ce6b00d3935e3ac51fb03)
Signed-off-by: Wenchen Fan <[email protected]>
---
.../src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala
index 6a0a55b7788..23138b8899b 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala
@@ -889,10 +889,10 @@ class JDBCV2Suite extends QueryTest with
SharedSparkSession with ExplainSuiteHel
| COUNT(CASE WHEN SALARY >= 12000 OR SALARY < 9000 THEN SALARY ELSE 0
END),
| COUNT(CASE WHEN SALARY >= 12000 OR NOT(SALARY >= 9000) THEN SALARY
ELSE 0 END),
| MAX(CASE WHEN NOT(SALARY > 10000) AND SALARY >= 8000 THEN SALARY
ELSE 0 END),
- | MAX(CASE WHEN NOT(SALARY > 10000) OR SALARY > 8000 THEN SALARY ELSE
0 END),
+ | MAX(CASE WHEN NOT(SALARY > 9000) OR SALARY > 10000 THEN SALARY ELSE
0 END),
| MAX(CASE WHEN NOT(SALARY > 10000) AND NOT(SALARY < 8000) THEN
SALARY ELSE 0 END),
| MAX(CASE WHEN NOT(SALARY != 0) OR NOT(SALARY < 8000) THEN SALARY
ELSE 0 END),
- | MAX(CASE WHEN NOT(SALARY > 8000 AND SALARY > 8000) THEN 0 ELSE
SALARY END),
+ | MAX(CASE WHEN NOT(SALARY > 8000 AND SALARY < 10000) THEN 0 ELSE
SALARY END),
| MIN(CASE WHEN NOT(SALARY > 8000 OR SALARY IS NULL) THEN SALARY ELSE
0 END),
| SUM(CASE WHEN SALARY > 10000 THEN 2 WHEN SALARY > 8000 THEN 1 END),
| AVG(CASE WHEN NOT(SALARY > 8000 OR SALARY IS NOT NULL) THEN SALARY
ELSE 0 END)
@@ -904,9 +904,9 @@ class JDBCV2Suite extends QueryTest with SharedSparkSession
with ExplainSuiteHel
" THEN SALARY ELSE 0.00 END), COUNT(CAS..., " +
"PushedFilters: [], " +
"PushedGroupByColumns: [DEPT], ")
- checkAnswer(df, Seq(Row(1, 1, 1, 1, 1, 0d, 12000d, 0d, 12000d, 12000d, 0d,
2, 0d),
- Row(2, 2, 2, 2, 2, 10000d, 10000d, 10000d, 10000d, 10000d, 0d, 2, 0d),
- Row(2, 2, 2, 2, 2, 10000d, 12000d, 10000d, 12000d, 12000d, 0d, 3, 0d)))
+ checkAnswer(df, Seq(Row(1, 1, 1, 1, 1, 0d, 12000d, 0d, 12000d, 0d, 0d, 2,
0d),
+ Row(2, 2, 2, 2, 2, 10000d, 12000d, 10000d, 12000d, 0d, 0d, 3, 0d),
+ Row(2, 2, 2, 2, 2, 10000d, 9000d, 10000d, 10000d, 9000d, 0d, 2, 0d)))
}
test("scan with aggregate push-down: aggregate function with binary
arithmetic") {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
