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
1.9 KiB
Python
88 lines
1.9 KiB
Python
import threading
|
|
import uuid
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.test_tools import assert_eq_with_retry
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
node_wait_queries = cluster.add_instance(
|
|
"node_wait_queries",
|
|
main_configs=["configs/config_wait.xml"],
|
|
user_configs=["configs/users.xml"],
|
|
stay_alive=True,
|
|
)
|
|
node_kill_queries = cluster.add_instance(
|
|
"node_kill_queries",
|
|
main_configs=["configs/config_kill.xml"],
|
|
user_configs=["configs/users.xml"],
|
|
stay_alive=True,
|
|
)
|
|
|
|
global result
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def start_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def do_long_query(node, query_id):
|
|
global result
|
|
|
|
result = node.query_and_get_answer_with_error(
|
|
"SELECT sleepEachRow(1) FROM system.numbers LIMIT 10",
|
|
settings={"send_logs_level": "trace"},
|
|
query_id=query_id,
|
|
)
|
|
|
|
|
|
def test_shutdown_wait_unfinished_queries(start_cluster):
|
|
global result
|
|
|
|
query_id = uuid.uuid4().hex
|
|
long_query = threading.Thread(
|
|
target=do_long_query,
|
|
args=(
|
|
node_wait_queries,
|
|
query_id,
|
|
),
|
|
)
|
|
long_query.start()
|
|
|
|
assert_eq_with_retry(
|
|
node_wait_queries,
|
|
f"SELECT query_id FROM system.processes WHERE query_id = '{query_id}'",
|
|
query_id,
|
|
)
|
|
node_wait_queries.stop_clickhouse(kill=False)
|
|
|
|
long_query.join()
|
|
|
|
assert result[0].count("0") == 10
|
|
|
|
query_id = uuid.uuid4().hex
|
|
long_query = threading.Thread(
|
|
target=do_long_query,
|
|
args=(
|
|
node_kill_queries,
|
|
query_id,
|
|
),
|
|
)
|
|
long_query.start()
|
|
|
|
assert_eq_with_retry(
|
|
node_kill_queries,
|
|
f"SELECT query_id FROM system.processes WHERE query_id = '{query_id}'",
|
|
query_id,
|
|
)
|
|
node_kill_queries.stop_clickhouse(kill=False)
|
|
|
|
long_query.join()
|
|
assert "QUERY_WAS_CANCELLED" in result[1]
|