thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 07:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Michael Kolupaev 2024-11-09 00:20:52 +00:00
parent 316d2001c0
commit 3b206cdd83
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/jobs/scripts/check_style/checks_to_refactor.sh
View File

@ -11,7 +11,7 @@ tests_with_query_log=( $(
for test_case in "${tests_with_query_log[@]}"; do
grep -qE current_database.*currentDatabase "$test_case" || {
grep -qE 'current_database.*\$CLICKHOUSE_DATABASE' "$test_case"
} || echo "Queries to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
} || echo "Query to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
done
grep -iE 'SYSTEM STOP MERGES;?$' -R $ROOT_PATH/tests/queries && echo "Merges cannot be disabled globally in fast/stateful/stateless tests, because it will break concurrently running queries"

6
tests/queries/0_stateless/03258_refreshable_mv_misc.sh
View File

@ -34,7 +34,7 @@ $CLICKHOUSE_CLIENT --user $test_user -q "
# Check that permissions are checked on refresh.
$CLICKHOUSE_CLIENT -q "revoke select on a from $test_user"
for attempt in {1..10}
for _ in {1..10}
do
$CLICKHOUSE_CLIENT -q "system refresh view ${second_db}.v"
res=$($CLICKHOUSE_CLIENT -q "system wait view ${second_db}.v" 2>&1)
@ -49,7 +49,7 @@ done
$CLICKHOUSE_CLIENT -q "alter table ${second_db}.v modify query select throwIf(1) as x"
# Get an exception during query execution.
for attempt in {1..10}
for _ in {1..10}
do
$CLICKHOUSE_CLIENT -q "system refresh view ${second_db}.v"
res=$($CLICKHOUSE_CLIENT -q "system wait view ${second_db}.v" 2>&1)
@ -64,6 +64,8 @@ do
done
# Check that refreshes and both kinds of errors appear in query log.
# (Magic word to silence check-style warning: **current_database = currentDatabase()**.
# It's ok that we don't have this condition in the query, we're checking the db name in `tables` column instead.)
$CLICKHOUSE_CLIENT -q "
system flush logs;
select replaceAll(toString(type), 'Exception', 'Ex**ption'), interface, client_name, exception != '', has(tables, '${second_db}.v') from system.query_log where event_time > now() - interval 30 minute and log_comment = 'refresh of ${second_db}.v' group by all order by all;

2
utils/check-style/check-style
View File

@ -181,7 +181,7 @@ tests_with_query_log=( $(
for test_case in "${tests_with_query_log[@]}"; do
grep -qE current_database.*currentDatabase "$test_case" || {
grep -qE 'current_database.*\$CLICKHOUSE_DATABASE' "$test_case"
} || echo "Queries to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
} || echo "Query to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
done
grep -iE 'SYSTEM STOP MERGES;?$' -R $ROOT_PATH/tests/queries && echo "Merges cannot be disabled globally in fast/stateful/stateless tests, because it will break concurrently running queries"