Commitdd24098

Etsuro Fujita

committed

postgres_fdw: Remove useless ternary expression.

There is no case where we would call pgfdw_exec_cleanup_query orpgfdw_exec_cleanup_query_{begin,end} with a NULL query string, so thisexpression is pointless; remove it and instead add to the latterfunctions an assertion ensuring the given query string is not NULL.Thinko in commit815d61f.Discussion:https://postgr.es/m/CAPmGK14mm%2B%3DUjyjoWj_Hu7c%2BQqX-058RFfF%2BqOkcMZ_Nj52v-A%40mail.gmail.com

1 parent3a4a353 commitdd24098Copy full SHA for dd24098

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1417,6 +1417,8 @@ pgfdw_exec_cleanup_query(PGconn conn, const char query, bool ignore_errors)`
`1417`	`1417`	`staticbool`
`1418`	`1418`	`pgfdw_exec_cleanup_query_begin(PGconnconn,constcharquery)`
`1419`	`1419`	`{`
	`1420`	`+Assert(query!=NULL);`
	`1421`	`+`
`1420`	`1422`	`/*`
`1421`	`1423`	`* Submit a query. Since we don't use non-blocking mode, this also can`
`1422`	`1424`	`* 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,`
`1438`	`1440`	`PGresult*result=NULL;`
`1439`	`1441`	`booltimed_out;`
`1440`	`1442`
	`1443`	`+Assert(query!=NULL);`
	`1444`	`+`
`1441`	`1445`	`/*`
`1442`	`1446`	`* If requested, consume whatever data is available from the socket. (Note`
`1443`	`1447`	`* 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,`
`1456`	`1460`	`if (timed_out)`
`1457`	`1461`	`ereport(WARNING,`
`1458`	`1462`	`(errmsg("could not get query result due to timeout"),`
`1459`		`-query ?errcontext("remote SQL command: %s",query) :0));`
	`1463`	`+errcontext("remote SQL command: %s",query)));`
`1460`	`1464`	`else`
`1461`	`1465`	`pgfdw_report_error(WARNING,NULL,conn, false,query);`
`1462`	`1466`

Comments

(0)