external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also check aggregates in havingQual when scanning for non pushdownable aggregates 

Came across this while coming up with test cases,
'result "68_1" does not exist' I'll seek to address in a future PR,
for now avoid segfault
pull/3608/head
Philip Dubé 2020-03-10 21:20:00 +00:00
parent 63ced3d901
commit 4b68ee12c6
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/distributed/planner/multi_logical_optimizer.c
View File

@ -3504,6 +3504,7 @@ RequiresIntermediateRowPullUp(MultiNode *logicalPlanNode)
MultiExtendedOp *extendedOpNode = (MultiExtendedOp *) linitial(opNodeList); MultiExtendedOp *extendedOpNode = (MultiExtendedOp *) linitial(opNodeList);
List *targetList = extendedOpNode->targetList; List *targetList = extendedOpNode->targetList;
Node *havingQual = extendedOpNode->havingQual;
/* /*
* PVC_REJECT_PLACEHOLDERS is implicit if PVC_INCLUDE_PLACEHOLDERS isn't * PVC_REJECT_PLACEHOLDERS is implicit if PVC_INCLUDE_PLACEHOLDERS isn't
@ -3511,6 +3512,8 @@ RequiresIntermediateRowPullUp(MultiNode *logicalPlanNode)
*/ */
List *expressionList = pull_var_clause((Node *) targetList, PVC_INCLUDE_AGGREGATES | List *expressionList = pull_var_clause((Node *) targetList, PVC_INCLUDE_AGGREGATES |
PVC_INCLUDE_WINDOWFUNCS); PVC_INCLUDE_WINDOWFUNCS);
expressionList = list_concat(expressionList,
pull_var_clause(havingQual, PVC_INCLUDE_AGGREGATES));
Node *expression = NULL; Node *expression = NULL;
foreach_ptr(expression, expressionList) foreach_ptr(expression, expressionList)
@ -3547,6 +3550,7 @@ DeferErrorIfContainsNonPushdownableAggregate(MultiNode *logicalPlanNode)
MultiExtendedOp *extendedOpNode = (MultiExtendedOp *) linitial(opNodeList); MultiExtendedOp *extendedOpNode = (MultiExtendedOp *) linitial(opNodeList);
List *targetList = extendedOpNode->targetList; List *targetList = extendedOpNode->targetList;
Node *havingQual = extendedOpNode->havingQual;
/* /*
* PVC_REJECT_PLACEHOLDERS is implicit if PVC_INCLUDE_PLACEHOLDERS isn't * PVC_REJECT_PLACEHOLDERS is implicit if PVC_INCLUDE_PLACEHOLDERS isn't
@ -3554,6 +3558,8 @@ DeferErrorIfContainsNonPushdownableAggregate(MultiNode *logicalPlanNode)
*/ */
List *expressionList = pull_var_clause((Node *) targetList, PVC_INCLUDE_AGGREGATES | List *expressionList = pull_var_clause((Node *) targetList, PVC_INCLUDE_AGGREGATES |
PVC_INCLUDE_WINDOWFUNCS); PVC_INCLUDE_WINDOWFUNCS);
expressionList = list_concat(expressionList,
pull_var_clause(havingQual, PVC_INCLUDE_AGGREGATES));
ListCell *expressionCell = NULL; ListCell *expressionCell = NULL;
foreach(expressionCell, expressionList) foreach(expressionCell, expressionList)

22
src/test/regress/expected/multi_subquery.out
View File

@ -903,6 +903,28 @@ SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type > avg(2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1)) GROUP BY t1.event_type HAVING t1.event_type > avg(2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1))
ORDER BY 1; ORDER BY 1;
ERROR: cannot handle unplanned sub-select ERROR: cannot handle unplanned sub-select
SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type > avg(t1.value_2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1))
ORDER BY 1;
ERROR: cannot handle unplanned sub-select
RESET citus.coordinator_aggregation_strategy;
SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type > corr(t1.value_3, t1.value_2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1))
ORDER BY 1;
ERROR: result "68_1" does not exist
CONTEXT: while executing command on localhost:xxxxx
SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type * 5 > sum(distinct t1.value_3)
ORDER BY 1;
event_type
---------------------------------------------------------------------
3
4
5
6
(4 rows)
SET citus.coordinator_aggregation_strategy TO 'disabled';
-- Test https://github.com/citusdata/citus/issues/3433 -- Test https://github.com/citusdata/citus/issues/3433
CREATE TABLE keyval1 (key int, value int); CREATE TABLE keyval1 (key int, value int);
SELECT create_distributed_table('keyval1', 'key'); SELECT create_distributed_table('keyval1', 'key');

14
src/test/regress/sql/multi_subquery.sql
View File

@ -641,6 +641,20 @@ SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type > avg(2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1)) GROUP BY t1.event_type HAVING t1.event_type > avg(2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1))
ORDER BY 1; ORDER BY 1;
SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type > avg(t1.value_2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1))
ORDER BY 1;
RESET citus.coordinator_aggregation_strategy;
SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type > corr(t1.value_3, t1.value_2 + (SELECT t2.value_2 FROM users_table t2 ORDER BY 1 DESC LIMIT 1))
ORDER BY 1;
SELECT t1.event_type FROM events_table t1
GROUP BY t1.event_type HAVING t1.event_type * 5 > sum(distinct t1.value_3)
ORDER BY 1;
SET citus.coordinator_aggregation_strategy TO 'disabled';
-- Test https://github.com/citusdata/citus/issues/3433 -- Test https://github.com/citusdata/citus/issues/3433
CREATE TABLE keyval1 (key int, value int); CREATE TABLE keyval1 (key int, value int);
SELECT create_distributed_table('keyval1', 'key'); SELECT create_distributed_table('keyval1', 'key');