Files
Alexey MilovidovandClaude Opus 4.8 295ced78d1 Enable more Ruff checks (F401/F403/F405/F541/F841) and clean up tests
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]>
2026-06-18 23:22:25 +00:00

66 lines
2.0 KiB
Python

import pytest
from helpers.cluster import ClickHouseCluster
from helpers.database_disk import replace_text_in_metadata, get_database_disk_name
cluster = ClickHouseCluster(__file__)
node = cluster.add_instance("node", stay_alive=True)
@pytest.fixture(scope="module")
def started_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def test_attach_substr(started_cluster):
# Initialize
node.query("DROP TABLE IF EXISTS default.file")
node.query(
"CREATE TABLE default.file(`s` String, `n` UInt8) ENGINE = MergeTree PARTITION BY substring(s, 1, 2) ORDER BY n "
)
# Detach table file
node.query("DETACH TABLE file")
metadata_path = node.query(
"SELECT metadata_path FROM system.detached_tables WHERE database='default' AND table='file'"
).strip()
# Replace substring to substr
replace_text_in_metadata(node, metadata_path, "substring", "substr")
# Clear filesystem cache to avoid caching issues
db_disk_name = get_database_disk_name(node)
if db_disk_name != "default":
node.query(f"SYSTEM CLEAR DISK METADATA CACHE {db_disk_name}")
# Attach table file
node.query("ATTACH TABLE file")
def test_attach_substr_restart(started_cluster):
# Initialize
node.query("DROP TABLE IF EXISTS default.file SYNC")
node.query(
"CREATE TABLE default.file(`s` String, `n` UInt8) ENGINE = MergeTree PARTITION BY substring(s, 1, 2) ORDER BY n "
)
metadata_path = node.query(
"SELECT metadata_path FROM system.tables WHERE database='default' AND table='file'"
).strip()
# Replace substring to substr
replace_text_in_metadata(node, metadata_path, "substring", "substr")
# Clear filesystem cache to avoid caching issues
db_disk_name = get_database_disk_name(node)
if db_disk_name != "default":
node.query(f"SYSTEM CLEAR DISK METADATA CACHE {db_disk_name}")
# Restart clickhouse
node.restart_clickhouse(kill=True)