Commit9d742e1

committed

Fix more user-visible elog() calls.

Michael Paquier discovered that this could be triggered via SQL;give a nicer message instead.Patch by Michael Paquier, reviewed by Masahiko Sawada.Discussion:http://postgr.es/m/CAB7nPqQtPg+LKKtzdKN26judHcvPZ0s1gNigzOT4j8CYuuuBYg@mail.gmail.com

1 parent8607639 commit9d742e1Copy full SHA for 9d742e1

File tree

+21

-5

lines changed

+21

-5

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,14 @@ SELECT pg_replication_origin_drop('test_decoding: temp');`
`26`	`26`	`(1 row)`
`27`	`27`
`28`	`28`	`SELECT pg_replication_origin_drop('test_decoding: temp');`
`29`		`-ERROR: cache lookup failed for replication origin 'test_decoding: temp'`
	`29`	`+ERROR: replication origin "test_decoding: temp" does not exist`
	`30`	`+-- various failure checks for undefined slots`
	`31`	`+select pg_replication_origin_advance('test_decoding: temp', '0/1');`
	`32`	`+ERROR: replication origin "test_decoding: temp" does not exist`
	`33`	`+select pg_replication_origin_session_setup('test_decoding: temp');`
	`34`	`+ERROR: replication origin "test_decoding: temp" does not exist`
	`35`	`+select pg_replication_origin_progress('test_decoding: temp', true);`
	`36`	`+ERROR: replication origin "test_decoding: temp" does not exist`
`30`	`37`	`SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');`
`31`	`38`	`?column?`
`32`	`39`	`----------`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,11 @@ SELECT pg_replication_origin_create('test_decoding: temp');`
`13`	`13`	`SELECT pg_replication_origin_drop('test_decoding: temp');`
`14`	`14`	`SELECT pg_replication_origin_drop('test_decoding: temp');`
`15`	`15`
	`16`	`+-- various failure checks for undefined slots`
	`17`	`+select pg_replication_origin_advance('test_decoding: temp','0/1');`
	`18`	`+select pg_replication_origin_session_setup('test_decoding: temp');`
	`19`	`+select pg_replication_origin_progress('test_decoding: temp', true);`
	`20`	`+`
`16`	`21`	`SELECT'init'FROM pg_create_logical_replication_slot('regression_slot','test_decoding');`
`17`	`22`
`18`	`23`	`-- origin tx`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,10 @@ replorigin_by_name(char *roname, bool missing_ok)`
`221`	`221`	`ReleaseSysCache(tuple);`
`222`	`222`	`}`
`223`	`223`	`elseif (!missing_ok)`
`224`		`-elog(ERROR,"cache lookup failed for replication origin '%s'",`
`225`		`-roname);`
	`224`	`+ereport(ERROR,`
	`225`	`+(errcode(ERRCODE_UNDEFINED_OBJECT),`
	`226`	`+errmsg("replication origin \"%s\" does not exist",`
	`227`	`+roname)));`
`226`	`228`
`227`	`229`	`returnroident;`
`228`	`230`	`}`
`@@ -422,8 +424,10 @@ replorigin_by_oid(RepOriginId roident, bool missing_ok, char **roname)`
`422`	`424`	`*roname=NULL;`
`423`	`425`
`424`	`426`	`if (!missing_ok)`
`425`		`-elog(ERROR,"cache lookup failed for replication origin with oid %u",`
`426`		`-roident);`
	`427`	`+ereport(ERROR,`
	`428`	`+(errcode(ERRCODE_UNDEFINED_OBJECT),`
	`429`	`+errmsg("replication origin with OID %u does not exist",`
	`430`	`+roident)));`
`427`	`431`
`428`	`432`	`return false;`
`429`	`433`	`}`

Comments

(0)