Commitc67a55d

committed

Make lsn argument of walrcv_create_slot() optional

Some callers are not using it, so it's wasteful to have to specify it.Reviewed-by: Masahiko Sawada <masahiko.sawada@2ndquadrant.com>Discussion:https://www.postgresql.org/message-id/CA+fd4k4BcYrYucNfTnK-CQX3+jsG+PRPEhHAUSo-W4P0Lec57A@mail.gmail.com

1 parentc096a80 commitc67a55dCopy full SHA for c67a55d

File tree

-4

lines changed

src/backend
- commands
  - subscriptioncmds.c
- replication/libpqwalreceiver
  - libpqwalreceiver.c

-4

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,6 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)`
`428`	`428`	`*/`
`429`	`429`	`if (connect)`
`430`	`430`	`{`
`431`		`-XLogRecPtrlsn;`
`432`	`431`	`char*err;`
`433`	`432`	`WalReceiverConn*wrconn;`
`434`	`433`	`List*tables;`
`@@ -479,7 +478,7 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)`
`479`	`478`	`Assert(slotname);`
`480`	`479`
`481`	`480`	`walrcv_create_slot(wrconn,slotname, false,`
`482`		`-CRS_NOEXPORT_SNAPSHOT,&lsn);`
	`481`	`+CRS_NOEXPORT_SNAPSHOT,NULL);`
`483`	`482`	`ereport(NOTICE,`
`484`	`483`	`(errmsg("created replication slot \"%s\" on publisher",`
`485`	`484`	`slotname)));`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -844,8 +844,10 @@ libpqrcv_create_slot(WalReceiverConn conn, const char slotname,`
`844`	`844`	`slotname,pchomp(PQerrorMessage(conn->streamConn)))));`
`845`	`845`	`}`
`846`	`846`
`847`		`-*lsn=DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in,InvalidOid,`
`848`		`-CStringGetDatum(PQgetvalue(res,0,1))));`
	`847`	`+if (lsn)`
	`848`	`+*lsn=DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in,InvalidOid,`
	`849`	`+CStringGetDatum(PQgetvalue(res,0,1))));`
	`850`	`+`
`849`	`851`	`if (!PQgetisnull(res,0,2))`
`850`	`852`	`snapshot=pstrdup(PQgetvalue(res,0,2));`
`851`	`853`	`else`

Comments

(0)