aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-11-16 22:11:58 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-11-16 22:20:19 +0300
commitfc534ef7d05a8f876fe68dac33664d5cf973ac6b (patch)
tree8cecd541009832fc42f10101dad7e3493624e2c1
parente0ece3a670de1090fcb097575f087364742a9ef6 (diff)
downloadydb-fc534ef7d05a8f876fe68dac33664d5cf973ac6b.tar.gz
Intermediate changes
commit_hash:892a91804b4df7261c13e779f9cd1a821adf4044
-rw-r--r--contrib/python/clickhouse-connect/.dist-info/METADATA2
-rw-r--r--contrib/python/clickhouse-connect/clickhouse_connect/__version__.py2
-rw-r--r--contrib/python/clickhouse-connect/clickhouse_connect/driver/httpclient.py2
-rw-r--r--contrib/python/clickhouse-connect/clickhouse_connect/driver/httputil.py2
-rw-r--r--contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py15
-rw-r--r--contrib/python/clickhouse-connect/ya.make2
6 files changed, 13 insertions, 12 deletions
diff --git a/contrib/python/clickhouse-connect/.dist-info/METADATA b/contrib/python/clickhouse-connect/.dist-info/METADATA
index 21a0525563..9db3c9cfbd 100644
--- a/contrib/python/clickhouse-connect/.dist-info/METADATA
+++ b/contrib/python/clickhouse-connect/.dist-info/METADATA
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: clickhouse-connect
-Version: 0.8.5
+Version: 0.8.6
Summary: ClickHouse Database Core Driver for Python, Pandas, and Superset
Home-page: https://github.com/ClickHouse/clickhouse-connect
Author: ClickHouse Inc.
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py b/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
index ef88a314d6..83918bb25d 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
@@ -1 +1 @@
-version = '0.8.5'
+version = '0.8.6'
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/httpclient.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/httpclient.py
index 33d6b9364c..a0e74e9643 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/httpclient.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/httpclient.py
@@ -482,7 +482,7 @@ class HttpClient(Client):
See BaseClient doc_string for this method
"""
body, params, fields = self._prep_raw_query(query, parameters, settings, fmt, use_database, external_data)
- return self._raw_request(body, params, fields=fields, stream=True)
+ return self._raw_request(body, params, fields=fields, stream=True, server_wait=False)
def _prep_raw_query(self, query: str,
parameters: Optional[Union[Sequence, Dict[str, Any]]],
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/httputil.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/httputil.py
index 558d66f614..deb68ce05c 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/httputil.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/httputil.py
@@ -225,7 +225,7 @@ class ResponseSource:
chunks = deque()
done = False
current_size = 0
- read_gen = response.read_chunked(chunk_size, decompress is None)
+ read_gen = response.stream(chunk_size, decompress is None)
while True:
while not done:
chunk = next(read_gen, None) # Always try to read at least one chunk if there are any left
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py
index 1d20d9c6e7..34ec1b7f4d 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py
@@ -54,13 +54,14 @@ class NativeTransform:
if isinstance(ex, StreamCompleteException):
# We ran out of data before it was expected, this could be ClickHouse reporting an error
# in the response
- message = source.last_message
- if len(message) > 1024:
- message = message[-1024:]
- error_start = message.find('Code: ')
- if error_start != -1:
- message = message[error_start:]
- raise StreamFailureError(message) from None
+ if source.last_message:
+ message = source.last_message
+ if len(message) > 1024:
+ message = message[-1024:]
+ error_start = message.find('Code: ')
+ if error_start != -1:
+ message = message[error_start:]
+ raise StreamFailureError(message) from None
raise
block_num += 1
return result_block
diff --git a/contrib/python/clickhouse-connect/ya.make b/contrib/python/clickhouse-connect/ya.make
index c9e611a5f4..b91d547356 100644
--- a/contrib/python/clickhouse-connect/ya.make
+++ b/contrib/python/clickhouse-connect/ya.make
@@ -2,7 +2,7 @@
PY3_LIBRARY()
-VERSION(0.8.5)
+VERSION(0.8.6)
LICENSE(Apache-2.0)