mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

postgres_fdw: Remove useless ternary expression.

Browse Source 
There is no case where we would call pgfdw_exec_cleanup_query or
pgfdw_exec_cleanup_query_{begin,end} with a NULL query string, so this
expression is pointless; remove it and instead add to the latter
functions an assertion ensuring the given query string is not NULL.

Thinko in commit 815d61fcd.

Discussion: https://postgr.es/m/CAPmGK14mm%2B%3DUjyjoWj_Hu7c%2BQqX-058RFfF%2BqOkcMZ_Nj52v-A%40mail.gmail.com
This commit is contained in:
Etsuro Fujita 2024-04-04 17:55:00 +09:00
parent 3a4a3537a9
commit dd24098cd6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/postgres_fdw/connection.c
View File

@ -1417,6 +1417,8 @@ pgfdw_exec_cleanup_query(PGconn *conn, const char *query, bool ignore_errors)
static bool static bool
pgfdw_exec_cleanup_query_begin(PGconn *conn, const char *query) pgfdw_exec_cleanup_query_begin(PGconn *conn, const char *query)
{ {
Assert(query != NULL);
/* /*
* Submit a query. Since we don't use non-blocking mode, this also can * Submit a query. Since we don't use non-blocking mode, this also can
* block. But its risk is relatively small, so we ignore that for now. * block. But its risk is relatively small, so we ignore that for now.
@ -1438,6 +1440,8 @@ pgfdw_exec_cleanup_query_end(PGconn *conn, const char *query,
PGresult *result = NULL; PGresult *result = NULL;
bool timed_out; bool timed_out;
Assert(query != NULL);
/* /*
* If requested, consume whatever data is available from the socket. (Note * If requested, consume whatever data is available from the socket. (Note
* that if all data is available, this allows pgfdw_get_cleanup_result to * that if all data is available, this allows pgfdw_get_cleanup_result to
@ -1456,7 +1460,7 @@ pgfdw_exec_cleanup_query_end(PGconn *conn, const char *query,
if (timed_out) if (timed_out)
ereport(WARNING, ereport(WARNING,
(errmsg("could not get query result due to timeout"), (errmsg("could not get query result due to timeout"),
query ? errcontext("remote SQL command: %s", query) : 0)); errcontext("remote SQL command: %s", query)));
else else
pgfdw_report_error(WARNING, NULL, conn, false, query); pgfdw_report_error(WARNING, NULL, conn, false, query);