Hi,

PostgreSQL 10 introduced extended statistics, allowing us to consider
correlation between columns to improve estimates, and PostgreSQL 12
added support for MCV statistics. But we still had the limitation that
we only allowed using a single extended statistics per relation, i.e.
given a table with two extended stats

   CREATE TABLE t (a int, b int, c int, d int);
   CREATE STATISTICS s1 (mcv) ON a, b FROM t;
   CREATE STATISTICS s2 (mcv) ON c, d FROM t;

and a query

   SELECT * FROM t WHERE a = 1 AND b = 1 AND c = 1 AND d = 1;

we only ever used one of the statistics (and we considered them in a not
particularly well determined order).

This patch addresses this by using as many extended stats as possible,
by adding a loop to statext_mcv_clauselist_selectivity(). In each step
we pick the "best" applicable statistics (in the sense of covering the
most attributes) and factor it into the oveall estimate.

All this happens where we'd originally consider applying a single MCV
list, i.e. before even considering the functional dependencies, so
roughly like this:

   while ()
   {
       ... apply another MCV list ...
   }

   ... apply functional dependencies ...


I've both in the loop, but I think that'd be wrong - the MCV list is
expected to contain more information about individual values (compared
to functional deps, which are column-level).


regards

--
Tomas Vondra                  http://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
diff --git a/src/backend/statistics/extended_stats.c 
b/src/backend/statistics/extended_stats.c
index 207ee3160e..f817bc6189 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -1173,11 +1173,6 @@ statext_is_compatible_clause(PlannerInfo *root, Node 
*clause, Index relid,
  * 'estimatedclauses' is an input/output parameter.  We set bits for the
  * 0-based 'clauses' indexes we estimate for and also skip clause items that
  * already have a bit set.
- *
- * XXX If we were to use multiple statistics, this is where it would happen.
- * We would simply repeat this on a loop on the "remaining" clauses, possibly
- * using the already estimated clauses as conditions (and combining the values
- * using conditional probability formula).
  */
 static Selectivity
 statext_mcv_clauselist_selectivity(PlannerInfo *root, List *clauses, int 
varRelid,
@@ -1188,14 +1183,7 @@ statext_mcv_clauselist_selectivity(PlannerInfo *root, 
List *clauses, int varReli
        Bitmapset  *clauses_attnums = NULL;
        Bitmapset **list_attnums;
        int                     listidx;
-       StatisticExtInfo *stat;
-       List       *stat_clauses;
-       Selectivity simple_sel,
-                               mcv_sel,
-                               mcv_basesel,
-                               mcv_totalsel,
-                               other_sel,
-                               sel;
+       Selectivity     sel = 1.0;
 
        /* check if there's any stats that might be useful for us. */
        if (!has_stats_of_kind(rel->statlist, STATS_EXT_MCV))
@@ -1237,64 +1225,99 @@ statext_mcv_clauselist_selectivity(PlannerInfo *root, 
List *clauses, int varReli
        if (bms_membership(clauses_attnums) != BMS_MULTIPLE)
                return 1.0;
 
-       /* find the best suited statistics object for these attnums */
-       stat = choose_best_statistics(rel->statlist, clauses_attnums, 
STATS_EXT_MCV);
+       /* apply as many extended statistics as possible */
+       while (true)
+       {
+               StatisticExtInfo *stat;
+               List       *stat_clauses;
+               Selectivity simple_sel,
+                                       mcv_sel,
+                                       mcv_basesel,
+                                       mcv_totalsel,
+                                       other_sel,
+                                       stat_sel;
 
-       /* if no matching stats could be found then we've nothing to do */
-       if (!stat)
-               return 1.0;
+               /*
+                * Recompute attnums in the remaining clauses (we simply use 
the bitmaps
+                * computed earlier, so that we don't have to inspect the 
clauses again).
+                */
+               clauses_attnums = NULL;
 
-       /* Ensure choose_best_statistics produced an expected stats type. */
-       Assert(stat->kind == STATS_EXT_MCV);
+               listidx = 0;
+               foreach(l, clauses)
+               {
+                       if (!bms_is_member(listidx, *estimatedclauses))
+                               clauses_attnums = 
bms_add_members(clauses_attnums, list_attnums[listidx]);
 
-       /* now filter the clauses to be estimated using the selected MCV */
-       stat_clauses = NIL;
+                       listidx++;
+               }
 
-       listidx = 0;
-       foreach(l, clauses)
-       {
-               /*
-                * If the clause is compatible with the selected statistics, 
mark it
-                * as estimated and add it to the list to estimate.
-                */
-               if (list_attnums[listidx] != NULL &&
-                       bms_is_subset(list_attnums[listidx], stat->keys))
+               /* We need at least two attributes for multivariate statistics. 
*/
+               if (bms_membership(clauses_attnums) != BMS_MULTIPLE)
+                       break;
+
+               /* find the best suited statistics object for these attnums */
+               stat = choose_best_statistics(rel->statlist, clauses_attnums, 
STATS_EXT_MCV);
+
+               /* if no (additional) matching stats could be found then we've 
nothing to do */
+               if (!stat)
+                       break;
+
+               /* Ensure choose_best_statistics produced an expected stats 
type. */
+               Assert(stat->kind == STATS_EXT_MCV);
+
+               /* now filter the clauses to be estimated using the selected 
MCV */
+               stat_clauses = NIL;
+
+               listidx = 0;
+               foreach(l, clauses)
                {
-                       stat_clauses = lappend(stat_clauses, (Node *) 
lfirst(l));
-                       *estimatedclauses = bms_add_member(*estimatedclauses, 
listidx);
+                       /*
+                        * If the clause is compatible with the selected 
statistics, mark it
+                        * as estimated and add it to the list to estimate.
+                        */
+                       if (list_attnums[listidx] != NULL &&
+                               bms_is_subset(list_attnums[listidx], 
stat->keys))
+                       {
+                               stat_clauses = lappend(stat_clauses, (Node *) 
lfirst(l));
+                               *estimatedclauses = 
bms_add_member(*estimatedclauses, listidx);
+                       }
+
+                       listidx++;
                }
 
-               listidx++;
-       }
+               /*
+                * First compute "simple" selectivity, i.e. without the extended
+                * statistics, and essentially assuming independence of the
+                * columns/clauses. We'll then use the various selectivities 
computed from
+                * MCV list to improve it.
+                */
+               simple_sel = clauselist_selectivity_simple(root, stat_clauses, 
varRelid,
+                                                                               
                jointype, sjinfo, NULL);
 
-       /*
-        * First compute "simple" selectivity, i.e. without the extended
-        * statistics, and essentially assuming independence of the
-        * columns/clauses. We'll then use the various selectivities computed 
from
-        * MCV list to improve it.
-        */
-       simple_sel = clauselist_selectivity_simple(root, stat_clauses, varRelid,
-                                                                               
           jointype, sjinfo, NULL);
+               /*
+                * Now compute the multi-column estimate from the MCV list, 
along with the
+                * other selectivities (base & total selectivity).
+                */
+               mcv_sel = mcv_clauselist_selectivity(root, stat, stat_clauses, 
varRelid,
+                                                                               
         jointype, sjinfo, rel,
+                                                                               
         &mcv_basesel, &mcv_totalsel);
 
-       /*
-        * Now compute the multi-column estimate from the MCV list, along with 
the
-        * other selectivities (base & total selectivity).
-        */
-       mcv_sel = mcv_clauselist_selectivity(root, stat, stat_clauses, varRelid,
-                                                                               
 jointype, sjinfo, rel,
-                                                                               
 &mcv_basesel, &mcv_totalsel);
+               /* Estimated selectivity of values not covered by MCV matches */
+               other_sel = simple_sel - mcv_basesel;
+               CLAMP_PROBABILITY(other_sel);
 
-       /* Estimated selectivity of values not covered by MCV matches */
-       other_sel = simple_sel - mcv_basesel;
-       CLAMP_PROBABILITY(other_sel);
+               /* The non-MCV selectivity can't exceed the 1 - mcv_totalsel. */
+               if (other_sel > 1.0 - mcv_totalsel)
+                       other_sel = 1.0 - mcv_totalsel;
 
-       /* The non-MCV selectivity can't exceed the 1 - mcv_totalsel. */
-       if (other_sel > 1.0 - mcv_totalsel)
-               other_sel = 1.0 - mcv_totalsel;
+               /* Overall selectivity is the combination of MCV and non-MCV 
estimates. */
+               stat_sel = mcv_sel + other_sel;
+               CLAMP_PROBABILITY(stat_sel);
 
-       /* Overall selectivity is the combination of MCV and non-MCV estimates. 
*/
-       sel = mcv_sel + other_sel;
-       CLAMP_PROBABILITY(sel);
+               /* Factor the estimate from this MCV to the oveall estimate. */
+               sel *= stat_sel;
+       }
 
        return sel;
 }

Reply via email to