thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-18 12:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ClickHouse/master' into revert-72690-add_totalbytes_of_inactive_parts

Browse Source
This commit is contained in:
Robert Schulze 2024-12-10 10:56:59 +00:00
commit e8c2c5ec47
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/queries/0_stateless/01290_max_execution_speed_distributed.reference
View File

@ -1,3 +1,3 @@
2000000
200000
1
1

8
tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
View File

@ -1,15 +1,12 @@
-- Tags: distributed
SET max_execution_speed = 1000000;
SET timeout_before_checking_execution_speed = 0;
SET max_block_size = 100;
SET log_queries=1;
CREATE TEMPORARY TABLE times (t DateTime);
INSERT INTO times SELECT now();
SELECT count('special query for 01290_max_execution_speed_distributed') FROM remote('127.0.0.{2,3}', numbers(1000000));
SELECT count('special query for 01290_max_execution_speed_distributed') FROM remote('127.0.0.{2,3}', numbers(100000))
SETTINGS max_execution_speed = 100000, timeout_before_checking_execution_speed = 0, max_block_size = 100;
INSERT INTO times SELECT now();
SELECT max(t) - min(t) >= 1 FROM times;
@ -21,6 +18,7 @@ FROM system.query_log
WHERE
current_database = currentDatabase() AND
event_date >= yesterday() AND
event_time >= now() - INTERVAL '5 MINUTES' AND -- time limit for tests not marked `long` is 3 minutes, 5 should be more than enough
query LIKE '%special query for 01290_max_execution_speed_distributed%' AND
query NOT LIKE '%system.query_log%' AND
type = 2;

3
tests/queries/0_stateless/03271_ghdata_object_to_json_alter.sh
View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash
# Tags: no-fasttest, long
# Tags: no-fasttest, long, no-s3-storage
# ^ no-s3-storage: too slow
CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh