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

Make server configuratio hierarchical

Browse Source
This commit is contained in:
Robert Schulze 2023-01-12 21:24:40 +00:00
parent 3d6308a109
commit 475bb31f33
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
3 changed files with 23 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/en/operations/query-result-cache.md
View File

@ -66,9 +66,10 @@ If the query was aborted by an exception or cancelled, no entry is written into
### Further Configuration Options:
To configure the size of the query result cache, use setting [query_result_cache_size](server-configuration-parameters/settings.md#server_configuration_parameters_query-result-cache-size).
To set the maximum number of cache entries and the maximum size of a cache entry in bytes and in records, use settings [query_result_cache_max_entries](server-configuration-parameters/settings.md#server_configuration_parameters_query-result-cache-max-entries), [query_result_cache_max_entry_size](server-configuration-parameters/settings.md#server_configuration_parameters_query-result-cache-max-entry-size) and [query_result_cache_max_entry_records](server-configuration-parameters/settings.md#server_configuration_parameters_query-result-cache-max-entry-records).
Different [server configuration options](server-configuration-parameters/settings.md#server_configuration_parameters_query-result-cache) are
available to specify the size of the query result cache, the maximum number of cache entries and the maximum size of a cache entry in bytes
and in records.
To define how long a query must run at least such that its result is cached, use setting [query_result_cache_min_query_duration](settings/settings.md#query-result-cache-min-query-duration).

74
docs/en/operations/server-configuration-parameters/settings.md
View File

@ -1258,72 +1258,30 @@ If the table does not exist, ClickHouse will create it. If the structure of the
</query_log>
```
## query_result_cache_size {#server_configuration_parameters_query-result-cache-size}
## query_result_cache {#server_configuration_parameters_query-result-cache}
Maximum size of the [query result cache](../query-result-cache.md) in bytes. 0 means the query result cache is disabled.
[Query result cache](../query-result-cache.md) configuration.
Four settings are available:
- `size`: The maximum cache size in bytes. 0 means the query result cache is disabled. Default value: `1073741824` (1 GiB).
- `max_entries`: The maximum number of SELECT query results stored in the cache. Default value: `1024`.
- `max_entry_size`: The maximum size in bytes SELECT query results may have to be saved in the cache. Default value: `1048576` (1 MiB).
- `max_entry_records`: The maximum number of records SELECT query results may have to be saved in the cache. Default value: `30000000` (30 mil).
:::warning
Data for the query result cache is allocated in DRAM. If memory is scarce, make sure to set a small limit or disable the query result cache altogether.
Data for the query result cache is allocated in DRAM. If memory is scarce, make sure to set a small value for `size` or disable the query result cache altogether.
:::
Possible values:
- Positive integer >= 0.
Default value: `1073741824` (1 GiB)
**Example**
```xml
<query_result_cache_size>1073741824</query_result_cache_size>
```
## query_result_cache_max_entries {#server_configuration_parameters_query-result-cache-max-entries}
Maximum number of SELECT query results stored in the [query result cache](../query-result-cache.md).
Possible values:
- Positive integer >= 0.
Default value: `1024`
**Example**
```xml
<query_result_cache_max_entries>1024</query_result_cache_max_entries>
```
## query_result_cache_max_entry_size {#server_configuration_parameters_query-result-cache-max-entry-size}
Maximum size in bytes SELECT query results may have to be saved in the [query result cache](../query-result-cache.md).
Possible values:
- Positive integer >= 0.
Default value: `1048576` (1 MiB)
**Example**
```xml
<query_result_cache_max_entry_size>1048567</query_result_cache_max_entry_size>
```
## query_result_cache_max_entry_records {#server_configuration_parameters_query-result-cache-max-entry-records}
Maximum number of records SELECT query results may have to be saved in the [query result cache](../query-result-cache.md).
Possible values:
- Positive integer >= 0.
Default value: `30000000` (30 mil.)
**Example**
```xml
<query_result_cache_max_entry_records>30000000</query_result_cache_max_entry_records>
<query_result_cache>
<size>1073741824</size>
<max_entries>1024</max_entries>
<max_entry_size>1048576</max_entry_size>
<max_entry_records>30000000</max_entry_records>
</query_result_cache>
```
## query_thread_log {#server_configuration_parameters-query_thread_log}

8
programs/server/Server.cpp
View File

@ -1515,13 +1515,13 @@ try
global_context->setMMappedFileCache(mmap_cache_size);
/// A cache for query results.
size_t query_result_cache_size = config().getUInt64("query_result_cache_size", 1_GiB);
size_t query_result_cache_size = config().getUInt64("query_result_cache.size", 1_GiB);
if (query_result_cache_size)
global_context->setQueryResultCache(
query_result_cache_size,
config().getUInt64("query_result_cache_max_entries", 1024),
config().getUInt64("query_result_cache_max_entry_size", 1_MiB),
config().getUInt64("query_result_cache_max_entry_records", 30'000'000));
config().getUInt64("query_result_cache.max_entries", 1024),
config().getUInt64("query_result_cache.max_entry_size", 1_MiB),
config().getUInt64("query_result_cache.max_entry_records", 30'000'000));
#if USE_EMBEDDED_COMPILER
/// 128 MB