This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 288b9d6da009d44ab938bb937fd6fa3b9ddafdf6 Author: David Kimura <[email protected]> AuthorDate: Mon May 15 12:18:57 2023 -0700 Fix ORCA build break (#15548) Automatic merge did not resolve conflict correctly. Commits 94c62c2a026a and 4581ce9679 updated the same MDPs, but the space size conflicted. Also, new test plan introduced 94c62c2a026a conflicted with default GUC change introduced commit a7100b9fa1b. --- .../data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp | 2 +- .../gporca/data/dxl/minidump/MDQAs-Grouping.mdp | 2 +- .../gporca/data/dxl/minidump/MDQAs-Union.mdp | 2 +- src/backend/gporca/data/dxl/minidump/MDQAs1.mdp | 2 +- src/test/regress/expected/gp_dqa_optimizer.out | 45 ++++++++++++++-------- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp b/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp index 1c00e0c418..e937868f50 100644 --- a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp +++ b/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp @@ -463,7 +463,7 @@ SQL: </dxl:LogicalGroupBy> </dxl:LogicalLimit> </dxl:Query> - <dxl:Plan Id="0" SpaceSize="10400"> + <dxl:Plan Id="0" SpaceSize="12376"> <dxl:Limit> <dxl:Properties> <dxl:Cost StartupCost="0" TotalCost="1293.104458" Rows="10.000000" Width="20"/> diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp b/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp index fcbc3e19a9..f78b89530f 100644 --- a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp +++ b/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp @@ -454,7 +454,7 @@ SQL: </dxl:LogicalGet> </dxl:LogicalGroupBy> </dxl:Query> - <dxl:Plan Id="0" SpaceSize="9200"> + <dxl:Plan Id="0" SpaceSize="10528"> <dxl:GatherMotion InputSegments="0,1" OutputSegments="-1"> <dxl:Properties> <dxl:Cost StartupCost="0" TotalCost="1293.076760" Rows="111.000000" Width="20"/> diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp b/src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp index 80a69572f7..a774b204fe 100644 --- a/src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp +++ b/src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp @@ -507,7 +507,7 @@ select a,count(distinct a), count(distinct b) from t1 group by a </dxl:LogicalGroupBy> </dxl:Union> </dxl:Query> - <dxl:Plan Id="0" SpaceSize="426240000"> + <dxl:Plan Id="0" SpaceSize="711603200"> <dxl:GatherMotion InputSegments="0,1" OutputSegments="-1"> <dxl:Properties> <dxl:Cost StartupCost="0" TotalCost="2586.144662" Rows="134.000000" Width="20"/> diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs1.mdp b/src/backend/gporca/data/dxl/minidump/MDQAs1.mdp index e0fed1698b..9ea6055355 100644 --- a/src/backend/gporca/data/dxl/minidump/MDQAs1.mdp +++ b/src/backend/gporca/data/dxl/minidump/MDQAs1.mdp @@ -460,7 +460,7 @@ SQL: </dxl:LogicalGet> </dxl:LogicalGroupBy> </dxl:Query> - <dxl:Plan Id="0" SpaceSize="1488"> + <dxl:Plan Id="0" SpaceSize="1874"> <dxl:GatherMotion InputSegments="0,1" OutputSegments="-1"> <dxl:Properties> <dxl:Cost StartupCost="0" TotalCost="1724.007238" Rows="1.000000" Width="16"/> diff --git a/src/test/regress/expected/gp_dqa_optimizer.out b/src/test/regress/expected/gp_dqa_optimizer.out index 6e97a37820..c870359c83 100644 --- a/src/test/regress/expected/gp_dqa_optimizer.out +++ b/src/test/regress/expected/gp_dqa_optimizer.out @@ -3137,8 +3137,8 @@ DETAIL: Feature not supported: Multiple Distinct Qualified Aggregates are disab set optimizer_enable_multiple_distinct_aggs=on; explain (verbose on, costs off) select count(distinct a), count(distinct b) from dqa_f4 group by c; - QUERY PLAN --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + QUERY PLAN +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Gather Motion 3:1 (slice1; segments: 3) Output: (count(DISTINCT share0_ref3.a)), (count(DISTINCT share0_ref2.b)) -> Sequence @@ -3150,37 +3150,50 @@ explain (verbose on, costs off) select count(distinct a), count(distinct b) from -> Hash Join Output: (count(DISTINCT share0_ref3.a)), (count(DISTINCT share0_ref2.b)) Hash Cond: (NOT (share0_ref3.c IS DISTINCT FROM share0_ref2.c)) - -> GroupAggregate + -> Finalize GroupAggregate Output: count(DISTINCT share0_ref3.a), share0_ref3.c Group Key: share0_ref3.c -> Sort - Output: share0_ref3.a, share0_ref3.c + Output: share0_ref3.c, (PARTIAL count(DISTINCT share0_ref3.a)) Sort Key: share0_ref3.c -> Redistribute Motion 3:3 (slice2; segments: 3) - Output: share0_ref3.a, share0_ref3.c + Output: share0_ref3.c, (PARTIAL count(DISTINCT share0_ref3.a)) Hash Key: share0_ref3.c - -> Result - Output: share0_ref3.a, share0_ref3.c - -> Shared Scan (share slice:id 2:0) + -> Partial GroupAggregate + Output: share0_ref3.c, PARTIAL count(DISTINCT share0_ref3.a) + Group Key: share0_ref3.c + -> Sort Output: share0_ref3.a, share0_ref3.b, share0_ref3.c, share0_ref3.ctid, share0_ref3.xmin, share0_ref3.cmin, share0_ref3.xmax, share0_ref3.cmax, share0_ref3.tableoid, share0_ref3.gp_segment_id + Sort Key: share0_ref3.c, share0_ref3.a + -> Shared Scan (share slice:id 2:0) + Output: share0_ref3.a, share0_ref3.b, share0_ref3.c, share0_ref3.ctid, share0_ref3.xmin, share0_ref3.cmin, share0_ref3.xmax, share0_ref3.cmax, share0_ref3.tableoid, share0_ref3.gp_segment_id -> Hash Output: (count(DISTINCT share0_ref2.b)), share0_ref2.c - -> GroupAggregate + -> Finalize GroupAggregate Output: count(DISTINCT share0_ref2.b), share0_ref2.c Group Key: share0_ref2.c -> Sort - Output: share0_ref2.b, share0_ref2.c + Output: share0_ref2.c, (PARTIAL count(DISTINCT share0_ref2.b)) Sort Key: share0_ref2.c -> Redistribute Motion 3:3 (slice3; segments: 3) - Output: share0_ref2.b, share0_ref2.c + Output: share0_ref2.c, (PARTIAL count(DISTINCT share0_ref2.b)) Hash Key: share0_ref2.c - -> Result - Output: share0_ref2.b, share0_ref2.c - -> Shared Scan (share slice:id 3:0) - Output: share0_ref2.a, share0_ref2.b, share0_ref2.c, share0_ref2.ctid, share0_ref2.xmin, share0_ref2.cmin, share0_ref2.xmax, share0_ref2.cmax, share0_ref2.tableoid, share0_ref2.gp_segment_id + -> Partial GroupAggregate + Output: share0_ref2.c, PARTIAL count(DISTINCT share0_ref2.b) + Group Key: share0_ref2.c + -> Sort + Output: share0_ref2.b, share0_ref2.c + Sort Key: share0_ref2.c, share0_ref2.b + -> Redistribute Motion 3:3 (slice4; segments: 3) + Output: share0_ref2.b, share0_ref2.c + Hash Key: share0_ref2.b + -> Result + Output: share0_ref2.b, share0_ref2.c + -> Shared Scan (share slice:id 4:0) + Output: share0_ref2.a, share0_ref2.b, share0_ref2.c, share0_ref2.ctid, share0_ref2.xmin, share0_ref2.cmin, share0_ref2.xmax, share0_ref2.cmax, share0_ref2.tableoid, share0_ref2.gp_segment_id Optimizer: Pivotal Optimizer (GPORCA) Settings: enable_groupagg = 'off', gp_motion_cost_per_row = '1', optimizer_enable_multiple_distinct_aggs = 'on' -(41 rows) +(54 rows) select count(distinct a), count(distinct b) from dqa_f4 group by c; count | count --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
