NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2c96b0b

committed

Fix assorted confusion between Oid and int32.

In passing, also make some debugging elog's in pgstat.c a bit moreconsistently worded.Back-patch as far as applicable (9.3 or 9.4; none of these mistakes arereally old).Mark Dilger identified and patched the type violations; the messagerewordings are mine.

1 parent2df66f0 commit2c96b0bCopy full SHA for 2c96b0b

File tree

2 files changed

-9

lines changed

src
- backend/postmaster
  - pgstat.c
- bin/pg_dump
  - parallel.c

2 files changed

-9

lines changed

`‎src/backend/postmaster/pgstat.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3514,7 +3514,7 @@ pgstat_write_statsfiles(bool permanent, bool allDbs)`
`3514`	`3514`	`constchar*statfile=permanent ?PGSTAT_STAT_PERMANENT_FILENAME :pgstat_stat_filename;`
`3515`	`3515`	`intrc;`
`3516`	`3516`
`3517`		`-elog(DEBUG2,"writingstatsfile '%s'",statfile);`
	`3517`	`+elog(DEBUG2,"writingstats file \"%s\"",statfile);`
`3518`	`3518`
`3519`	`3519`	`/*`
`3520`	`3520`	`* Open the statistics temp file to write out the current values.`
`@@ -3685,7 +3685,7 @@ pgstat_write_db_statsfile(PgStat_StatDBEntry *dbentry, bool permanent)`
`3685`	`3685`	`get_dbstat_filename(permanent, true,dbid,tmpfile,MAXPGPATH);`
`3686`	`3686`	`get_dbstat_filename(permanent, false,dbid,statfile,MAXPGPATH);`
`3687`	`3687`
`3688`		`-elog(DEBUG2,"writingstatsfile '%s'",statfile);`
	`3688`	`+elog(DEBUG2,"writingstats file \"%s\"",statfile);`
`3689`	`3689`
`3690`	`3690`	`/*`
`3691`	`3691`	`* Open the statistics temp file to write out the current values.`
`@@ -3766,7 +3766,7 @@ pgstat_write_db_statsfile(PgStat_StatDBEntry *dbentry, bool permanent)`
`3766`	`3766`	`{`
`3767`	`3767`	`get_dbstat_filename(false, false,dbid,statfile,MAXPGPATH);`
`3768`	`3768`
`3769`		`-elog(DEBUG2,"removing temporarystat file'%s'",statfile);`
	`3769`	`+elog(DEBUG2,"removing temporarystats file\"%s\"",statfile);`
`3770`	`3770`	`unlink(statfile);`
`3771`	`3771`	`}`
`3772`	`3772`	`}`
`@@ -3966,7 +3966,7 @@ pgstat_read_statsfiles(Oid onlydb, bool permanent, bool deep)`
`3966`	`3966`	`/* If requested to read the permanent file, also get rid of it. */`
`3967`	`3967`	`if (permanent)`
`3968`	`3968`	`{`
`3969`		`-elog(DEBUG2,"removing permanent stats file'%s'",statfile);`
	`3969`	`+elog(DEBUG2,"removing permanent stats file\"%s\"",statfile);`
`3970`	`3970`	`unlink(statfile);`
`3971`	`3971`	`}`
`3972`	`3972`
`@@ -4124,7 +4124,7 @@ pgstat_read_db_statsfile(Oid databaseid, HTAB tabhash, HTAB funchash,`
`4124`	`4124`
`4125`	`4125`	`if (permanent)`
`4126`	`4126`	`{`
`4127`		`-elog(DEBUG2,"removing permanent stats file'%s'",statfile);`
	`4127`	`+elog(DEBUG2,"removing permanent stats file\"%s\"",statfile);`
`4128`	`4128`	`unlink(statfile);`
`4129`	`4129`	`}`
`4130`	`4130`
`@@ -4423,7 +4423,7 @@ pgstat_recv_inquiry(PgStat_MsgInquiry *msg, int len)`
`4423`	`4423`	`DBWriteRequest*newreq;`
`4424`	`4424`	`PgStat_StatDBEntry*dbentry;`
`4425`	`4425`
`4426`		`-elog(DEBUG2,"received inquiry for%d",msg->databaseid);`
	`4426`	`+elog(DEBUG2,"received inquiry fordatabase %u",msg->databaseid);`
`4427`	`4427`
`4428`	`4428`	`/*`
`4429`	`4429`	`* 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)`
`4481`	`4481`	`writetime=pstrdup(timestamptz_to_str(dbentry->stats_timestamp));`
`4482`	`4482`	`mytime=pstrdup(timestamptz_to_str(cur_ts));`
`4483`	`4483`	`elog(LOG,`
`4484`		`-"stats_timestamp %s is later than collector's time %s fordb %d",`
	`4484`	`+"stats_timestamp %s is later than collector's time %s fordatabase %u",`
`4485`	`4485`	`writetime,mytime,dbentry->databaseid);`
`4486`	`4486`	`pfree(writetime);`
`4487`	`4487`	`pfree(mytime);`
`@@ -4653,7 +4653,7 @@ pgstat_recv_dropdb(PgStat_MsgDropdb *msg, int len)`
`4653`	`4653`
`4654`	`4654`	`get_dbstat_filename(false, false,dbid,statfile,MAXPGPATH);`
`4655`	`4655`
`4656`		`-elog(DEBUG2,"removing%s",statfile);`
	`4656`	`+elog(DEBUG2,"removingstats file \"%s\"",statfile);`
`4657`	`4657`	`unlink(statfile);`
`4658`	`4658`
`4659`	`4659`	`if (dbentry->tables!=NULL)`

`‎src/bin/pg_dump/parallel.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ lockTableNoWait(ArchiveHandle AH, TocEntry te)`
`813`	`813`	`" pg_class.relname "`
`814`	`814`	`" FROM pg_class "`
`815`	`815`	`" JOIN pg_namespace on pg_namespace.oid = relnamespace "`
`816`		`-" WHERE pg_class.oid = %d",te->catalogId.oid);`
	`816`	`+" WHERE pg_class.oid = %u",te->catalogId.oid);`
`817`	`817`
`818`	`818`	`res=PQexec(AH->connection,query->data);`
`819`	`819`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2c96b0b

File tree

2 files changed

2 files changed

`‎src/backend/postmaster/pgstat.c`

`‎src/bin/pg_dump/parallel.c`

0 commit comments