postgres
diff --git a/‎src/backend/optimizer/path/allpaths.c
Copy file name to clipboardExpand all lines: src/backend/optimizer/path/allpaths.c
+2-9Lines changed: 2 additions & 9 deletions b/‎src/backend/optimizer/path/allpaths.c
Copy file name to clipboardExpand all lines: src/backend/optimizer/path/allpaths.c
+2-9Lines changed: 2 additions & 9 deletions
diff --git a/‎src/test/regress/expected/incremental_sort.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/incremental_sort.out
+13Lines changed: 13 additions & 0 deletions b/‎src/test/regress/expected/incremental_sort.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/incremental_sort.out
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎src/test/regress/sql/incremental_sort.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/incremental_sort.sql
+4Lines changed: 4 additions & 0 deletions b/‎src/test/regress/sql/incremental_sort.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/incremental_sort.sql
+4Lines changed: 4 additions & 0 deletions
@@ -2900,7 +2900,8 @@ generate_useful_gather_paths(PlannerInfo *root, RelOptInfo *rel, bool override_r
 	cheapest_partial_path = linitial(rel->partial_pathlist);
 
 	/*
-	 * Consider incremental sort paths for each interesting ordering.
+	 * Consider sorted paths for each interesting ordering. We generate both
+	 * incremental and full sort.
 	 */
 	foreach(lc, useful_pathkeys_list)
 	{
@@ -2914,14 +2915,6 @@ generate_useful_gather_paths(PlannerInfo *root, RelOptInfo *rel, bool override_r
 			Path	   *subpath = (Path *) lfirst(lc2);
 			GatherMergePath *path;
 
-			/*
-			 * If the path has no ordering at all, then we can't use either
-			 * incremental sort or rely on implicit sorting with a gather
-			 * merge.
-			 */
-			if (subpath->pathkeys == NIL)
-				continue;
-
 			is_sorted = pathkeys_count_contained_in(useful_pathkeys,
 													subpath->pathkeys,
 													&presorted_keys);
 
@@ -1468,6 +1468,19 @@ explain (costs off) select * from t union select * from t order by 1,3;
                            ->  Parallel Seq Scan on t t_1
 (13 rows)
 
+-- Full sort, not just incremental sort can be pushed below a gather merge path
+-- by generate_useful_gather_paths.
+explain (costs off) select distinct a,b from t;
+                QUERY PLAN                
+------------------------------------------
+ Unique
+   ->  Gather Merge
+         Workers Planned: 2
+         ->  Sort
+               Sort Key: a, b
+               ->  Parallel Seq Scan on t
+(6 rows)
+
 drop table t;
 -- Sort pushdown can't go below where expressions are part of the rel target.
 -- In particular this is interesting for volatile expressions which have to
 
@@ -220,6 +220,10 @@ explain (costs off) select a,b,sum(c) from t group by 1,2 order by 1,2,3 limit 1
 set enable_hashagg to off;
 explain (costs off) select * from t union select * from t order by 1,3;
 
+-- Full sort, not just incremental sort can be pushed below a gather merge path
+-- by generate_useful_gather_paths.
+explain (costs off) select distinct a,b from t;
+
 drop table t;
 
 -- Sort pushdown can't go below where expressions are part of the rel target.