Skip to content

[SPARK-19710][SQL][TESTS] Fix ordering of rows in query results #17039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robbinspg wants to merge 13 commits into from
Closed

[SPARK-19710][SQL][TESTS] Fix ordering of rows in query results #17039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fbc46a6
o.a.s.unsafe.types.UTF8StringSuite.writeToOutputStreamIntArray test
robbinspg Dec 21, 2016
30e20be
Simplify setting of byte order
robbinspg Dec 22, 2016
145c76a
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Dec 22, 2016
f0e77f2
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Dec 23, 2016
1bc1adf
remove redundant comment
robbinspg Dec 23, 2016
ea259fc
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Jan 3, 2017
f4b76a7
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Feb 3, 2017
b5571ea
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Feb 13, 2017
1917773
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Feb 14, 2017
a832b74
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Feb 20, 2017
bafe31c
Merge branch 'master' of https://github.com/apache/spark.git
robbinspg Feb 23, 2017
950415f
Update tests to produce reliably ordered results
robbinspg Feb 23, 2017
4a4d7ad
remove unnecessary ordering
robbinspg Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-joins.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ GROUP BY t1a,
t3a,
t3b,
t3c
ORDER BY t1a DESC;
ORDER BY t1a DESC, t3b DESC;

-- TC 01.03
SELECT Count(DISTINCT(t1a))
Expand Down
6 changes: 3 additions & 3 deletions sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-set-operations.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ WHERE t1a IN (SELECT t3a
WHERE t1b > 6) AS t5)
GROUP BY t1a, t1b, t1c, t1d
HAVING t1c IS NOT NULL AND t1b IS NOT NULL
ORDER BY t1c DESC;
ORDER BY t1c DESC, t1a DESC;

-- TC 01.08
SELECT t1a,
Expand Down Expand Up @@ -351,7 +351,7 @@ WHERE t1b IN
FROM t1
WHERE t1b > 6) AS t4
WHERE t2b = t1b)
ORDER BY t1c DESC NULLS last;
ORDER BY t1c DESC NULLS last, t1a DESC;

-- TC 01.11
SELECT *
Expand Down Expand Up @@ -468,5 +468,5 @@ HAVING t1b NOT IN
EXCEPT
SELECT t3b
FROM t3)
ORDER BY t1c DESC NULLS LAST;
ORDER BY t1c DESC NULLS LAST, t1i;

2 changes: 1 addition & 1 deletion sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/not-in-joins.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ AND t1b != t3b
AND t1d = t2d
GROUP BY t1a, t1b, t1c, t3a, t3b, t3c
HAVING count(distinct(t3a)) >= 1
ORDER BY t1a;
ORDER BY t1a, t3b;

-- TC 01.03
SELECT t1a,
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-joins.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ GROUP BY t1a,
t3a,
t3b,
t3c
ORDER BY t1a DESC
ORDER BY t1a DESC, t3b DESC
-- !query 4 schema
struct<count(DISTINCT t1a):bigint,t1b:smallint,t3a:string,t3b:smallint,t3c:int>
-- !query 4 output
Expand Down
10 changes: 5 additions & 5 deletions sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-set-operations.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ WHERE t1a IN (SELECT t3a
WHERE t1b > 6) AS t5)
GROUP BY t1a, t1b, t1c, t1d
HAVING t1c IS NOT NULL AND t1b IS NOT NULL
ORDER BY t1c DESC
ORDER BY t1c DESC, t1a DESC
-- !query 9 schema
struct<t1a:string,t1b:smallint,t1c:int,t1d:bigint>
-- !query 9 output
Expand Down Expand Up @@ -445,7 +445,7 @@ WHERE t1b IN
FROM t1
WHERE t1b > 6) AS t4
WHERE t2b = t1b)
ORDER BY t1c DESC NULLS last
ORDER BY t1c DESC NULLS last, t1a DESC
-- !query 12 schema
struct<t1a:string,t1b:smallint,t1c:int>
-- !query 12 output
Expand Down Expand Up @@ -580,16 +580,16 @@ HAVING t1b NOT IN
EXCEPT
SELECT t3b
FROM t3)
ORDER BY t1c DESC NULLS LAST
ORDER BY t1c DESC NULLS LAST, t1i
-- !query 15 schema
struct<count(DISTINCT t1a):bigint,t1b:smallint,t1c:int,t1i:date>
-- !query 15 output
1 8 16 2014-05-05
1 8 16 2014-05-04
1 8 16 2014-05-05
1 16 12 2014-06-04
1 16 12 2014-07-04
1 6 8 2014-04-04
1 10 NULL 2014-05-04
1 10 NULL 2014-08-04
1 10 NULL 2014-09-04
1 10 NULL 2015-05-04
1 10 NULL 2014-05-04
4 changes: 2 additions & 2 deletions sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/not-in-joins.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ AND t1b != t3b
AND t1d = t2d
GROUP BY t1a, t1b, t1c, t3a, t3b, t3c
HAVING count(distinct(t3a)) >= 1
ORDER BY t1a
ORDER BY t1a, t3b
-- !query 4 schema
struct<t1a:string,t1b:smallint,t1c:int,count(DISTINCT t3a):bigint,t3b:smallint,t3c:int>
-- !query 4 output
val1c 8 16 1 10 12
val1c 8 16 1 6 12
val1c 8 16 1 10 12
val1c 8 16 1 17 16


Expand Down