NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit98e675e

committed

Fix incorrect error message for IDENTIFY_SYSTEM

Commit5a991ef accidentally reversed the order of the tuplesand fields parameters, making the error message incorrectly referto 3 tuples with 1 field when IDENTIFY_SYSTEM returns 1 tuple and3 or 4 fields. Fix by changing the order of the parameters. Thisalso adds a comment describing why we check for < 3 when postgressince 9.4 has been sending 4 fields.Backpatch all the way since the bug is almost a decade old.Author: Tomonari Katsumata <t.katsumata1122@gmail.com>Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Bug: #18224Backpatch-through: v12

1 parentb8ba734 commit98e675eCopy full SHA for 98e675e

File tree

1 file changed

-1

lines changed

src/backend/replication/libpqwalreceiver
- libpqwalreceiver.c

1 file changed

-1

lines changed

`‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,10 @@ libpqrcv_identify_system(WalReceiverConn conn, TimeLineID primary_tli)`
`381`	`381`	`"the primary server: %s",`
`382`	`382`	`pchomp(PQerrorMessage(conn->streamConn)))));`
`383`	`383`	`}`
	`384`	`+/*`
	`385`	`+ * IDENTIFY_SERVER returns 3 columns in 9.3 and earlier, and 4 columns in`
	`386`	`+ * 9.4 and onwards.`
	`387`	`+ */`
`384`	`388`	`if (PQnfields(res)<3\|\|PQntuples(res)!=1)`
`385`	`389`	`{`
`386`	`390`	`intntuples=PQntuples(res);`
`@@ -391,7 +395,7 @@ libpqrcv_identify_system(WalReceiverConn conn, TimeLineID primary_tli)`
`391`	`395`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`392`	`396`	`errmsg("invalid response from primary server"),`
`393`	`397`	`errdetail("Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields.",`
`394`		`-ntuples,nfields,3,1)));`
	`398`	`+ntuples,nfields,1,3)));`
`395`	`399`	`}`
`396`	`400`	`primary_sysid=pstrdup(PQgetvalue(res,0,0));`
`397`	`401`	`*primary_tli=pg_strtoint32(PQgetvalue(res,0,1));`

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!

Commit98e675e

File tree

1 file changed

1 file changed

`‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c`

0 commit comments