Index tuple data arrays using Anum_xxx symbolic constants instead of "i++".

[pg-rex/syncrep.git] / src / backend / commands / analyze.c

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 57188bc..7b73355 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -1603,21 +1603,23 @@ update_attstats(Oid relid, bool inh, int natts, VacAttrStats **vacattrstats)
                        replaces[i] = true;
                }
 
-               i = 0;
-               values[i++] = ObjectIdGetDatum(relid);  /* starelid */
-               values[i++] = Int16GetDatum(stats->attr->attnum);               /* staattnum */
-               values[i++] = BoolGetDatum(inh);                /* stainherit */
-               values[i++] = Float4GetDatum(stats->stanullfrac);               /* stanullfrac */
-               values[i++] = Int32GetDatum(stats->stawidth);   /* stawidth */
-               values[i++] = Float4GetDatum(stats->stadistinct);               /* stadistinct */
+               values[Anum_pg_statistic_starelid - 1] = ObjectIdGetDatum(relid);
+               values[Anum_pg_statistic_staattnum - 1] = Int16GetDatum(stats->attr->attnum);
+               values[Anum_pg_statistic_stainherit - 1] = BoolGetDatum(inh);
+               values[Anum_pg_statistic_stanullfrac - 1] = Float4GetDatum(stats->stanullfrac);
+               values[Anum_pg_statistic_stawidth - 1] = Int32GetDatum(stats->stawidth);
+               values[Anum_pg_statistic_stadistinct - 1] = Float4GetDatum(stats->stadistinct);
+               i = Anum_pg_statistic_stakind1 - 1;
                for (k = 0; k < STATISTIC_NUM_SLOTS; k++)
                {
                        values[i++] = Int16GetDatum(stats->stakind[k]);         /* stakindN */
                }
+               i = Anum_pg_statistic_staop1 - 1;
                for (k = 0; k < STATISTIC_NUM_SLOTS; k++)
                {
                        values[i++] = ObjectIdGetDatum(stats->staop[k]);        /* staopN */
                }
+               i = Anum_pg_statistic_stanumbers1 - 1;
                for (k = 0; k < STATISTIC_NUM_SLOTS; k++)
                {
                        int                     nnum = stats->numnumbers[k];
@@ -1641,6 +1643,7 @@ update_attstats(Oid relid, bool inh, int natts, VacAttrStats **vacattrstats)
                                values[i++] = (Datum) 0;
                        }
                }
+               i = Anum_pg_statistic_stavalues1 - 1;
                for (k = 0; k < STATISTIC_NUM_SLOTS; k++)
                {
                        if (stats->numvalues[k] > 0)