mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Alexey MilovidovandClaude Opus 4.8
295ced78d1
Follow-up to #105171, which added `ruff` with a deliberately narrow, bug-class-only rule set and left the unused-name and star-import rules off pending a dedicated cleanup pass. This enables that second batch in `pyproject.toml` and fixes every violation across the tree (the bulk in integration tests): - `F401` unused-import and `F841` unused-variable: removed, preserving any side-effecting right-hand side (e.g. `result = node.query(...)` becomes `node.query(...)`). Two `try: import ...` feature probes are kept with `# noqa: F401`. - `F541` f-string-missing-placeholders: dropped the redundant `f` prefix. - `F403`/`F405` star imports: every `from module import *` is expanded into explicit imports of the names actually used, taken from each name's real origin, so stdlib/third-party names import from their real source rather than through a test "convenience bundle". The now-empty `tests/integration/helpers/kafka/common_direct.py` bundle is removed and its three remaining consumers import `_VarintBytes`/`KafkaAdminClient` directly. Eliminating the star imports surfaced a real bug the wildcard had masked from `F821`: `generate_presets.py` in `test_prometheus_protocols` called an undefined `execute_instant_query_with_http_api`; fixed to the existing `execute_query_via_http_api`. No `black`/`isort` reformatting was applied (neither is enforced in the style check), so the diff is limited to the lint fixes themselves. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
127 lines
3.5 KiB
Python
127 lines
3.5 KiB
Python
import uuid
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.test_tools import TSV
|
|
|
|
CLICKHOUSE_MAX_VERSION_WITH_ANALYZER_DISABLED_BY_DEFAULT = "24.2"
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
# Here analyzer is enabled by default
|
|
current = cluster.add_instance(
|
|
"current",
|
|
main_configs=["configs/remote_servers.xml"],
|
|
)
|
|
# Here analyzer is disabled by default
|
|
backward = cluster.add_instance(
|
|
"backward",
|
|
use_old_analyzer=True,
|
|
main_configs=["configs/remote_servers.xml"],
|
|
image="clickhouse/clickhouse-server",
|
|
tag=CLICKHOUSE_MAX_VERSION_WITH_ANALYZER_DISABLED_BY_DEFAULT,
|
|
with_installed_binary=True,
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def start_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def test_two_new_versions(start_cluster):
|
|
# Two new versions (both know about the analyzer)
|
|
# One have it enabled by default, another one - disabled.
|
|
|
|
current.query("SYSTEM FLUSH LOGS")
|
|
backward.query("SYSTEM FLUSH LOGS")
|
|
|
|
query_id = str(uuid.uuid4())
|
|
current.query(
|
|
"SELECT name FROM clusterAllReplicas('test_cluster_mixed', system.tables) settings serialize_query_plan=0;",
|
|
query_id=query_id,
|
|
)
|
|
|
|
current.query("SYSTEM FLUSH LOGS")
|
|
backward.query("SYSTEM FLUSH LOGS")
|
|
|
|
assert (
|
|
current.query(
|
|
"""
|
|
SELECT hostname() AS h, getSetting('allow_experimental_analyzer')
|
|
FROM clusterAllReplicas('test_cluster_mixed', system.one)
|
|
ORDER BY h settings serialize_query_plan=0;"""
|
|
)
|
|
== TSV([["backward", "true"], ["current", "true"]])
|
|
)
|
|
|
|
# Should be enabled explicitly on the old instance.
|
|
analyzer_enabled = backward.query(
|
|
f"""
|
|
SELECT
|
|
DISTINCT Settings['allow_experimental_analyzer']
|
|
FROM system.query_log
|
|
WHERE initial_query_id = '{query_id}';"""
|
|
)
|
|
|
|
assert TSV(analyzer_enabled) == TSV("1")
|
|
|
|
query_id = str(uuid.uuid4())
|
|
backward.query(
|
|
"SELECT name FROM clusterAllReplicas('test_cluster_mixed', system.tables)",
|
|
query_id=query_id,
|
|
)
|
|
|
|
current.query("SYSTEM FLUSH LOGS")
|
|
backward.query("SYSTEM FLUSH LOGS")
|
|
|
|
# The old version doesn't know about the alias.
|
|
# For this we will ask about the old experimental name.
|
|
assert (
|
|
backward.query(
|
|
"""
|
|
SELECT hostname() AS h, getSetting('allow_experimental_analyzer')
|
|
FROM clusterAllReplicas('test_cluster_mixed', system.one)
|
|
ORDER BY h;"""
|
|
)
|
|
== TSV([["backward", "false"], ["current", "false"]])
|
|
)
|
|
|
|
# Should be disabled everywhere
|
|
analyzer_enabled = backward.query(
|
|
f"""
|
|
SELECT
|
|
DISTINCT Settings['allow_experimental_analyzer']
|
|
FROM clusterAllReplicas('test_cluster_mixed', system.query_log)
|
|
WHERE initial_query_id = '{query_id}';"""
|
|
)
|
|
|
|
assert TSV(analyzer_enabled) == TSV("0")
|
|
|
|
# Only new version knows about the alias
|
|
# and it will send the old setting `allow_experimental_analyzer`
|
|
# to the remote server.
|
|
query_id = str(uuid.uuid4())
|
|
current.query(
|
|
"SELECT name FROM clusterAllReplicas('test_cluster_mixed', system.tables) SETTINGS enable_analyzer = 1, serialize_query_plan=0;",
|
|
query_id=query_id,
|
|
)
|
|
|
|
current.query("SYSTEM FLUSH LOGS")
|
|
backward.query("SYSTEM FLUSH LOGS")
|
|
|
|
# Should be disabled explicitly everywhere.
|
|
analyzer_enabled = current.query(
|
|
f"""
|
|
SELECT
|
|
DISTINCT Settings['allow_experimental_analyzer']
|
|
FROM system.query_log
|
|
WHERE initial_query_id = '{query_id}';"""
|
|
)
|
|
|
|
assert TSV(analyzer_enabled) == TSV("1")
|