In pg_dump, don't dump a stats object unless dumping underlying table.

If the underlying table isn't being dumped, it's useless to dump
an extended statistics object; it'll just cause errors at restore.
We have always applied similar policies to, say, indexes.

(When and if we get cross-table stats objects, it might be profitable
to think a little harder about what to do with them.  But for now
there seems no point in considering a stats object as anything but
an appendage of its table.)

Rian McGuire and Tom Lane, per report from Rian McGuire.
Back-patch to supported branches.

Discussion: https://postgr.es/m/7075d3aa-3f05-44a5-b68f-47dc6a8a0550@buildkite.com

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 8c0b5486b93ecb7974e1970ae9ec0c72b7bbfdef..050a83122650bb7ca86f1814f5709694839078cf 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -2046,6 +2046,26 @@ selectDumpablePublicationObject(DumpableObject *dobj, Archive *fout)
        DUMP_COMPONENT_ALL : DUMP_COMPONENT_NONE;
 }
 
+/*
+ * selectDumpableStatisticsObject: policy-setting subroutine
+ *     Mark an extended statistics object as to be dumped or not
+ *
+ * We dump an extended statistics object if the schema it's in and the table
+ * it's for are being dumped.  (This'll need more thought if statistics
+ * objects ever support cross-table stats.)
+ */
+static void
+selectDumpableStatisticsObject(StatsExtInfo *sobj, Archive *fout)
+{
+   if (checkExtensionMembership(&sobj->dobj, fout))
+       return;                 /* extension membership overrides all else */
+
+   sobj->dobj.dump = sobj->dobj.namespace->dobj.dump_contains;
+   if (sobj->stattable == NULL ||
+       !(sobj->stattable->dobj.dump & DUMP_COMPONENT_DEFINITION))
+       sobj->dobj.dump = DUMP_COMPONENT_NONE;
+}
+
 /*
  * selectDumpableObject: policy-setting subroutine
  *     Mark a generic dumpable object as to be dumped or not
@@ -7291,6 +7311,7 @@ getExtendedStatistics(Archive *fout)
    int         i_stxname;
    int         i_stxnamespace;
    int         i_stxowner;
+   int         i_stxrelid;
    int         i_stattarget;
    int         i;
 
@@ -7302,11 +7323,11 @@ getExtendedStatistics(Archive *fout)
 
    if (fout->remoteVersion < 130000)
        appendPQExpBufferStr(query, "SELECT tableoid, oid, stxname, "
-                            "stxnamespace, stxowner, (-1) AS stxstattarget "
+                            "stxnamespace, stxowner, stxrelid, (-1) AS stxstattarget "
                             "FROM pg_catalog.pg_statistic_ext");
    else
        appendPQExpBufferStr(query, "SELECT tableoid, oid, stxname, "
-                            "stxnamespace, stxowner, stxstattarget "
+                            "stxnamespace, stxowner, stxrelid, stxstattarget "
                             "FROM pg_catalog.pg_statistic_ext");
 
    res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -7318,6 +7339,7 @@ getExtendedStatistics(Archive *fout)
    i_stxname = PQfnumber(res, "stxname");
    i_stxnamespace = PQfnumber(res, "stxnamespace");
    i_stxowner = PQfnumber(res, "stxowner");
+   i_stxrelid = PQfnumber(res, "stxrelid");
    i_stattarget = PQfnumber(res, "stxstattarget");
 
    statsextinfo = (StatsExtInfo *) pg_malloc(ntups * sizeof(StatsExtInfo));
@@ -7332,10 +7354,12 @@ getExtendedStatistics(Archive *fout)
        statsextinfo[i].dobj.namespace =
            findNamespace(atooid(PQgetvalue(res, i, i_stxnamespace)));
        statsextinfo[i].rolname = getRoleName(PQgetvalue(res, i, i_stxowner));
+       statsextinfo[i].stattable =
+           findTableByOid(atooid(PQgetvalue(res, i, i_stxrelid)));
        statsextinfo[i].stattarget = atoi(PQgetvalue(res, i, i_stattarget));
 
        /* Decide whether we want to dump it */
-       selectDumpableObject(&(statsextinfo[i].dobj), fout);
+       selectDumpableStatisticsObject(&(statsextinfo[i]), fout);
    }
 
    PQclear(res);

diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index 2fe3cbed9ac2b335529631fb89236747d851f0af..673ca5c92d13f046e6fc5ff67886efedd5d4d76a 100644 (file)
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -423,7 +423,8 @@ typedef struct _indexAttachInfo
 typedef struct _statsExtInfo
 {
    DumpableObject dobj;
-   const char *rolname;
+   const char *rolname;        /* owner */
+   TableInfo  *stattable;      /* link to table the stats are for */
    int         stattarget;     /* statistics target */
 } StatsExtInfo;
 

diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index eb3ec534b4d8e9e8f77e93ae4f93c57a52aa56bf..a671603cd28d11dad988fdc8e735cfc226cd0762 100644 (file)
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -3742,14 +3742,15 @@ my %tests = (
    'CREATE STATISTICS extended_stats_no_options' => {
        create_order => 97,
        create_sql => 'CREATE STATISTICS dump_test.test_ext_stats_no_options
-                           ON col1, col2 FROM dump_test.test_fifth_table',
+                           ON col1, col2 FROM dump_test.test_table',
        regexp => qr/^
-           \QCREATE STATISTICS dump_test.test_ext_stats_no_options ON col1, col2 FROM dump_test.test_fifth_table;\E
+           \QCREATE STATISTICS dump_test.test_ext_stats_no_options ON col1, col2 FROM dump_test.test_table;\E
            /xms,
        like =>
          { %full_runs, %dump_test_schema_runs, section_post_data => 1, },
        unlike => {
            exclude_dump_test_schema => 1,
+           exclude_test_table => 1,
            only_dump_measurement => 1,
        },
    },