You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2020/07/02 12:14:02 UTC
[spark] branch branch-2.4 updated: [MINOR][TEST][SQL] Make
in-limit.sql more robust
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 2227a16 [MINOR][TEST][SQL] Make in-limit.sql more robust
2227a16 is described below
commit 2227a166782797f0e47a5d850b9713829300a466
Author: Wenchen Fan <we...@databricks.com>
AuthorDate: Thu Jul 2 21:04:26 2020 +0900
[MINOR][TEST][SQL] Make in-limit.sql more robust
### What changes were proposed in this pull request?
For queries like `t1d in (SELECT t2d FROM t2 ORDER BY t2c LIMIT 2)`, the result can be non-deterministic as the result of the subquery may output different results (it's not sorted by `t2d` and it has shuffle).
This PR makes the test more robust by sorting the output column.
### Why are the changes needed?
avoid flaky test
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
N/A
Closes #28976 from cloud-fan/small.
Authored-by: Wenchen Fan <we...@databricks.com>
Signed-off-by: HyukjinKwon <gu...@apache.org>
(cherry picked from commit f83415629b18d628f72a32285f0afc24f29eaa1e)
Signed-off-by: HyukjinKwon <gu...@apache.org>
---
.../test/resources/sql-tests/inputs/subquery/in-subquery/in-limit.sql | 4 ++--
.../resources/sql-tests/results/subquery/in-subquery/in-limit.sql.out | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-limit.sql b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-limit.sql
index a40ee08..a3cab37 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-limit.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-limit.sql
@@ -72,7 +72,7 @@ SELECT Count(DISTINCT( t1a )),
FROM t1
WHERE t1d IN (SELECT t2d
FROM t2
- ORDER BY t2c
+ ORDER BY t2c, t2d
LIMIT 2)
GROUP BY t1b
ORDER BY t1b DESC NULLS FIRST
@@ -93,7 +93,7 @@ SELECT Count(DISTINCT( t1a )),
FROM t1
WHERE t1d NOT IN (SELECT t2d
FROM t2
- ORDER BY t2b DESC nulls first
+ ORDER BY t2b DESC nulls first, t2d
LIMIT 1)
GROUP BY t1b
ORDER BY t1b NULLS last
diff --git a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-limit.sql.out b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-limit.sql.out
index 71ca1f8..cde1577 100644
--- a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-limit.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-limit.sql.out
@@ -103,7 +103,7 @@ SELECT Count(DISTINCT( t1a )),
FROM t1
WHERE t1d IN (SELECT t2d
FROM t2
- ORDER BY t2c
+ ORDER BY t2c, t2d
LIMIT 2)
GROUP BY t1b
ORDER BY t1b DESC NULLS FIRST
@@ -136,7 +136,7 @@ SELECT Count(DISTINCT( t1a )),
FROM t1
WHERE t1d NOT IN (SELECT t2d
FROM t2
- ORDER BY t2b DESC nulls first
+ ORDER BY t2b DESC nulls first, t2d
LIMIT 1)
GROUP BY t1b
ORDER BY t1b NULLS last
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org