Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1ce2986

Browse files
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 parentff186ea commit1ce2986

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli)
358358
"the primary server: %s",
359359
pchomp(PQerrorMessage(conn->streamConn)))));
360360
}
361+
/*
362+
* IDENTIFY_SERVER returns 3 columns in 9.3 and earlier, and 4 columns in
363+
* 9.4 and onwards.
364+
*/
361365
if (PQnfields(res)<3||PQntuples(res)!=1)
362366
{
363367
intntuples=PQntuples(res);
@@ -367,7 +371,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli)
367371
ereport(ERROR,
368372
(errmsg("invalid response from primary server"),
369373
errdetail("Could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields.",
370-
ntuples,nfields,3,1)));
374+
ntuples,nfields,1,3)));
371375
}
372376
primary_sysid=pstrdup(PQgetvalue(res,0,0));
373377
*primary_tli=pg_strtoint32(PQgetvalue(res,0,1));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp