Skip to content

fix: ClickHouse compatibility and database scoping bugs #85

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

Open
steffen-roemer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: ClickHouse compatibility and database scoping bugs #85

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions housewatch/api/analyze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
LOGS_FREQUENCY_SQL,
EXPLAIN_QUERY,
BENCHMARKING_SQL,
AVAILABLE_TABLES_SQL,
TABLES_SQL,
TABLE_SCHEMAS_SQL,
)
from uuid import uuid4
Expand Down Expand Up @@ -263,7 +263,7 @@ def ai_tools_available(self, request: Request):

@action(detail=False, methods=["GET"])
def tables(self, request: Request):
query_result = run_query(AVAILABLE_TABLES_SQL, use_cache=False)
query_result = run_query(TABLES_SQL, use_cache=False)
return Response(query_result)

@action(detail=False, methods=["POST"])
Expand Down
21 changes: 13 additions & 8 deletions housewatch/clickhouse/queries/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import os

ch_cluster = os.getenv("CLICKHOUSE_CLUSTER", None)
ch_database = os.getenv("CLICKHOUSE_DATABASE", "default")

QUERY_LOG_SYSTEM_TABLE = f"clusterAllReplicas('{ch_cluster}', system.query_log)" if ch_cluster else "system.query_log"
TEXT_LOG_SYSTEM_TABLE = f"clusterAllReplicas('{ch_cluster}', system.text_log)" if ch_cluster else "system.text"
TEXT_LOG_SYSTEM_TABLE = f"clusterAllReplicas('{ch_cluster}', system.text_log)" if ch_cluster else "system.text_log"
ERRORS_SYSTEM_TABLE = f"clusterAllReplicas('{ch_cluster}', system.errors)" if ch_cluster else "system.errors"
DISKS_SYSTEM_TABLE = f"clusterAllReplicas('{ch_cluster}', system.disks)" if ch_cluster else "system.disks"

Expand Down Expand Up @@ -46,18 +47,22 @@
ORDER BY count DESC
"""

TABLES_SQL = """
TABLES_SQL = f"""
SELECT
database,
name,
name AS table,
formatReadableSize(total_bytes) AS readable_bytes,
total_bytes,
total_rows,
engine,
partition_key
FROM system.tables ORDER BY total_bytes DESC
FROM system.tables
WHERE database = '{ch_database}'
ORDER BY total_bytes DESC
"""

SCHEMA_SQL = """
SCHEMA_SQL = f"""
SELECT
table,
name AS column,
Expand All @@ -66,15 +71,15 @@
formatReadableSize(data_compressed_bytes) AS compressed_readable,
formatReadableSize(data_uncompressed_bytes) AS uncompressed
FROM system.columns
WHERE table = '%(table)s'
WHERE database = '{ch_database}' AND table = '%(table)s'
ORDER BY data_compressed_bytes DESC
LIMIT 100
"""

PARTS_SQL = """
PARTS_SQL = f"""
SELECT name AS part, data_compressed_bytes AS compressed, formatReadableSize(data_compressed_bytes) AS compressed_readable, formatReadableSize(data_uncompressed_bytes) AS uncompressed
FROM system.parts
WHERE table = '%(table)s'
WHERE database = '{ch_database}' AND table = '%(table)s'
ORDER BY data_compressed_bytes DESC
LIMIT 100
"""
Expand Down Expand Up @@ -206,7 +211,7 @@
formatReadableSize(space_used) readable_space_used,
formatReadableSize(free_space) readable_free_space
FROM {DISKS_SYSTEM_TABLE}
WHERE type = 'local'
WHERE lower(type) = 'local'
GROUP BY node
ORDER BY node
"""
Expand Down