From 06d5803ffa1ea5a42295c9266f30557e44a99de7 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 11 Dec 2014 15:41:15 -0500 Subject: [PATCH] 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. --- src/backend/access/heap/tuptoaster.c | 2 +- src/backend/postmaster/pgstat.c | 16 ++++++++-------- src/backend/replication/logical/reorderbuffer.c | 2 +- src/bin/pg_dump/parallel.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index ce44bbd303..d230387c85 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -2155,7 +2155,7 @@ toast_open_indexes(Relation toastrel, * wrong if there is nothing. */ if (!found) - elog(ERROR, "no valid index found for toast relation with Oid %d", + elog(ERROR, "no valid index found for toast relation with Oid %u", RelationGetRelid(toastrel)); return res; diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index c7f41a5067..f71fdeb142 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -3600,7 +3600,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. @@ -3777,7 +3777,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. @@ -3858,7 +3858,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); } } @@ -4070,7 +4070,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); } @@ -4228,7 +4228,7 @@ done: if (permanent) { - elog(DEBUG2, "removing permanent stats file '%s'", statfile); + elog(DEBUG2, "removing permanent stats file \"%s\"", statfile); unlink(statfile); } @@ -4540,7 +4540,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 @@ -4598,7 +4598,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); @@ -4770,7 +4770,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/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 6e75398eab..cd132c16ad 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -2458,7 +2458,7 @@ ReorderBufferToastAppendChunk(ReorderBuffer *rb, ReorderBufferTXN *txn, Pointer chunk; TupleDesc desc = RelationGetDescr(relation); Oid chunk_id; - Oid chunk_seq; + int32 chunk_seq; if (txn->toast_hash == NULL) ReorderBufferToastInitHash(rb, txn); diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index 0a9ac0287a..a59508f7da 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -821,7 +821,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);