opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compile failure. 

I forgot that some compilers won't handle #if constructs within
ereport() calls.  Duplicating most of the call is annoying but simple.
Per buildfarm.
This commit is contained in:
Tom Lane 2020-02-24 18:43:23 -05:00
parent 2742c45080
commit 36390713a6
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/dblink/dblink.c
View File

@ -207,16 +207,21 @@ dblink_get_conn(char *conname_or_str,
* ensures that VFDs are closed if needed to make room.)
*/
if (!AcquireExternalFD())
{
#ifndef WIN32 /* can't write #if within ereport() macro */
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
#ifndef WIN32
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
#else
errhint("Raise the server's max_files_per_process setting.")
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
#endif
));
}
/* OK to make connection */
conn = PQconnectdb(connstr);
@ -310,16 +315,21 @@ dblink_connect(PG_FUNCTION_ARGS)
* that VFDs are closed if needed to make room.)
*/
if (!AcquireExternalFD())
{
#ifndef WIN32 /* can't write #if within ereport() macro */
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
#ifndef WIN32
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
#else
errhint("Raise the server's max_files_per_process setting.")
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
#endif
));
}
/* OK to make connection */
conn = PQconnectdb(connstr);

14
contrib/postgres_fdw/connection.c
View File

@ -269,17 +269,23 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
* ensures that VFDs are closed if needed to make room.)
*/
if (!AcquireExternalFD())
{
#ifndef WIN32 /* can't write #if within ereport() macro */
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not connect to server \"%s\"",
server->servername),
errdetail("There are too many open files on the local server."),
#ifndef WIN32
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
#else
errhint("Raise the server's max_files_per_process setting.")
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not connect to server \"%s\"",
server->servername),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
#endif
));
}
/* OK to make connection */
conn = PQconnectdbParams(keywords, values, false);