Skip to content

Commit df6ac46

Browse files
azatazat
committed
tests: use separate filesystem cache for tests that rely on system.filesystem_cache
1 parent 6378841 commit df6ac46

7 files changed

+149
-132
lines changed

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,45 @@
1-
Using storage policy: s3_cache
1+
Using disk: s3_disk
22
0
33
Expect cache
4-
DOWNLOADED 0 0 1
54
DOWNLOADED 0 79 80
65
DOWNLOADED 0 745 746
7-
3
6+
2
87
Expect cache
9-
DOWNLOADED 0 0 1
108
DOWNLOADED 0 79 80
119
DOWNLOADED 0 745 746
12-
3
10+
2
1311
Expect no cache
1412
Expect cache
1513
DOWNLOADED 0 79 80
1614
DOWNLOADED 0 745 746
1715
2
1816
Expect no cache
19-
Using storage policy: local_cache
17+
Using disk: local_disk
2018
0
2119
Expect cache
22-
DOWNLOADED 0 0 1
2320
DOWNLOADED 0 79 80
2421
DOWNLOADED 0 745 746
25-
3
22+
2
2623
Expect cache
27-
DOWNLOADED 0 0 1
2824
DOWNLOADED 0 79 80
2925
DOWNLOADED 0 745 746
30-
3
26+
2
3127
Expect no cache
3228
Expect cache
3329
DOWNLOADED 0 79 80
3430
DOWNLOADED 0 745 746
3531
2
3632
Expect no cache
37-
Using storage policy: azure_cache
33+
Using disk: azure
3834
0
3935
Expect cache
40-
DOWNLOADED 0 0 1
4136
DOWNLOADED 0 79 80
4237
DOWNLOADED 0 745 746
43-
3
38+
2
4439
Expect cache
45-
DOWNLOADED 0 0 1
4640
DOWNLOADED 0 79 80
4741
DOWNLOADED 0 745 746
48-
3
42+
2
4943
Expect no cache
5044
Expect cache
5145
DOWNLOADED 0 79 80

‎tests/queries/0_stateless/02240_system_filesystem_cache_table.sh‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,58 @@
11
#!/usr/bin/env bash
22
# Tags: long, no-fasttest, no-parallel, no-object-storage, no-random-settings
33

4-
# set -x
4+
set -e
55

66
CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
77
# shellcheck source=../shell_config.sh
88
. "$CUR_DIR"/../shell_config.sh
99
# shellcheck source=./cache.lib
1010
. "$CUR_DIR"/cache.lib
1111

12-
for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
13-
echo "Using storage policy: $STORAGE_POLICY"
14-
drop_filesystem_cache
15-
${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
16-
${CLICKHOUSE_CLIENT} --query "SELECT count() FROM system.filesystem_cache"
12+
for disk in 's3_disk' 'local_disk' 'azure'; do
13+
echo "Using disk: $disk"
1714

15+
cache_path=02240_system_filesystem_cache_table_$disk
1816
${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_02240_storage_policy"
19-
${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_02240_storage_policy (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='${STORAGE_POLICY}', min_bytes_for_wide_part = 1000000, compress_marks=false, compress_primary_key=false, serialization_info_version='basic'"
17+
${CLICKHOUSE_CLIENT} --query "
18+
CREATE TABLE test_02240_storage_policy (key UInt32, value String)
19+
Engine=MergeTree()
20+
ORDER BY key
21+
SETTINGS disk=disk(type='cache', path='$cache_path', disk='$disk', max_size=10_000_000_000, cache_on_write_operations=1), min_bytes_for_wide_part = 1000000, compress_marks=false, compress_primary_key=false, serialization_info_version='basic'
22+
"
23+
cache_name=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.disks WHERE cache_path LIKE '%$cache_path'")
24+
25+
drop_filesystem_cache $cache_name
26+
${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
27+
${CLICKHOUSE_CLIENT} --query "SELECT count() FROM system.filesystem_cache WHERE cache_name = '$cache_name'"
28+
2029
${CLICKHOUSE_CLIENT} --query "SYSTEM STOP MERGES test_02240_storage_policy"
2130
${CLICKHOUSE_CLIENT} --enable_filesystem_cache_on_write_operations=0 --query "INSERT INTO test_02240_storage_policy SELECT number, toString(number) FROM numbers(100)"
2231

2332
echo 'Expect cache'
2433
${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
2534
${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy FORMAT Null"
26-
${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
27-
${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
35+
${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '$cache_name' ORDER BY file_segment_range_begin, file_segment_range_end, size"
36+
${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache WHERE cache_name = '$cache_name'";
2837

2938
echo 'Expect cache'
3039
${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
3140
${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy FORMAT Null"
32-
${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
33-
${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
41+
${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '$cache_name' ORDER BY file_segment_range_begin, file_segment_range_end, size"
42+
${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache WHERE cache_name = '$cache_name'";
3443

35-
drop_filesystem_cache
44+
drop_filesystem_cache $cache_name
3645
echo 'Expect no cache'
37-
${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
46+
${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '$cache_name'"
3847

3948
echo 'Expect cache'
4049
${CLICKHOUSE_CLIENT} --query "SYSTEM DROP MARK CACHE"
4150
${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_02240_storage_policy FORMAT Null"
42-
${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_begin, file_segment_range_end, size"
43-
${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache";
51+
${CLICKHOUSE_CLIENT} --query "SELECT state, file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '$cache_name' ORDER BY file_segment_range_begin, file_segment_range_end, size"
52+
${CLICKHOUSE_CLIENT} --query "SELECT uniqExact(key) FROM system.filesystem_cache WHERE cache_name = '$cache_name'";
4453

45-
drop_filesystem_cache
54+
drop_filesystem_cache $cache_name
4655
echo 'Expect no cache'
47-
${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache"
56+
${CLICKHOUSE_CLIENT} --query "SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache WHERE cache_name = '$cache_name'"
4857

4958
done

0 commit comments

Comments
 (0)