Allow PPD when subject is not a column with grouping sets present

After HIVE-19653,  filters with only columns and constants are pushed down, but in some cases,  this may not work as well, for example:
SET hive.cbo.enable=false;
SELECT a, b, sum(s)
FROM T1
GROUP BY a, b GROUPING SETS ((a), (a, b))
HAVING upper(a) = "AAA" AND sum(s) > 100;
 
SELECT upper(a), b, sum(s)
FROM T1
GROUP BY upper(a), b GROUPING SETS ((upper(a)), (upper(a), b))
HAVING upper(a) = "AAA" AND sum(s) > 100;
 
The filters pushed down to GBY can be f(gbyKey) or gbyKey with udf ,  not only the column groupby keys.