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

118 lines
3.3 KiB
Python

import os
import uuid
import pytest
from helpers.cluster import ClickHouseCluster
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance(
"node1",
main_configs=["configs/remote_servers.xml"],
macros={"replica": "node1"},
with_zookeeper=True,
)
node2 = cluster.add_instance(
"node2",
main_configs=["configs/remote_servers.xml"],
macros={"replica": "node2"},
with_zookeeper=True,
)
@pytest.fixture(scope="module", autouse=True)
def start_cluster():
try:
cluster.start()
yield
finally:
cluster.shutdown()
def test_sync_replica_on_cluster():
table = "tbl_test_sync_replica_on_cluster"
node1.query(f"DROP TABLE IF EXISTS {table} ON CLUSTER 'cluster' SYNC")
node1.query(
f"""
CREATE TABLE {table} ON CLUSTER 'cluster' (id Int64, str String)
ENGINE=ReplicatedMergeTree('/clickhouse/tables/{table}/', '{{replica}}')
ORDER BY id
"""
)
# Does not throw
node2.query(f"SYSTEM SYNC REPLICA ON CLUSTER 'cluster' {table}")
node2.query("INSERT INTO tbl_test_sync_replica_on_cluster VALUES (2, 'str2')")
node1.query(f"SYSTEM SYNC REPLICA ON CLUSTER 'cluster' {table}")
count = node1.query(f"SELECT count() FROM {table}")
assert count == "1\n"
node1.query(f"DROP TABLE IF EXISTS {table} ON CLUSTER 'cluster' SYNC")
def test_sync_replica_not_replicated():
table = "test_sync_replica_not_replicated"
node1.query(f"DROP TABLE IF EXISTS {table} ON CLUSTER 'cluster' SYNC")
node1.query(
f"""
CREATE TABLE {table} ON CLUSTER 'cluster' (id Int64, str String)
ENGINE=MergeTree()
ORDER BY id
"""
)
output, error = node1.query_and_get_answer_with_error(
f"SYSTEM SYNC REPLICA {table}"
)
assert "is not replicated" in error
output, error = node2.query_and_get_answer_with_error(
f"SYSTEM SYNC REPLICA {table}"
)
assert "is not replicated" in error
node1.query(f"DROP TABLE IF EXISTS {table} ON CLUSTER 'cluster' SYNC")
def test_sync_replica_if_not_exists():
table = "test_sync_replica_if_not_exists"
node1.query(f"DROP TABLE IF EXISTS {table} ON CLUSTER 'cluster' SYNC")
output, error = node1.query_and_get_answer_with_error(
f"SYSTEM SYNC REPLICA {table} IF EXISTS"
)
assert error == ""
# Table exists only in node1
node1.query(
f"""
CREATE TABLE {table} (id Int64, str String)
ENGINE=ReplicatedMergeTree('/clickhouse/tables/{table}/', '{{replica}}')
ORDER BY id
"""
)
output, error = node1.query_and_get_answer_with_error(
f"SYSTEM SYNC REPLICA ON CLUSTER cluster {table} IF EXISTS"
)
assert error == ""
query_id = str(uuid.uuid4())
output, error = node2.query_and_get_answer_with_error(
f"SYSTEM SYNC REPLICA ON CLUSTER cluster {table} IF EXISTS", query_id=query_id
)
assert error == ""
# Node 1 should have received the sync request even if the table didn't exist in node2
node1.query("SYSTEM FLUSH LOGS system.query_log")
output = node1.query(
f"SELECT count() FROM system.query_log where initial_query_id = '{query_id}'"
)
assert output == "2\n"
node1.query(f"DROP TABLE IF EXISTS {table} ON CLUSTER 'cluster' SYNC")