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

Update tests config

Browse Source
This commit is contained in:
kssenii 2022-05-17 15:58:16 +02:00
parent e4e6e44e86
commit e501a5a106
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Common/FileCacheSettings.cpp
View File

@ -20,6 +20,7 @@ void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration &
max_elements = config.getUInt64(config_prefix + ".max_elements", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS);
max_file_segment_size = config.getUInt64(config_prefix + ".max_file_segment_size", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE);
cache_on_write_operations = config.getUInt64(config_prefix + ".cache_on_write_operations", false);
do_not_evict_index_and_mark_files = config.getUInt64(config_prefix + ".do_not_evict_index_and_mark_files", true);
allow_remove_persistent_cache_by_default = config.getUInt64(config_prefix + ".allow_remove_persistent_cache_by_default", true);
}

31
tests/config/config.d/storage_conf.xml
View File

@ -8,6 +8,13 @@
<access_key_id>clickhouse</access_key_id>
<secret_access_key>clickhouse</secret_access_key>
</s3_disk>
<s3_cache>
<type>cache</type>
<disk>s3_disk</disk>
<path>s3_disk_cache/</path>
<max_size>22548578304</max_size>
<cache_on_write_operations>1</cache_on_write_operations>
</s3_cache>
<s3_disk_2>
<type>s3</type>
<path>s3_disk_2/</path>
@ -15,18 +22,10 @@
<access_key_id>clickhouse</access_key_id>
<secret_access_key>clickhouse</secret_access_key>
</s3_disk_2>
<s3_cache>
<type>cache</type>
<disk>s3_disk</disk>
<path>s3_disk_cache/</path>
<max_size>22548578304</max_size>
<cache_on_write_operations>1</cache_on_write_operations>
<data_cache_path>./s3_cache/</data_cache_path>
</s3_cache>
<s3_cache_2>
<type>cache</type>
<disk>s3_disk_2</disk>
<path>s3_cache/</path>
<path>s3_disk_2_cache/</path>
<max_size>22548578304</max_size>
</s3_cache_2>
<local_disk>
@ -49,13 +48,6 @@
</main>
</volumes>
</s3_cache>
<local_cache>
<volumes>
<main>
<disk>local_cache</disk>
</main>
</volumes>
</local_cache>
<s3_cache_2>
<volumes>
<main>
@ -63,6 +55,13 @@
</main>
</volumes>
</s3_cache_2>
<local_cache>
<volumes>
<main>
<disk>local_cache</disk>
</main>
</volumes>
</local_cache>
</policies>
</storage_configuration>
</clickhouse>

2
tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference
View File

@ -3,7 +3,7 @@
SYSTEM DROP FILESYSTEM CACHE;
SET enable_filesystem_cache_on_write_operations=0;
DROP TABLE IF EXISTS test;
CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_2', min_bytes_for_wide_part = 10485760;
INSERT INTO test SELECT number, toString(number) FROM numbers(100);
SELECT * FROM test FORMAT Null;
SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;

2
tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql
View File

@ -5,7 +5,7 @@
SYSTEM DROP FILESYSTEM CACHE;
SET enable_filesystem_cache_on_write_operations=0;
DROP TABLE IF EXISTS test;
CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_2', min_bytes_for_wide_part = 10485760;
INSERT INTO test SELECT number, toString(number) FROM numbers(100);
SELECT * FROM test FORMAT Null;

2
tests/queries/0_stateless/02286_drop_filesystem_cache.reference
View File

@ -25,6 +25,6 @@ INSERT INTO test2 SELECT number, toString(number) FROM numbers(100);
SELECT * FROM test2 FORMAT Null;
SELECT count() FROM system.filesystem_cache;
3
SYSTEM DROP FILESYSTEM CACHE './s3_cache/';
SYSTEM DROP FILESYSTEM CACHE 's3_disk_2_cache/';
SELECT count() FROM system.filesystem_cache;
2

4
tests/queries/0_stateless/02286_drop_filesystem_cache.sql
View File

@ -30,5 +30,5 @@ INSERT INTO test2 SELECT number, toString(number) FROM numbers(100);
SELECT * FROM test2 FORMAT Null;
SELECT count() FROM system.filesystem_cache;
SYSTEM DROP FILESYSTEM CACHE './s3_cache/';
SELECT count() FROM system.filesystem_cache;
SYSTEM DROP FILESYSTEM CACHE 's3_disk_2_cache/';
SELECT count() FROM system.filesystem_cache;