From 4152b9f29545c826ea04e25fa0fed74a75f1efbf Mon Sep 17 00:00:00 2001
From: Jason Petersen <jason@citusdata.com>
Date: Wed, 5 Oct 2016 10:49:06 -0600
Subject: [PATCH] Fix arbitrary order issues

Simply added some ORDER BYs.
---
 .../regress/expected/multi_router_planner.out | 20 ++++++++++---------
 .../regress/expected/multi_simple_queries.out |  9 +++++----
 src/test/regress/sql/multi_router_planner.sql |  8 +++++---
 src/test/regress/sql/multi_simple_queries.sql |  3 ++-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/test/regress/expected/multi_router_planner.out b/src/test/regress/expected/multi_router_planner.out
index bc1fc8314..2b547b742 100644
--- a/src/test/regress/expected/multi_router_planner.out
+++ b/src/test/regress/expected/multi_router_planner.out
@@ -757,33 +757,35 @@ DEBUG:  Plan is router executable
 SELECT id
 	FROM articles_hash
 	WHERE author_id = 1
-	GROUP BY id;
+	GROUP BY id
+	ORDER BY id;
 DEBUG:  predicate pruning for shardId 840001
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
  id 
 ----
- 41
- 11
- 31
   1
+ 11
  21
+ 31
+ 41
 (5 rows)
 
 -- single shard select with distinct is router plannable
-SELECT distinct id
+SELECT DISTINCT id
 	FROM articles_hash
-	WHERE author_id = 1;
+	WHERE author_id = 1
+	ORDER BY id;
 DEBUG:  predicate pruning for shardId 840001
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
  id 
 ----
- 41
- 11
- 31
   1
+ 11
  21
+ 31
+ 41
 (5 rows)
 
 -- single shard aggregate is router plannable
diff --git a/src/test/regress/expected/multi_simple_queries.out b/src/test/regress/expected/multi_simple_queries.out
index a6f9ac1e7..7c460dcee 100644
--- a/src/test/regress/expected/multi_simple_queries.out
+++ b/src/test/regress/expected/multi_simple_queries.out
@@ -494,17 +494,18 @@ DEBUG:  Plan is router executable
 SELECT id
 	FROM articles
 	WHERE author_id = 1
-	GROUP BY id;
+	GROUP BY id
+	ORDER BY id;
 DEBUG:  predicate pruning for shardId 850001
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
  id 
 ----
- 41
- 11
- 31
   1
+ 11
  21
+ 31
+ 41
 (5 rows)
 
 -- copying from a single shard table does not require the master query
diff --git a/src/test/regress/sql/multi_router_planner.sql b/src/test/regress/sql/multi_router_planner.sql
index e39a1bbf2..44e141386 100644
--- a/src/test/regress/sql/multi_router_planner.sql
+++ b/src/test/regress/sql/multi_router_planner.sql
@@ -334,12 +334,14 @@ SELECT *
 SELECT id
 	FROM articles_hash
 	WHERE author_id = 1
-	GROUP BY id;
+	GROUP BY id
+	ORDER BY id;
 
 -- single shard select with distinct is router plannable
-SELECT distinct id
+SELECT DISTINCT id
 	FROM articles_hash
-	WHERE author_id = 1;
+	WHERE author_id = 1
+	ORDER BY id;
 
 -- single shard aggregate is router plannable
 SELECT avg(word_count)
diff --git a/src/test/regress/sql/multi_simple_queries.sql b/src/test/regress/sql/multi_simple_queries.sql
index 1a52d2591..faa70d7bc 100644
--- a/src/test/regress/sql/multi_simple_queries.sql
+++ b/src/test/regress/sql/multi_simple_queries.sql
@@ -260,7 +260,8 @@ SELECT *
 SELECT id
 	FROM articles
 	WHERE author_id = 1
-	GROUP BY id;
+	GROUP BY id
+	ORDER BY id;
 
 -- copying from a single shard table does not require the master query
 COPY articles_single_shard TO stdout;