Skip to content

Align query cancellation with JDBC driver #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2023
Merged

Align query cancellation with JDBC driver #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions trino/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@ def __init__(
self._request = request
self._update_type = None
self._update_count = None
self._next_uri = None
self._sql = sql
self._result: Optional[TrinoResult] = None
self._legacy_primitive_types = legacy_primitive_types
Expand Down Expand Up @@ -817,6 +818,7 @@ def _update_state(self, status):
self._stats.update(status.stats)
self._update_type = status.update_type
self._update_count = status.update_count
self._next_uri = status.next_uri
if not self._row_mapper and status.columns:
self._row_mapper = RowMapperFactory().create(columns=status.columns,
legacy_primitive_types=self._legacy_primitive_types)
Expand All @@ -839,12 +841,11 @@ def fetch(self) -> List[List[Any]]:

def cancel(self) -> None:
"""Cancel the current query"""
if self.query_id is None or self.finished:
if self._next_uri is None:
return

url = self._request.get_url("/v1/query/{}".format(self.query_id))
logger.debug("cancelling query: %s", self.query_id)
response = self._request.delete(url)
response = self._request.delete(self._next_uri)
logger.debug(response)
if response.status_code == requests.codes.no_content:
self._cancelled = True
Expand Down