NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit028b4b2

committed

Fix incorrect format placeholders in pgstat.c

These should have been switched from %d to %u in3188a45 in thedebugging elogs added inca1ba50. PgStat_Kind should never behigher than INT32_MAX, but let's be clean.Issue noticed while hacking more on this area.

1 parent6618891 commit028b4b2Copy full SHA for 028b4b2

File tree

1 file changed

+10

-10

lines changed

src/backend/utils/activity
- pgstat.c

1 file changed

+10

-10

lines changed

`‎src/backend/utils/activity/pgstat.c`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1598`	`1598`
`1599`	`1599`	`if (!pgstat_is_kind_valid(kind))`
`1600`	`1600`	`{`
`1601`		`-elog(WARNING,"invalid stats kind %d for entry of type %c",`
	`1601`	`+elog(WARNING,"invalid stats kind %u for entry of type %c",`
`1602`	`1602`	`kind,t);`
`1603`	`1603`	`gotoerror;`
`1604`	`1604`	`}`
`@@ -1607,7 +1607,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1607`	`1607`
`1608`	`1608`	`if (!info->fixed_amount)`
`1609`	`1609`	`{`
`1610`		`-elog(WARNING,"invalid fixed_amount in stats kind %d for entry of type %c",`
	`1610`	`+elog(WARNING,"invalid fixed_amount in stats kind %u for entry of type %c",`
`1611`	`1611`	`kind,t);`
`1612`	`1612`	`gotoerror;`
`1613`	`1613`	`}`
`@@ -1618,7 +1618,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1618`	`1618`
`1619`	`1619`	`if (!read_chunk(fpin,ptr,info->shared_data_len))`
`1620`	`1620`	`{`
`1621`		`-elog(WARNING,"could not read data of stats kind %d for entry of type %c with size %u",`
	`1621`	`+elog(WARNING,"could not read data of stats kind %u for entry of type %c with size %u",`
`1622`	`1622`	`kind,t,info->shared_data_len);`
`1623`	`1623`	`gotoerror;`
`1624`	`1624`	`}`
`@@ -1645,7 +1645,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1645`	`1645`
`1646`	`1646`	`if (!pgstat_is_kind_valid(key.kind))`
`1647`	`1647`	`{`
`1648`		`-elog(WARNING,"invalid stats kind for entry %d/%u/%u of type %c",`
	`1648`	`+elog(WARNING,"invalid stats kind for entry %u/%u/%u of type %c",`
`1649`	`1649`	`key.kind,key.dboid,key.objoid,t);`
`1650`	`1650`	`gotoerror;`
`1651`	`1651`	`}`
`@@ -1664,13 +1664,13 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1664`	`1664`	`}`
`1665`	`1665`	`if (!read_chunk_s(fpin,&name))`
`1666`	`1666`	`{`
`1667`		`-elog(WARNING,"could not read name of stats kind %d for entry of type %c",`
	`1667`	`+elog(WARNING,"could not read name of stats kind %u for entry of type %c",`
`1668`	`1668`	`kind,t);`
`1669`	`1669`	`gotoerror;`
`1670`	`1670`	`}`
`1671`	`1671`	`if (!pgstat_is_kind_valid(kind))`
`1672`	`1672`	`{`
`1673`		`-elog(WARNING,"invalid stats kind %d for entry of type %c",`
	`1673`	`+elog(WARNING,"invalid stats kind %u for entry of type %c",`
`1674`	`1674`	`kind,t);`
`1675`	`1675`	`gotoerror;`
`1676`	`1676`	`}`
`@@ -1679,7 +1679,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1679`	`1679`
`1680`	`1680`	`if (!kind_info->from_serialized_name)`
`1681`	`1681`	`{`
`1682`		`-elog(WARNING,"invalid from_serialized_name in stats kind %d for entry of type %c",`
	`1682`	`+elog(WARNING,"invalid from_serialized_name in stats kind %u for entry of type %c",`
`1683`	`1683`	`kind,t);`
`1684`	`1684`	`gotoerror;`
`1685`	`1685`	`}`
`@@ -1689,7 +1689,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1689`	`1689`	`/* skip over data for entry we don't care about */`
`1690`	`1690`	`if (fseek(fpin,pgstat_get_entry_len(kind),SEEK_CUR)!=0)`
`1691`	`1691`	`{`
`1692`		`-elog(WARNING,"could not seek \"%s\" of stats kind %d for entry of type %c",`
	`1692`	`+elog(WARNING,"could not seek \"%s\" of stats kind %u for entry of type %c",`
`1693`	`1693`	`NameStr(name),kind,t);`
`1694`	`1694`	`gotoerror;`
`1695`	`1695`	`}`
`@@ -1711,7 +1711,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1711`	`1711`	`if (found)`
`1712`	`1712`	`{`
`1713`	`1713`	`dshash_release_lock(pgStatLocal.shared_hash,p);`
`1714`		`-elog(WARNING,"found duplicate stats entry %d/%u/%u of type %c",`
	`1714`	`+elog(WARNING,"found duplicate stats entry %u/%u/%u of type %c",`
`1715`	`1715`	`key.kind,key.dboid,key.objoid,t);`
`1716`	`1716`	`gotoerror;`
`1717`	`1717`	`}`
`@@ -1723,7 +1723,7 @@ pgstat_read_statsfile(XLogRecPtr redo)`
`1723`	`1723`	`pgstat_get_entry_data(key.kind,header),`
`1724`	`1724`	`pgstat_get_entry_len(key.kind)))`
`1725`	`1725`	`{`
`1726`		`-elog(WARNING,"could not read data for entry %d/%u/%u of type %c",`
	`1726`	`+elog(WARNING,"could not read data for entry %u/%u/%u of type %c",`
`1727`	`1727`	`key.kind,key.dboid,key.objoid,t);`
`1728`	`1728`	`gotoerror;`
`1729`	`1729`	`}`

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!

Commit028b4b2

File tree

1 file changed

1 file changed

`‎src/backend/utils/activity/pgstat.c`

0 commit comments