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]>
112 lines
3.6 KiB
Python
112 lines
3.6 KiB
Python
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
instance = cluster.add_instance("instance")
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
|
|
instance.query(
|
|
"CREATE TABLE table1(x UInt32) ENGINE = MergeTree ORDER BY tuple()"
|
|
)
|
|
instance.query(
|
|
"CREATE TABLE table2(x UInt32) ENGINE = MergeTree ORDER BY tuple()"
|
|
)
|
|
instance.query("INSERT INTO table1 VALUES (1)")
|
|
instance.query("INSERT INTO table2 VALUES (2)")
|
|
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def cleanup_after_test():
|
|
try:
|
|
yield
|
|
finally:
|
|
instance.query("DROP USER IF EXISTS A")
|
|
|
|
|
|
def test_merge():
|
|
merge_spec = "merge('default', 'table[0-9]+')"
|
|
select_query = f"SELECT * FROM {merge_spec} ORDER BY x"
|
|
assert instance.query(select_query) == "1\n2\n"
|
|
|
|
instance.query("CREATE USER A")
|
|
|
|
assert "no tables satisfied provided regexp" in instance.query_and_get_error(
|
|
select_query, user="A"
|
|
)
|
|
|
|
instance.query("GRANT SELECT ON default.table1 TO A")
|
|
assert instance.query(select_query, user="A") == "1\n"
|
|
|
|
instance.query("GRANT SELECT ON default.* TO A")
|
|
assert instance.query(select_query, user="A") == "1\n2\n"
|
|
|
|
instance.query("REVOKE SELECT ON default.table1 FROM A")
|
|
assert instance.query(select_query, user="A") == "2\n"
|
|
|
|
instance.query("REVOKE ALL ON default.* FROM A")
|
|
instance.query("GRANT SELECT ON default.table1 TO A")
|
|
instance.query("GRANT INSERT ON default.table2 TO A")
|
|
err = instance.query_and_get_error(select_query, user="A")
|
|
# INSERT on table2 implies SHOW_COLUMNS, so the hint is allowed to include column names.
|
|
assert "it's necessary to have the grant SELECT(x) ON default.table2" in err
|
|
|
|
instance.query("REVOKE ALL ON default.* FROM A")
|
|
describe_query = f"DESCRIBE TABLE {merge_spec}"
|
|
assert (
|
|
"Either there is no database, which matches regular expression `default`, or there are no tables in the database matches `default`, which fit tables expression: table[0-9]+"
|
|
in instance.query_and_get_error(describe_query, user="A")
|
|
)
|
|
instance.query("GRANT SHOW TABLES ON default.table1 TO A")
|
|
assert (
|
|
"it's necessary to have the grant SHOW COLUMNS ON default.table1"
|
|
in instance.query_and_get_error(describe_query, user="A")
|
|
)
|
|
instance.query("GRANT SHOW COLUMNS ON default.table1 TO A")
|
|
assert instance.query(describe_query) == "x\tUInt32\t\t\t\t\t\n"
|
|
|
|
|
|
def test_view_if_permitted():
|
|
assert (
|
|
instance.query(
|
|
"SELECT * FROM viewIfPermitted(SELECT * FROM table1 ELSE null('x UInt32'))"
|
|
)
|
|
== "1\n"
|
|
)
|
|
|
|
expected_error = "requires a SELECT query with the result columns matching a table function after 'ELSE'"
|
|
assert expected_error in instance.query_and_get_error(
|
|
"SELECT * FROM viewIfPermitted(SELECT * FROM table1 ELSE null('x Int32'))"
|
|
)
|
|
assert expected_error in instance.query_and_get_error(
|
|
"SELECT * FROM viewIfPermitted(SELECT * FROM table1 ELSE null('y UInt32'))"
|
|
)
|
|
|
|
instance.query("CREATE USER A")
|
|
assert (
|
|
instance.query(
|
|
"SELECT * FROM viewIfPermitted(SELECT * FROM table1 ELSE null('x UInt32'))",
|
|
user="A",
|
|
)
|
|
== ""
|
|
)
|
|
|
|
instance.query("GRANT SELECT ON table1 TO A")
|
|
assert (
|
|
instance.query(
|
|
"SELECT * FROM viewIfPermitted(SELECT * FROM table1 ELSE null('x UInt32'))",
|
|
user="A",
|
|
)
|
|
== "1\n"
|
|
)
|