Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 028b4b2

Browse files
committed
Fix incorrect format placeholders in pgstat.c
These should have been switched from %d to %u in 3188a45 in the debugging elogs added in ca1ba50. PgStat_Kind should never be higher than INT32_MAX, but let's be clean. Issue noticed while hacking more on this area.
1 parent 6618891 commit 028b4b2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/backend/utils/activity/pgstat.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
15981598

15991599
if (!pgstat_is_kind_valid(kind))
16001600
{
1601-
elog(WARNING, "invalid stats kind %d for entry of type %c",
1601+
elog(WARNING, "invalid stats kind %u for entry of type %c",
16021602
kind, t);
16031603
goto error;
16041604
}
@@ -1607,7 +1607,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
16071607

16081608
if (!info->fixed_amount)
16091609
{
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",
16111611
kind, t);
16121612
goto error;
16131613
}
@@ -1618,7 +1618,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
16181618

16191619
if (!read_chunk(fpin, ptr, info->shared_data_len))
16201620
{
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",
16221622
kind, t, info->shared_data_len);
16231623
goto error;
16241624
}
@@ -1645,7 +1645,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
16451645

16461646
if (!pgstat_is_kind_valid(key.kind))
16471647
{
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",
16491649
key.kind, key.dboid, key.objoid, t);
16501650
goto error;
16511651
}
@@ -1664,13 +1664,13 @@ pgstat_read_statsfile(XLogRecPtr redo)
16641664
}
16651665
if (!read_chunk_s(fpin, &name))
16661666
{
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",
16681668
kind, t);
16691669
goto error;
16701670
}
16711671
if (!pgstat_is_kind_valid(kind))
16721672
{
1673-
elog(WARNING, "invalid stats kind %d for entry of type %c",
1673+
elog(WARNING, "invalid stats kind %u for entry of type %c",
16741674
kind, t);
16751675
goto error;
16761676
}
@@ -1679,7 +1679,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
16791679

16801680
if (!kind_info->from_serialized_name)
16811681
{
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",
16831683
kind, t);
16841684
goto error;
16851685
}
@@ -1689,7 +1689,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
16891689
/* skip over data for entry we don't care about */
16901690
if (fseek(fpin, pgstat_get_entry_len(kind), SEEK_CUR) != 0)
16911691
{
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",
16931693
NameStr(name), kind, t);
16941694
goto error;
16951695
}
@@ -1711,7 +1711,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
17111711
if (found)
17121712
{
17131713
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",
17151715
key.kind, key.dboid, key.objoid, t);
17161716
goto error;
17171717
}
@@ -1723,7 +1723,7 @@ pgstat_read_statsfile(XLogRecPtr redo)
17231723
pgstat_get_entry_data(key.kind, header),
17241724
pgstat_get_entry_len(key.kind)))
17251725
{
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",
17271727
key.kind, key.dboid, key.objoid, t);
17281728
goto error;
17291729
}

0 commit comments

Comments
 (0)