@@ -109,21 +109,18 @@ pgfdw_cancel_query(PGconn *conn)
109109 {
110110 if (!PQcancel (cancel , errbuf , sizeof (errbuf )))
111111 {
112- printf ("LAV: Cancel - ERROR\n" );
113112 ereport (WARNING ,
114113 (errcode (ERRCODE_CONNECTION_FAILURE ),
115114 errmsg ("could not send cancel request: %s" ,
116115 errbuf )));
117116 PQfreeCancel (cancel );
118117 return false;
119118 }
120- else
121- printf ("LAV: Cancel - OK\n" );
122119
123120 PQfreeCancel (cancel );
124121 }
125122 else
126- printf ( "---ERROR--- " );
123+ elog ( FATAL , "Can't get connection cancel descriptor " );
127124
128125 PQconsumeInput (conn );
129126 PQclear (result );
@@ -147,17 +144,9 @@ cancelQueryIfNeeded(PGconn *conn, const char *query)
147144 PQerrorMessage (conn ));
148145
149146 res = PQgetResult (conn );
150- // printf("status AFTER result request=%d, txs: %d errmsg: %s, resstatus: %s\n",
151- // PQstatus(conn),
152- // PQtransactionStatus(conn),
153- // PQerrorMessage(conn),
154- // PQresStatus(PQresultStatus(res)));
147+
155148 if (PQresultStatus (res ) == PGRES_FATAL_ERROR )
156- // {
157149 Assert (pgfdw_cancel_query (conn ));
158- // printf("TRY to CANCEL query. status=%d, txs: %d errmsg: %s, resstatus: %s\n", PQstatus(conn), PQtransactionStatus(conn), PQerrorMessage(conn),
159- // PQresStatus(PQresultStatus(res)));
160- // }
161150 else
162151 pgfdw_get_result (conn , query );
163152 }
@@ -233,7 +222,6 @@ HOOK_Utility_injection(PlannedStmt *pstmt,
233222 dest , completionTag );
234223 if (conn )
235224 cancelQueryIfNeeded (conn , queryString );
236- // pgfdw_get_result(conn, queryString);
237225}
238226
239227
0 commit comments