8000 Push grouped_rel into the AQO hook on a number of groups prediction c… · postgrespro/aqo@1cd0a9e · GitHub
[go: up one dir, main page]
Skip to content

Commit 1cd0a9e

Browse files
danolivoAndrey Lepikhov
danolivo
authored and
Andrey Lepikhov
committed
Push grouped_rel into the AQO hook on a number of groups prediction code.
Modifies Core Patch.
1 parent 8f45ee6 commit 1cd0a9e

File tree

3 files changed

+43
-29
lines changed

3 files changed

+43
-29
lines changed

‎aqo_master.patch

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -393,28 +393,30 @@ index d3f8639a40..f18e1c1a54 100644
393393

394394
/*
395395
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
396-
index 1868c4eff4..4fb43434af 100644
396+
index 1868c4eff4..386ef43300 100644
397397
--- a/src/backend/optimizer/plan/planner.c
398398
+++ b/src/backend/optimizer/plan/planner.c
399-
@@ -143,7 +143,7 @@ static List *extract_rollup_sets(List *groupingSets);
399+
@@ -143,7 +143,8 @@ static List *extract_rollup_sets(List *groupingSets);
400400
static List *reorder_grouping_sets(List *groupingSets, List *sortclause);
401401
static void standard_qp_callback(PlannerInfo *root, void *extra);
402402
static double get_number_of_groups(PlannerInfo *root,
403403
- double path_rows,
404404
+ RelOptInfo *rel,
405+
+ RelOptInfo *grouped_rel,
405406
grouping_sets_data *gd,
406407
List *target_list);
407408
static RelOptInfo *create_grouping_paths(PlannerInfo *root,
408-
@@ -3150,7 +3150,7 @@ standard_qp_callback(PlannerInfo *root, void *extra)
409+
@@ -3150,7 +3151,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
409410
*/
410411
static double
411412
get_number_of_groups(PlannerInfo *root,
412413
- double path_rows,
413414
+ RelOptInfo *rel,
415+
+ RelOptInfo *grouped_rel,
414416
grouping_sets_data *gd,
415417
List *target_list)
416418
{
417-
@@ -3185,9 +3185,9 @@ get_number_of_groups(PlannerInfo *root,
419+
@@ -3185,9 +3187,10 @@ get_number_of_groups(PlannerInfo *root,
418420
{
419421
List *gset = (List *) lfirst(lc);
420422
GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
@@ -423,10 +425,11 @@ index 1868c4eff4..4fb43434af 100644
423425
groupExprs,
424426
- path_rows,
425427
+ rel,
428+
+ grouped_rel,
426429
&gset,
427430
NULL);
428431

429-
@@ -3211,9 +3211,9 @@ get_number_of_groups(PlannerInfo *root,
432+
@@ -3211,9 +3214,10 @@ get_number_of_groups(PlannerInfo *root,
430433
{
431434
List *gset = (List *) lfirst(lc);
432435
GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
@@ -435,48 +438,54 @@ index 1868c4eff4..4fb43434af 100644
435438
groupExprs,
436439
- path_rows,
437440
+ rel,
441+
+ grouped_rel,
438442
&gset,
439443
NULL);
440444

441-
@@ -3230,7 +3230,7 @@ get_number_of_groups(PlannerInfo *root,
445+
@@ -3230,8 +3234,8 @@ get_number_of_groups(PlannerInfo *root,
442446
groupExprs = get_sortgrouplist_exprs(parse->groupClause,
443447
target_list);
444448

445449
- dNumGroups = estimate_num_groups(root, groupExprs, path_rows,
450+
- NULL, NULL);
446451
+ dNumGroups = estimate_num_groups_ext(root, groupExprs, rel,
447-
NULL, NULL);
452+
+ grouped_rel, NULL, NULL);
448453
}
449454
}
450-
@@ -3529,7 +3529,6 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
455+
else if (parse->groupingSets)
456+
@@ -3529,7 +3533,6 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
451457
GroupPathExtraData *extra,
452458
RelOptInfo **partially_grouped_rel_p)
453459
{
454460
- Path *cheapest_path = input_rel->cheapest_total_path;
455461
RelOptInfo *partially_grouped_rel = NULL;
456462
double dNumGroups;
457463
PartitionwiseAggregateType patype = PARTITIONWISE_AGGREGATE_NONE;
458-
@@ -3618,7 +3617,7 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
464+
@@ -3618,7 +3621,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
459465
* Estimate number of groups.
460466
*/
461467
dNumGroups = get_number_of_groups(root,
462468
- cheapest_path->rows,
463469
+ input_rel,
470+
+ grouped_rel,
464471
gd,
465472
extra->targetList);
466473

467-
@@ -6424,13 +6423,13 @@ create_partial_grouping_paths(PlannerInfo *root,
474+
@@ -6424,13 +6428,15 @@ create_partial_grouping_paths(PlannerInfo *root,
468475
if (cheapest_total_path != NULL)
469476
dNumPartialGroups =
470477
get_number_of_groups(root,
471478
- cheapest_total_path->rows,
472479
+ input_rel,
480+
+ partially_grouped_rel,
473481
gd,
474482
extra->targetList);
475483
if (cheapest_partial_path != NULL)
476484
dNumPartialPartialGroups =
477485
get_number_of_groups(root,
478486
- cheapest_partial_path->rows,
479487
+ input_rel,
488+
+ partially_grouped_rel,
480489
gd,
481490
extra->targetList);
482491

@@ -547,7 +556,7 @@ index e105a4d5f1..d821ea63bd 100644
547556

548557
return ppi;
549558
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
550-
index 0c8c05f6c2..3699b93dff 100644
559+
index 0c8c05f6c2..0ddc3fc46c 100644
551560
--- a/src/backend/utils/adt/selfuncs.c
552561
+++ b/src/backend/utils/adt/selfuncs.c
553562
@@ -143,6 +143,7 @@
@@ -558,26 +567,27 @@ index 0c8c05f6c2..3699b93dff 100644
558567

559568
static double eqsel_internal(PG_FUNCTION_ARGS, bool negate);
560569
static double eqjoinsel_inner(Oid opfuncoid, Oid collation,
561-
@@ -3364,6 +3365,19 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
562-
* assume such clauses do not reduce the number either (somewhat bogus,
563-
* but we don't have the info to do better).
564-
*/
570+
@@ -3293,6 +3294,20 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
571+
return varinfos;
572+
}
573+
565574
+double
566575
+estimate_num_groups_ext(PlannerInfo *root, List *groupExprs, RelOptInfo *rel,
567-
+ List **pgset, EstimationInfo *estinfo)
576+
+ RelOptInfo *grouped_rel, List **pgset,
577+
+ EstimationInfo *estinfo)
568578
+{
569579
+ double input_rows = rel->cheapest_total_path->rows;
570580
+
571581
+ if (estimate_num_groups_hook != NULL)
572-
+ return (*estimate_num_groups_hook)(root, groupExprs, rel, pgset,
573-
+ estinfo);
582+
+ return (*estimate_num_groups_hook)(root, groupExprs, rel, grouped_rel,
583+
+ pgset, estinfo);
574584
+
575585
+ return estimate_num_groups(root, groupExprs, input_rows, pgset, estinfo);
576586
+}
577587
+
578-
double
579-
estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
580-
List **pgset, EstimationInfo *estinfo)
588+
/*
589+
* estimate_num_groups - Estimate number of groups in a grouped query
590+
*
581591
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
582592
index e94d9e49cf..49236ced77 100644
583593
--- a/src/include/commands/explain.h
@@ -769,29 +779,30 @@ index bf1adfc52a..9c78e0f4e0 100644
769779
* prototypes for plan/planmain.c
770780
*/
771781
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
772-
index 9dd444e1ff..8b63d2162a 100644
782+
index 9dd444e1ff..2c0f942250 100644
773783
--- a/src/include/utils/selfuncs.h
774784
+++ b/src/include/utils/selfuncs.h
775-
@@ -144,6 +144,12 @@ typedef bool (*get_index_stats_hook_type) (PlannerInfo *root,
785+
@@ -144,6 +144,13 @@ typedef bool (*get_index_stats_hook_type) (PlannerInfo *root,
776786
AttrNumber indexattnum,
777787
VariableStatData *vardata);
778788
extern PGDLLIMPORT get_index_stats_hook_type get_index_stats_hook;
779789
+typedef double (*estimate_num_groups_hook_type) (PlannerInfo *root,
780790
+ List *groupExprs,
781791
+ RelOptInfo *rel,
792+
+ RelOptInfo *grouped_rel,
782793
+ List **pgset,
783794
+ EstimationInfo *estinfo);
784795
+extern PGDLLIMPORT estimate_num_groups_hook_type estimate_num_groups_hook;
785796

786797
/* Functions in selfuncs.c */
787798

788-
@@ -210,6 +216,9 @@ extern void mergejoinscansel(PlannerInfo *root, Node *clause,
799+
@@ -210,6 +217,9 @@ extern void mergejoinscansel(PlannerInfo *root, Node *clause,
789800
Selectivity *leftstart, Selectivity *leftend,
790801
Selectivity *rightstart, Selectivity *rightend);
791802

792803
+extern double estimate_num_groups_ext(PlannerInfo *root, List *groupExprs,
793-
+ RelOptInfo *rel, List **pgset,
794-
+ EstimationInfo *estinfo);
804+
+ RelOptInfo *rel, RelOptInfo *grouped_rel,
805+
+ List **pgset, EstimationInfo *estinfo);
795806
extern double estimate_num_groups(PlannerInfo *root, List *groupExprs,
796807
double input_rows, List **pgset,
797808
EstimationInfo *estinfo);

‎cardinality_hooks.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ predict_num_groups(PlannerInfo *root, RelOptInfo *rel, List *group_exprs)
404404

405405
double
406406
aqo_estimate_num_groups_hook(PlannerInfo *root, List *groupExprs,
407-
RelOptInfo *rel, List **pgset,
408-
EstimationInfo *estinfo)
407+
RelOptInfo *rel, RelOptInfo *grouped_rel,
408+
List **pgset, EstimationInfo *estinfo)
409409
{
410410
double input_rows = rel->cheapest_total_path->rows;
411411
double nGroups = -1;
@@ -417,6 +417,7 @@ aqo_estimate_num_groups_hook(PlannerInfo *root, List *groupExprs,
417417
{
418418
if (prev_estimate_num_groups_hook != NULL)
419419
nGroups = (*prev_estimate_num_groups_hook)(root, groupExprs, rel,
420+
grouped_rel,
420421
pgset, estinfo);
421422
if (nGroups < 0)
422423
return estimate_num_groups(root, groupExprs, input_rows,

‎cardinality_hooks.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
extern estimate_num_groups_hook_type prev_estimate_num_groups_hook;
88

99
extern double aqo_estimate_num_groups_hook(PlannerInfo *root, List *groupExprs,
10-
RelOptInfo *rel, List **pgset,
10+
RelOptInfo *rel,
11+
RelOptInfo *grouped_rel,
12+
List **pgset,
1113
EstimationInfo *estinfo);
1214

1315
#endif /* CARDINALITY_HOOKS_H */

0 commit comments

Comments
 (0)
0