From 7be3678a8cfb55dcfca90fa586485f835ab912a5 Mon Sep 17 00:00:00 2001 From: Andrew Gierth Date: Mon, 24 Apr 2017 07:53:05 +0100 Subject: [PATCH] Repair crash with unsortable data in grouping sets. Previously the code would generate incorrect results, assertion failures, or crashes if given unsortable (but hashable) columns in grouping sets. Handle by throwing an error instead. Report and patch by Pavan Deolasee (though I changed the error wording slightly); regression test by me. (This affects 9.5 only since the planner was refactored in 9.6.) --- src/backend/optimizer/plan/planner.c | 5 +++++ src/test/regress/expected/groupingsets.out | 7 +++++++ src/test/regress/sql/groupingsets.sql | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index fcb57bf411..f25eb9b02d 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -1756,6 +1756,11 @@ grouping_planner(PlannerInfo *root, double tuple_fraction) if (parse->groupingSets) { + if (!grouping_is_sortable(parse->groupClause)) + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("could not implement GROUP BY"), + errdetail("Some of the datatypes do not support sorting, which is required for grouping sets."))); use_hashed_grouping = false; } else diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out index 260ccd52c8..86d188ae22 100644 --- a/src/test/regress/expected/groupingsets.out +++ b/src/test/regress/expected/groupingsets.out @@ -847,4 +847,11 @@ select sum(ten) from onek group by rollup(four::text), two order by 1; 2500 (6 rows) +-- Check for sensible failure on unsortable data +select usort, grouping(usort), count(*) from (values ('1'::xid),('2'::xid),('1'::xid)) v(usort) group by rollup(usort); +ERROR: could not implement GROUP BY +DETAIL: Some of the datatypes do not support sorting, which is required for grouping sets. +select id, usort, grouping(id,usort), count(*) from (values (1,'1'::xid),(1,'2'::xid),(2,'1'::xid)) v(id,usort) group by grouping sets ((id), (usort)); +ERROR: could not implement GROUP BY +DETAIL: Some of the datatypes do not support sorting, which is required for grouping sets. -- end diff --git a/src/test/regress/sql/groupingsets.sql b/src/test/regress/sql/groupingsets.sql index 71cc0ec900..891d21188b 100644 --- a/src/test/regress/sql/groupingsets.sql +++ b/src/test/regress/sql/groupingsets.sql @@ -224,4 +224,8 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou select sum(ten) from onek group by two, rollup(four::text) order by 1; select sum(ten) from onek group by rollup(four::text), two order by 1; +-- Check for sensible failure on unsortable data +select usort, grouping(usort), count(*) from (values ('1'::xid),('2'::xid),('1'::xid)) v(usort) group by rollup(usort); +select id, usort, grouping(id,usort), count(*) from (values (1,'1'::xid),(1,'2'::xid),(2,'1'::xid)) v(id,usort) group by grouping sets ((id), (usort)); + -- end -- 2.50.1