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

74 lines
2.0 KiB
Python

#!/usr/bin/env python3
import pytest
from helpers.cluster import ClickHouseCluster
cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance("node1", with_zookeeper=True)
node2 = cluster.add_instance("node2", with_zookeeper=True)
@pytest.fixture(scope="module")
def start_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def get_data_files_for_table(node, table_name):
data_path = node.query(
f"SELECT arrayElement(data_paths, 1) FROM system.tables WHERE database='default' AND name='{table_name}'"
).strip()
raw_output = node.exec_in_container(["bash", "-c", f"ls {data_path}"])
return raw_output.strip().split("\n")
def test_empty_parts_optimize(start_cluster):
for n, node in enumerate([node1, node2]):
node.query("DROP TABLE IF EXISTS empty SYNC")
node.query(
"""
CREATE TABLE empty (key UInt32, val UInt32, date Datetime)
ENGINE=ReplicatedSummingMergeTree('/clickhouse/01560_optimize_on_insert', '{}', val)
PARTITION BY date ORDER BY key;
""".format(
n + 1
)
)
node1.query(
"INSERT INTO empty VALUES (1, 1, '2020-01-01'), (1, 1, '2020-01-01'), (1, -2, '2020-01-01')"
)
node2.query("SYSTEM SYNC REPLICA empty", timeout=15)
assert node1.query("SELECT * FROM empty") == ""
assert node2.query("SELECT * FROM empty") == ""
# No other tmp files exists
assert set(get_data_files_for_table(node1, "empty")) == {
"detached",
"format_version.txt",
}
assert set(get_data_files_for_table(node2, "empty")) == {
"detached",
"format_version.txt",
}
node1.query(
"INSERT INTO empty VALUES (1, 1, '2020-02-01'), (1, 1, '2020-02-01'), (1, -2, '2020-02-01')",
settings={"insert_quorum": 2},
)
assert node1.query("SELECT * FROM empty") == ""
assert node2.query("SELECT * FROM empty") == ""
for node in [node1, node2]:
node.query("DROP TABLE IF EXISTS empty SYNC")