Skip to content

Commit 3dc10b8

Browse files
ksseniikssenii
authored
Merge pull request ClickHouse#78888 from ClickHouse/fix-test-bypass-cache-threshold
Fix tests `02240_filesystem_cache_bypass_cache_threshold`, `02240_filesystem_query_cache`
2 parents 18fd55f + 9abc779 commit 3dc10b8

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

‎tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.reference‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@ SETTINGS min_bytes_for_wide_part = 10485760,
1111
compress_primary_key=false,
1212
disk = disk(
1313
type = cache,
14+
name = '02240_bypass_cache_threshold',
1415
max_size = '128Mi',
1516
path = 'filesystem_cache_bypass_cache_threshold/',
1617
enable_bypass_cache_with_threshold = 1,
1718
bypass_cache_threshold = 100,
1819
disk = 's3_disk');
1920
INSERT INTO test SELECT number, toString(number) FROM numbers(100);
2021
SELECT * FROM test FORMAT Null;
21-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
22+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold' ORDER BY file_segment_range_end, size;
2223
0 79 80
2324
SYSTEM DROP FILESYSTEM CACHE;
24-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
25+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold';
2526
SELECT * FROM test FORMAT Null;
26-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
27+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold';
2728
SYSTEM DROP FILESYSTEM CACHE;
28-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
29+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold';

‎tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.sql‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ SETTINGS min_bytes_for_wide_part = 10485760,
1414
compress_primary_key=false,
1515
disk = disk(
1616
type = cache,
17+
name = '02240_bypass_cache_threshold',
1718
max_size = '128Mi',
1819
path = 'filesystem_cache_bypass_cache_threshold/',
1920
enable_bypass_cache_with_threshold = 1,
@@ -23,10 +24,10 @@ SETTINGS min_bytes_for_wide_part = 10485760,
2324
INSERT INTO test SELECT number, toString(number) FROM numbers(100);
2425

2526
SELECT * FROM test FORMAT Null;
26-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
27+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold' ORDER BY file_segment_range_end, size;
2728
SYSTEM DROP FILESYSTEM CACHE;
28-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
29+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold';
2930
SELECT * FROM test FORMAT Null;
30-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
31+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold';
3132
SYSTEM DROP FILESYSTEM CACHE;
32-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
33+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_bypass_cache_threshold';

‎tests/queries/0_stateless/02240_filesystem_query_cache.reference‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ SETTINGS min_bytes_for_wide_part = 10485760,
1313
compress_primary_key=false,
1414
disk = disk(
1515
type = cache,
16+
name = '02240_filesystem_query_cache',
1617
max_size = '128Mi',
1718
path = 'filesystem_query_cache/',
1819
cache_on_write_operations= 1,
@@ -21,11 +22,11 @@ SETTINGS min_bytes_for_wide_part = 10485760,
2122
SYSTEM DROP FILESYSTEM CACHE;
2223
INSERT INTO test SELECT number, toString(number) FROM numbers(100);
2324
SELECT * FROM test FORMAT Null;
24-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
25+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache' ORDER BY file_segment_range_end, size;
2526
0 79 80
2627
SYSTEM DROP FILESYSTEM CACHE;
27-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
28+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache';
2829
SELECT * FROM test FORMAT Null;
29-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
30+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache';
3031
SYSTEM DROP FILESYSTEM CACHE;
31-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
32+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache';

‎tests/queries/0_stateless/02240_filesystem_query_cache.sql‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SETTINGS min_bytes_for_wide_part = 10485760,
1616
compress_primary_key=false,
1717
disk = disk(
1818
type = cache,
19+
name = '02240_filesystem_query_cache',
1920
max_size = '128Mi',
2021
path = 'filesystem_query_cache/',
2122
cache_on_write_operations= 1,
@@ -24,10 +25,10 @@ SETTINGS min_bytes_for_wide_part = 10485760,
2425
SYSTEM DROP FILESYSTEM CACHE;
2526
INSERT INTO test SELECT number, toString(number) FROM numbers(100);
2627
SELECT * FROM test FORMAT Null;
27-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
28+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache' ORDER BY file_segment_range_end, size;
2829
SYSTEM DROP FILESYSTEM CACHE;
29-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
30+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache';
3031
SELECT * FROM test FORMAT Null;
31-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
32+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache';
3233
SYSTEM DROP FILESYSTEM CACHE;
33-
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
34+
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '02240_filesystem_query_cache';

0 commit comments

Comments
 (0)