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]>
88 lines
2.5 KiB
Python
88 lines
2.5 KiB
Python
#!/usr/bin/env python3
|
|
|
|
import logging
|
|
import os
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.mock_servers import start_mock_servers
|
|
from helpers.database_disk import replace_text_in_metadata
|
|
|
|
|
|
RESOLVER_CONTAINER_NAME = "resolver"
|
|
RESOLVER_PORT = 8080
|
|
|
|
|
|
def generate_endpoint(port):
|
|
read_path = os.path.join(
|
|
os.path.dirname(os.path.realpath(__file__)),
|
|
"./azure_endpoint/endpoint.py",
|
|
)
|
|
with open(read_path, "r") as f:
|
|
content = f.read()
|
|
write_path = os.path.join(
|
|
os.path.dirname(os.path.realpath(__file__)),
|
|
"./_gen/endpoint.py",
|
|
)
|
|
os.makedirs(os.path.dirname(write_path), exist_ok=True)
|
|
with open(write_path, "w") as f:
|
|
f.write(content.format(port=port))
|
|
|
|
|
|
def run_endpoint(cluster):
|
|
logging.info("Starting custom Azure endpoint")
|
|
script_dir = os.path.join(os.path.dirname(__file__), "_gen")
|
|
start_mock_servers(
|
|
cluster, script_dir, [("endpoint.py", RESOLVER_CONTAINER_NAME, RESOLVER_PORT)]
|
|
)
|
|
logging.info("Azure endpoint started")
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def cluster():
|
|
try:
|
|
cluster = ClickHouseCluster(__file__)
|
|
port = cluster.azurite_port
|
|
generate_endpoint(port)
|
|
cluster.add_instance(
|
|
"node",
|
|
with_minio=True,
|
|
with_azurite=True,
|
|
stay_alive=True,
|
|
main_configs=["configs/disable_async_loader.xml"],
|
|
)
|
|
cluster.start()
|
|
|
|
run_endpoint(cluster)
|
|
|
|
yield cluster
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def test_cluster_alive_after_restart(cluster):
|
|
node = cluster.instances["node"]
|
|
azurite_port = cluster.azurite_port
|
|
node.query(
|
|
f"""
|
|
CREATE TABLE test_table (a UInt64, b String)
|
|
ENGINE = AzureBlobStorage('DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:{azurite_port}/devstoreaccount1;', 'cont', 'test_table.csv', 'CSV')
|
|
ORDER BY tuple()
|
|
"""
|
|
)
|
|
|
|
metadata_path = node.query(
|
|
"SELECT metadata_path FROM system.tables WHERE database='default' AND name='test_table'"
|
|
).strip()
|
|
|
|
node.stop_clickhouse()
|
|
replace_text_in_metadata(
|
|
node,
|
|
metadata_path,
|
|
f"azurite1:{azurite_port}",
|
|
f"{RESOLVER_CONTAINER_NAME}:{RESOLVER_PORT}",
|
|
)
|
|
node.start_clickhouse()
|
|
node.query("DROP TABLE test_table")
|