@@ -1213,6 +1213,11 @@ pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry)
1213
1213
* and ignore the result. Returns true if we successfully cancel the query
1214
1214
* and discard any pending result, and false if not.
1215
1215
*
1216
+ * It's not a huge problem if we throw an ERROR here, but if we get into error
1217
+ * recursion trouble, we'll end up slamming the connection shut, which will
1218
+ * necessitate failing the entire toplevel transaction even if subtransactions
1219
+ * were used. Try to use WARNING where we can.
1220
+ *
1216
1221
* XXX: if the query was one sent by fetch_more_data_begin(), we could get the
1217
1222
* query text from the pendingAreq saved in the per-connection state, then
1218
1223
* report the query using it.
@@ -1263,6 +1268,11 @@ pgfdw_cancel_query(PGconn *conn)
1263
1268
* If the query is executed successfully but returns an error, the return
1264
1269
* value is true if and only if ignore_errors is set. If the query can't be
1265
1270
* sent or times out, the return value is false.
1271
+ *
1272
+ * It's not a huge problem if we throw an ERROR here, but if we get into error
1273
+ * recursion trouble, we'll end up slamming the connection shut, which will
1274
+ * necessitate failing the entire toplevel transaction even if subtransactions
1275
+ * were used. Try to use WARNING where we can.
1266
1276
*/
1267
1277
static bool
1268
1278
pgfdw_exec_cleanup_query (PGconn * conn ,const char * query ,bool ignore_errors )
@@ -1309,11 +1319,6 @@ pgfdw_exec_cleanup_query(PGconn *conn, const char *query, bool ignore_errors)
1309
1319
* be a query that was initiated as part of transaction abort to get the remote
1310
1320
* side back to the appropriate state.
1311
1321
*
1312
- * It's not a huge problem if we throw an ERROR here, but if we get into error
1313
- * recursion trouble, we'll end up slamming the connection shut, which will
1314
- * necessitate failing the entire toplevel transaction even if subtransactions
1315
- * were used. Try to use WARNING where we can.
1316
- *
1317
1322
* endtime is the time at which we should give up and assume the remote
1318
1323
* side is dead. Returns true if the timeout expired, otherwise false.
1319
1324
* Sets *result except in case of a timeout.