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

99 lines
2.9 KiB
Python

import pytest
from helpers.client import QueryRuntimeException
from helpers.cluster import ClickHouseCluster
cluster = ClickHouseCluster(__file__, zookeeper_config_path="configs/zookeeper.xml")
main_configs = [
"configs/remote_servers.xml",
]
node1 = cluster.add_instance(
"node1",
main_configs=main_configs + ["configs/drop_if_empty_check.xml"],
macros={"replica": "node1", "shard": "shard1"},
with_zookeeper=True,
)
node2 = cluster.add_instance(
"node2",
main_configs=main_configs + ["configs/drop_if_empty_check.xml"],
macros={"replica": "node2", "shard": "shard1"},
with_zookeeper=True,
)
@pytest.fixture(scope="module")
def start_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def test_drop_if_empty(start_cluster):
node1.query(
"CREATE DATABASE replicateddb "
"ENGINE = Replicated('/clickhouse/databases/replicateddb', 'shard1', 'node1')",
)
node2.query(
"CREATE DATABASE replicateddb "
"ENGINE = Replicated('/clickhouse/databases/replicateddb', 'shard1', 'node2')",
)
node1.query(
"CREATE TABLE default.tbl ON CLUSTER 'cluster' ("
"x UInt64"
") ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')"
"ORDER BY x"
)
node1.query(
"CREATE TABLE replicateddb.tbl2 (" "x UInt64" ") ENGINE=MergeTree " "ORDER BY x"
)
assert 1 == int(
node2.query("SELECT count() FROM system.tables WHERE name = 'tbl';")
)
assert 1 == int(
node2.query("SELECT count() FROM system.databases WHERE name = 'replicateddb';")
)
assert 1 == int(
node2.query("SELECT count() FROM system.tables WHERE name = 'tbl2';")
)
node2.query("SYSTEM STOP MERGES;")
node2.query("SYSTEM STOP FETCHES;")
node2.query("SYSTEM STOP REPLICATION QUEUES;")
node1.query("INSERT INTO default.tbl SELECT * FROM system.numbers_mt LIMIT 10000;")
node1.query(
"INSERT INTO replicateddb.tbl2 SELECT * FROM system.numbers_mt LIMIT 10000;"
)
assert 0 == int(node2.query("SELECT count() FROM default.tbl;"))
assert 0 == int(node2.query("SELECT count() FROM replicateddb.tbl2;"))
node2.query("DROP TABLE IF EMPTY default.tbl ON CLUSTER 'cluster';")
node2.query("DROP TABLE IF EMPTY replicateddb.tbl2;")
assert 0 == int(
node1.query("SELECT count() FROM system.tables WHERE name = 'tbl';")
)
assert 0 == int(
node2.query("SELECT count() FROM system.tables WHERE name = 'tbl';")
)
assert 0 == int(
node1.query("SELECT count() FROM system.tables WHERE name = 'tbl2';")
)
assert 0 == int(
node2.query("SELECT count() FROM system.tables WHERE name = 'tbl2';")
)
with pytest.raises(
QueryRuntimeException,
match="DB::Exception: DROP IF EMPTY is not implemented for databases.",
):
node2.query("DROP DATABASE IF EMPTY replicateddb;")