From f37cbcc99a369bd7ab0b1e4b3e2f2930e7e6cb51 Mon Sep 17 00:00:00 2001 From: Pierre Massat Date: Mon, 10 Feb 2025 17:06:49 -0500 Subject: [PATCH 1/2] chore: Upgrade clickhouse-driver to 0.2.9 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6ee13e0233a..bd5a935a60a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ black==22.6.0 blinker==1.5 click==8.1.7 -clickhouse-driver==0.2.6 +clickhouse-driver==0.2.9 confluent-kafka==2.7.0 datadog==0.21.0 devservices==1.0.16 From 63dcee4fbd97139c60edf41d88d7b44da01f59db Mon Sep 17 00:00:00 2001 From: Pierre Massat Date: Tue, 11 Feb 2025 12:09:13 -0500 Subject: [PATCH 2/2] Test before accessing or default --- snuba/clickhouse/native.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/snuba/clickhouse/native.py b/snuba/clickhouse/native.py index 6d65d124e84..bbf3b22747a 100644 --- a/snuba/clickhouse/native.py +++ b/snuba/clickhouse/native.py @@ -206,11 +206,11 @@ def query_execute() -> Any: result_data = query_execute() profile_data = ClickhouseProfile( - bytes=conn.last_query.profile_info.bytes or 0, - progress_bytes=conn.last_query.progress.bytes or 0, - blocks=conn.last_query.profile_info.blocks or 0, - rows=conn.last_query.profile_info.rows or 0, + blocks=getattr(conn.last_query.profile_info, "blocks", 0), + bytes=getattr(conn.last_query.profile_info, "bytes", 0), elapsed=conn.last_query.elapsed or 0.0, + progress_bytes=getattr(conn.last_query.progress, "bytes", 0), + rows=getattr(conn.last_query.profile_info, "rows", 0), ) if with_column_types: result = ClickhouseResult(