Commit73cbdb7

j-naylor

authored and

petere

committed

Switch format specifier for replication origins to %d

Using %u with uint16 causes warnings with -Wformat-signedness. There are manyother warnings, but for now change only these sincec920fe4 already changedthe message string for most of them.Per report from Peter EisentrautDiscussion:https://www.postgresql.org/message-id/31e63649-0355-7088-831e-b07d5f908a8c%40enterprisedb.com

1 parent44817d9 commit73cbdb7Copy full SHA for 73cbdb7

File tree

1 file changed

-8

lines changed

src/backend/replication/logical
- origin.c

1 file changed

-8

lines changed

`‎src/backend/replication/logical/origin.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ replorigin_drop_guts(Relation rel, RepOriginId roident, bool nowait)`
`352`	`352`	`if (nowait)`
`353`	`353`	`ereport(ERROR,`
`354`	`354`	`(errcode(ERRCODE_OBJECT_IN_USE),`
`355`		`-errmsg("could not drop replication origin with ID %u, in use by PID %d",`
	`355`	`+errmsg("could not drop replication origin with ID %d, in use by PID %d",`
`356`	`356`	`state->roident,`
`357`	`357`	`state->acquired_by)));`
`358`	`358`
`@@ -396,7 +396,7 @@ replorigin_drop_guts(Relation rel, RepOriginId roident, bool nowait)`
`396`	`396`	`*/`
`397`	`397`	`tuple=SearchSysCache1(REPLORIGIDENT,ObjectIdGetDatum(roident));`
`398`	`398`	`if (!HeapTupleIsValid(tuple))`
`399`		`-elog(ERROR,"cache lookup failed for replication origin with ID %u",`
	`399`	`+elog(ERROR,"cache lookup failed for replication origin with ID %d",`
`400`	`400`	`roident);`
`401`	`401`
`402`	`402`	`CatalogTupleDelete(rel,&tuple->t_self);`
`@@ -473,7 +473,7 @@ replorigin_by_oid(RepOriginId roident, bool missing_ok, char **roname)`
`473`	`473`	`if (!missing_ok)`
`474`	`474`	`ereport(ERROR,`
`475`	`475`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`476`		`-errmsg("replication origin with ID %u does not exist",`
	`476`	`+errmsg("replication origin with ID %d does not exist",`
`477`	`477`	`roident)));`
`478`	`478`
`479`	`479`	`return false;`
`@@ -787,7 +787,7 @@ StartupReplicationOrigin(void)`
`787`	`787`	`last_state++;`
`788`	`788`
`789`	`789`	`ereport(LOG,`
`790`		`-(errmsg("recovered replication state of node %u to %X/%X",`
	`790`	`+(errmsg("recovered replication state of node %d to %X/%X",`
`791`	`791`	`disk_state.roident,`
`792`	`792`	`LSN_FORMAT_ARGS(disk_state.remote_lsn))));`
`793`	`793`	`}`
`@@ -925,7 +925,7 @@ replorigin_advance(RepOriginId node,`
`925`	`925`	`{`
`926`	`926`	`ereport(ERROR,`
`927`	`927`	`(errcode(ERRCODE_OBJECT_IN_USE),`
`928`		`-errmsg("replication origin with ID %u is already active for PID %d",`
	`928`	`+errmsg("replication origin with ID %d is already active for PID %d",`
`929`	`929`	`replication_state->roident,`
`930`	`930`	`replication_state->acquired_by)));`
`931`	`931`	`}`
`@@ -936,7 +936,7 @@ replorigin_advance(RepOriginId node,`
`936`	`936`	`if (replication_state==NULL&&free_state==NULL)`
`937`	`937`	`ereport(ERROR,`
`938`	`938`	`(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),`
`939`		`-errmsg("could not find free replication state slot for replication origin with ID %u",`
	`939`	`+errmsg("could not find free replication state slot for replication origin with ID %d",`
`940`	`940`	`node),`
`941`	`941`	`errhint("Increase max_replication_slots and try again.")));`
`942`	`942`
`@@ -1114,7 +1114,7 @@ replorigin_session_setup(RepOriginId node)`
`1114`	`1114`	`{`
`1115`	`1115`	`ereport(ERROR,`
`1116`	`1116`	`(errcode(ERRCODE_OBJECT_IN_USE),`
`1117`		`-errmsg("replication origin with ID %u is already active for PID %d",`
	`1117`	`+errmsg("replication origin with ID %d is already active for PID %d",`
`1118`	`1118`	`curstate->roident,curstate->acquired_by)));`
`1119`	`1119`	`}`
`1120`	`1120`
`@@ -1126,7 +1126,7 @@ replorigin_session_setup(RepOriginId node)`
`1126`	`1126`	`if (session_replication_state==NULL&&free_slot==-1)`
`1127`	`1127`	`ereport(ERROR,`
`1128`	`1128`	`(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),`
`1129`		`-errmsg("could not find free replication state slot for replication origin with ID %u",`
	`1129`	`+errmsg("could not find free replication state slot for replication origin with ID %d",`
`1130`	`1130`	`node),`
`1131`	`1131`	`errhint("Increase max_replication_slots and try again.")));`
`1132`	`1132`	`elseif (session_replication_state==NULL)`

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!

Commit73cbdb7

File tree

1 file changed

1 file changed

`‎src/backend/replication/logical/origin.c`

0 commit comments