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