diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-12-11 15:41:23 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-12-11 15:41:23 -0500 |
| commit | 2c96b0ba8dc90b5a5f9f787b1acbc0ff27b1778f (patch) | |
| tree | 02b8cc97c9f12a3b3118f1e6ba7efb88e9547ece /src/backend/postmaster/pgstat.c | |
| parent | 2df66f01abe8b18e7e194989132dd263b5881b04 (diff) | |
| download | postgresql-2c96b0ba8dc90b5a5f9f787b1acbc0ff27b1778f.tar.gz postgresql-2c96b0ba8dc90b5a5f9f787b1acbc0ff27b1778f.zip | |
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.
Diffstat (limited to 'src/backend/postmaster/pgstat.c')
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 99701bb5322..34aeb6eb728 100644 --- 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) |