Fix assorted confusion between Oid and int32.

In passing, also make some debugging elog's in pgstat.c a bit more
consistently worded.

Back-patch as far as applicable (9.3 or 9.4; none of these mistakes are
really old).

Mark Dilger identified and patched the type violations; the message
rewordings are mine.

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 99701bb532258d349e7140d8fc88f7e779afac93..34aeb6eb728b25ff3c359449bc6b3d9f92142b59 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -3514,7 +3514,7 @@ pgstat_write_statsfiles(bool permanent, bool allDbs)
        const char *statfile = permanent ? PGSTAT_STAT_PERMANENT_FILENAME : pgstat_stat_filename;
        int                     rc;
 
-       elog(DEBUG2, "writing statsfile '%s'", statfile);
+       elog(DEBUG2, "writing stats file \"%s\"", statfile);
 
        /*
         * Open the statistics temp file to write out the current values.
@@ -3685,7 +3685,7 @@ pgstat_write_db_statsfile(PgStat_StatDBEntry *dbentry, bool permanent)
        get_dbstat_filename(permanent, true, dbid, tmpfile, MAXPGPATH);
        get_dbstat_filename(permanent, false, dbid, statfile, MAXPGPATH);
 
-       elog(DEBUG2, "writing statsfile '%s'", statfile);
+       elog(DEBUG2, "writing stats file \"%s\"", statfile);
 
        /*
         * Open the statistics temp file to write out the current values.
@@ -3766,7 +3766,7 @@ pgstat_write_db_statsfile(PgStat_StatDBEntry *dbentry, bool permanent)
        {
                get_dbstat_filename(false, false, dbid, statfile, MAXPGPATH);
 
-               elog(DEBUG2, "removing temporary stat file '%s'", statfile);
+               elog(DEBUG2, "removing temporary stats file \"%s\"", statfile);
                unlink(statfile);
        }
 }
@@ -3966,7 +3966,7 @@ done:
        /* If requested to read the permanent file, also get rid of it. */
        if (permanent)
        {
-               elog(DEBUG2, "removing permanent stats file '%s'", statfile);
+               elog(DEBUG2, "removing permanent stats file \"%s\"", statfile);
                unlink(statfile);
        }
 
@@ -4124,7 +4124,7 @@ done:
 
        if (permanent)
        {
-               elog(DEBUG2, "removing permanent stats file '%s'", statfile);
+               elog(DEBUG2, "removing permanent stats file \"%s\"", statfile);
                unlink(statfile);
        }
 
@@ -4423,7 +4423,7 @@ pgstat_recv_inquiry(PgStat_MsgInquiry *msg, int len)
        DBWriteRequest *newreq;
        PgStat_StatDBEntry *dbentry;
 
-       elog(DEBUG2, "received inquiry for %d", msg->databaseid);
+       elog(DEBUG2, "received inquiry for database %u", msg->databaseid);
 
        /*
         * Find the last write request for this DB.  If it's older than the
@@ -4481,7 +4481,7 @@ pgstat_recv_inquiry(PgStat_MsgInquiry *msg, int len)
                        writetime = pstrdup(timestamptz_to_str(dbentry->stats_timestamp));
                        mytime = pstrdup(timestamptz_to_str(cur_ts));
                        elog(LOG,
-                       "stats_timestamp %s is later than collector's time %s for db %d",
+                                "stats_timestamp %s is later than collector's time %s for database %u",
                                 writetime, mytime, dbentry->databaseid);
                        pfree(writetime);
                        pfree(mytime);
@@ -4653,7 +4653,7 @@ pgstat_recv_dropdb(PgStat_MsgDropdb *msg, int len)
 
                get_dbstat_filename(false, false, dbid, statfile, MAXPGPATH);
 
-               elog(DEBUG2, "removing %s", statfile);
+               elog(DEBUG2, "removing stats file \"%s\"", statfile);
                unlink(statfile);
 
                if (dbentry->tables != NULL)

diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 864c1a6daee972cff8d31d0b158c9cdb7127db61..b5fd86afe7c2b6f3fb5c9e7c9d8ea0364434a988 100644 (file)
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -813,7 +813,7 @@ lockTableNoWait(ArchiveHandle *AH, TocEntry *te)
                                          "       pg_class.relname "
                                          "  FROM pg_class "
                                        "  JOIN pg_namespace on pg_namespace.oid = relnamespace "
-                                         " WHERE pg_class.oid = %d", te->catalogId.oid);
+                                         " WHERE pg_class.oid = %u", te->catalogId.oid);
 
        res = PQexec(AH->connection, query->data);