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]>
90 lines
2.9 KiB
Python
90 lines
2.9 KiB
Python
import logging
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.test_tools import assert_eq_with_retry
|
|
|
|
cluster = ClickHouseCluster(
|
|
__file__, zookeeper_config_path="configs/zookeeper_config_root_a.xml"
|
|
)
|
|
|
|
# Disable `with_remote_database_disk` as the test does not use the default Keeper
|
|
|
|
node1 = cluster.add_instance(
|
|
"node1",
|
|
with_zookeeper=True,
|
|
main_configs=["configs/remote_servers.xml", "configs/zookeeper_config_root_a.xml"],
|
|
with_remote_database_disk=False,
|
|
)
|
|
node2 = cluster.add_instance(
|
|
"node2",
|
|
with_zookeeper=True,
|
|
main_configs=["configs/remote_servers.xml", "configs/zookeeper_config_root_a.xml"],
|
|
with_remote_database_disk=False,
|
|
)
|
|
node3 = cluster.add_instance(
|
|
"node3",
|
|
with_zookeeper=True,
|
|
main_configs=["configs/remote_servers.xml", "configs/zookeeper_config_root_b.xml"],
|
|
with_remote_database_disk=False,
|
|
)
|
|
|
|
|
|
def create_zk_roots(zk):
|
|
zk.ensure_path("/root_a")
|
|
zk.ensure_path("/root_b")
|
|
logging.debug(f"Create ZK roots:{zk.get_children('/')}")
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def started_cluster():
|
|
try:
|
|
cluster.add_zookeeper_startup_command(create_zk_roots)
|
|
cluster.start()
|
|
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def test_chroot_with_same_root(started_cluster):
|
|
for i, node in enumerate([node1, node2]):
|
|
node.query("DROP TABLE IF EXISTS simple SYNC")
|
|
node.query(
|
|
"""
|
|
CREATE TABLE simple (date Date, id UInt32)
|
|
ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple', '{replica}') PARTITION BY toYYYYMM(date) ORDER BY id;
|
|
""".format(
|
|
replica=node.name
|
|
)
|
|
)
|
|
for j in range(2): # Second insert to test deduplication
|
|
node.query("INSERT INTO simple VALUES ({0}, {0})".format(i))
|
|
|
|
node1.query("SYSTEM SYNC REPLICA simple")
|
|
assert_eq_with_retry(node1, "select count() from simple", "2")
|
|
node2.query("SYSTEM SYNC REPLICA simple")
|
|
assert_eq_with_retry(node2, "select count() from simple", "2")
|
|
|
|
|
|
def test_chroot_with_different_root(started_cluster):
|
|
for i, node in [(1, node1), (3, node3)]:
|
|
node.query("DROP TABLE IF EXISTS simple_different SYNC")
|
|
node.query(
|
|
"""
|
|
CREATE TABLE simple_different (date Date, id UInt32)
|
|
ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple_different', '{replica}') PARTITION BY toYYYYMM(date) ORDER BY id;
|
|
""".format(
|
|
replica=node.name
|
|
)
|
|
)
|
|
for j in range(2): # Second insert to test deduplication
|
|
node.query("INSERT INTO simple_different VALUES ({0}, {0})".format(i))
|
|
|
|
node1.query("SYSTEM SYNC REPLICA simple_different")
|
|
assert_eq_with_retry(node1, "select count() from simple_different", "1")
|
|
node3.query("SYSTEM SYNC REPLICA simple_different")
|
|
assert_eq_with_retry(node3, "select count() from simple_different", "1")
|