Make error logging in extended statistics more consistent

Most errors reported in extended statistics are internal issues, and so
should use elog(). The MCV list code was already following this rule, but
the functional dependencies and ndistinct coefficients were using a mix
of elog() and ereport(). Fix this by changing most places to elog(), with
the exception of input functions.

This is a mostly cosmetic change, it makes the life a little bit easier
for translators, as elog() messages are not translated. So backpatch to
PostgreSQL 10, where extended statistics were introduced.

Author: Tomas Vondra
Backpatch-through: 10 where extended statistics were added
Discussion: https://postgr.es/m/20190503154404.GA7478@alvherre.pgsql

diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 591bc16e572ff56ba5f9c9fc07bdb056abc10401..cd318faf3b996ad202f3d7ef18a84a282ce98f2c 100644 (file)
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -534,9 +534,7 @@ statext_dependencies_deserialize(bytea *data)
                         dependencies->type, STATS_DEPS_TYPE_BASIC);
 
        if (dependencies->ndeps == 0)
-               ereport(ERROR,
-                               (errcode(ERRCODE_DATA_CORRUPTED),
-                                errmsg("invalid zero-length item array in MVDependencies")));
+               elog(ERROR, "invalid zero-length item array in MVDependencies");
 
        /* what minimum bytea size do we expect for those parameters */
        min_expected_size = SizeOfItem(dependencies->ndeps);

diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index b1a426265bd43301ed7b2b0bdda95f3ca552b936..7432a6a39690ab94d130d41d91e90b8a2275b844 100644 (file)
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -274,27 +274,19 @@ statext_ndistinct_deserialize(bytea *data)
        tmp += sizeof(uint32);
 
        if (ndist.magic != STATS_NDISTINCT_MAGIC)
-               ereport(ERROR,
-                               (errcode(ERRCODE_DATA_CORRUPTED),
-                                errmsg("invalid ndistinct magic %08x (expected %08x)",
-                                               ndist.magic, STATS_NDISTINCT_MAGIC)));
+               elog(ERROR, "invalid ndistinct magic %08x (expected %08x)",
+                        ndist.magic, STATS_NDISTINCT_MAGIC);
        if (ndist.type != STATS_NDISTINCT_TYPE_BASIC)
-               ereport(ERROR,
-                               (errcode(ERRCODE_DATA_CORRUPTED),
-                                errmsg("invalid ndistinct type %d (expected %d)",
-                                               ndist.type, STATS_NDISTINCT_TYPE_BASIC)));
+               elog(ERROR, "invalid ndistinct type %d (expected %d)",
+                        ndist.type, STATS_NDISTINCT_TYPE_BASIC);
        if (ndist.nitems == 0)
-               ereport(ERROR,
-                               (errcode(ERRCODE_DATA_CORRUPTED),
-                                errmsg("invalid zero-length item array in MVNDistinct")));
+               elog(ERROR, "invalid zero-length item array in MVNDistinct");
 
        /* what minimum bytea size do we expect for those parameters */
        minimum_size = MinSizeOfItems(ndist.nitems);
        if (VARSIZE_ANY_EXHDR(data) < minimum_size)
-               ereport(ERROR,
-                               (errcode(ERRCODE_DATA_CORRUPTED),
-                                errmsg("invalid MVNDistinct size %zd (expected at least %zd)",
-                                               VARSIZE_ANY_EXHDR(data), minimum_size)));
+               elog(ERROR, "invalid MVNDistinct size %zd (expected at least %zd)",
+                        VARSIZE_ANY_EXHDR(data), minimum_size);
 
        /*
         * Allocate space for the ndistinct items (no space for each item's