Skip to content

C
ClickHouse

2dot5 / ClickHouse

通知 3
Star 0
Fork 0
C
ClickHouse

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 9d651526 编写于 作者: A alexey-milovidov 提交者： GitHub
浏览文件
操作

Merge pull request #8343 from Felixoid/inherit_multiple_profiles 

Inherit multiple profiles
上级 1d212862 9d269209
隐藏空白更改
内联 并排
Showing with 150 addition and 138 deletion
dbms/src/Access/SettingsConstraints.cpp
浏览文件 @ 9d651526
......@@ -217,9 +217,18 @@ const SettingsConstraints::Constraint * SettingsConstraints::tryGetConstraint(si
void SettingsConstraints::setProfile(const String & profile_name, const Poco::Util::AbstractConfiguration & config)
{
String parent_profile = "profiles." + profile_name + ".profile";
if (config.has(parent_profile))
setProfile(parent_profile, config); // Inheritance of one profile from another.
String elem = "profiles." + profile_name;
Poco::Util::AbstractConfiguration::Keys config_keys;
config.keys(elem, config_keys);
for (const std::string & key : config_keys)
{
if (key == "profile" || 0 == key.compare(0, strlen("profile["), "profile[")) /// Inheritance of profiles from the current one.
setProfile(config.getString(elem + "." + key), config);
else
continue;
}
String path_to_constraints = "profiles." + profile_name + ".constraints";
if (config.has(path_to_constraints))
......
dbms/src/Core/Settings.cpp
浏览文件 @ 9d651526
......@@ -37,7 +37,7 @@ void Settings::setProfile(const String & profile_name, const Poco::Util::Abstrac
{
if (key == "constraints")
continue;
if (key == "profile") /// Inheritance of one profile from another.
if (key == "profile" || 0 == key.compare(0, strlen("profile["), "profile[")) /// Inheritance of profiles from the current one.
setProfile(config.getString(elem + "." + key), config);
else
set(key, config.getString(elem + "." + key));
......
dbms/tests/integration/test_inherit_multiple_profiles/configs/combined_profile.xml 0 → 100644
浏览文件 @ 9d651526
<yandex>
<profiles>
<profile_1>
<max_parallel_replicas>2</max_parallel_replicas>
<!-- max_query_size is inherited one by one and final should be 400000000 -->
<max_query_size>200000000</max_query_size>
<constraints>
<max_memory_usage>
<min>100000000</min>
</max_memory_usage>
<max_parallel_replicas>
<readonly/>
</max_parallel_replicas>
</constraints>
</profile_1>
<profile_2>
<max_network_bytes>1234567890</max_network_bytes>
<max_query_size>300000000</max_query_size>
<constraints>
<max_memory_usage>
<min>200000000</min>
</max_memory_usage>
<max_network_bytes>
<min>1234567889</min>
<max>1234567891</max>
</max_network_bytes>
</constraints>
</profile_2>
<profile_3>
<max_insert_block_size>654321</max_insert_block_size>
<max_query_size>400000000</max_query_size>
<constraints>
<max_memory_usage>
<min>300000000</min>
</max_memory_usage>
<max_insert_block_size>
<min>654320</min>
<max>654322</max>
</max_insert_block_size>
</constraints>
</profile_3>
<combined_profile>
<profile>profile_1</profile>
<profile>profile_2</profile>
<profile>profile_3</profile>
<readonly>2</readonly>
</combined_profile>
</profiles>
<users>
<test_combined_profile>
<password></password>
<networks>
<ip>::/0</ip>
</networks>
<quota>default</quota>
<profile>combined_profile</profile>
</test_combined_profile>
</users>
</yandex>
dbms/tests/integration/test_inherit_multiple_profiles/test.py 0 → 100644
浏览文件 @ 9d651526
import pytest
from helpers.client import QueryRuntimeException
from helpers.cluster import ClickHouseCluster
from helpers.test_tools import TSV
cluster = ClickHouseCluster(__file__)
instance = cluster.add_instance('instance',
user_configs=['configs/combined_profile.xml'])
q = instance.query
@pytest.fixture(scope="module")
def started_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def test_combined_profile(started_cluster):
settings = q('''
SELECT name, value FROM system.settings
WHERE name IN
('max_insert_block_size', 'max_network_bytes', 'max_query_size',
'max_parallel_replicas', 'readonly')
AND changed
ORDER BY name
''', user='test_combined_profile')
expected1 = '''\
max_insert_block_size 654321
max_network_bytes 1234567890
max_parallel_replicas 2
max_query_size 400000000
readonly 2'''
assert TSV(settings) == TSV(expected1)
with pytest.raises(QueryRuntimeException) as exc:
q('''
SET max_insert_block_size = 1000;
''', user='test_combined_profile')
assert ("max_insert_block_size shouldn't be less than 654320." in
str(exc.value))
with pytest.raises(QueryRuntimeException) as exc:
q('''
SET max_network_bytes = 2000000000;
''', user='test_combined_profile')
assert ("max_network_bytes shouldn't be greater than 1234567891." in
str(exc.value))
with pytest.raises(QueryRuntimeException) as exc:
q('''
SET max_parallel_replicas = 1000;
''', user='test_combined_profile')
assert ('max_parallel_replicas should not be changed.' in
str(exc.value))
with pytest.raises(QueryRuntimeException) as exc:
q('''
SET max_memory_usage = 1000;
''', user='test_combined_profile')
assert ("max_memory_usage shouldn't be less than 300000000." in
str(exc.value))
docs/en/operations/settings/settings_profiles.md
浏览文件 @ 9d651526
......@@ -60,7 +60,7 @@ Example:
The example specifies two profiles: `default` and `web`. The `default` profile has a special purpose: it must always be present and is applied when starting the server. In other words, the `default` profile contains default settings. The `web` profile is a regular profile that can be set using the `SET` query or using a URL parameter in an HTTP query.
Settings profiles can inherit from each other. To use inheritance, indicate the `profile` setting before the other settings that are listed in the profile.
Settings profiles can inherit from each other. To use inheritance, indicate one or multiple `profile` settings before the other settings that are listed in the profile. In case when one setting is defined in different profiles, the latest defined is used.
[Original article](https://clickhouse.yandex/docs/en/operations/settings/settings_profiles/) <!--hide-->
docs/ru/operations/settings/settings_profiles.md
浏览文件 @ 9d651526
......@@ -60,6 +60,6 @@ SET profile = 'web'
В примере задано два профиля: `default` и `web`. Профиль `default` имеет специальное значение - он всегда обязан присутствовать и применяется при запуске сервера. То есть, профиль `default` содержит настройки по умолчанию. Профиль `web` - обычный профиль, который может быть установлен с помощью запроса `SET` или с помощью параметра URL при запросе по HTTP.
Профили настроек могут наследоваться от друг-друга - это реализуется указанием настройки `profile` перед остальными настройками, перечисленными в профиле.
Профили настроек могут наследоваться от друг-друга - это реализуется указанием одной или нескольких настроек `profile` перед остальными настройками, перечисленными в профиле. Если одна настройка указана в нескольких профилях, используется последнее из значений.
[Оригинальная статья](https://clickhouse.yandex/docs/ru/operations/settings/settings_profiles/) <!--hide-->
docs/zh/operations/settings/settings_profiles.md 已删除 100644 → 0
浏览文件 @ 1d212862
# Settings profiles
A settings profile is a collection of settings grouped under the same name. Each ClickHouse user has a profile.
To apply all the settings in a profile, set the `profile` setting.
Example:
Install the `web` profile.
``` sql
SET profile = 'web'
```
Settings profiles are declared in the user config file. This is usually `users.xml`.
Example:
```xml
<!-- Settings profiles -->
<profiles>
<!-- Default settings -->
<default>
<!-- The maximum number of threads when running a single query. -->
<max_threads>8</max_threads>
</default>
<!-- Settings for quries from the user interface -->
<web>
<max_rows_to_read>1000000000</max_rows_to_read>
<max_bytes_to_read>100000000000</max_bytes_to_read>
<max_rows_to_group_by>1000000</max_rows_to_group_by>
<group_by_overflow_mode>any</group_by_overflow_mode>
<max_rows_to_sort>1000000</max_rows_to_sort>
<max_bytes_to_sort>1000000000</max_bytes_to_sort>
<max_result_rows>100000</max_result_rows>
<max_result_bytes>100000000</max_result_bytes>
<result_overflow_mode>break</result_overflow_mode>
<max_execution_time>600</max_execution_time>
<min_execution_speed>1000000</min_execution_speed>
<timeout_before_checking_execution_speed>15</timeout_before_checking_execution_speed>
<max_columns_to_read>25</max_columns_to_read>
<max_temporary_columns>100</max_temporary_columns>
<max_temporary_non_const_columns>50</max_temporary_non_const_columns>
<max_subquery_depth>2</max_subquery_depth>
<max_pipeline_depth>25</max_pipeline_depth>
<max_ast_depth>50</max_ast_depth>
<max_ast_elements>100</max_ast_elements>
<readonly>1</readonly>
</web>
</profiles>
```
The example specifies two profiles: `default` and `web`. The `default` profile has a special purpose: it must always be present and is applied when starting the server. In other words, the `default` profile contains default settings. The `web` profile is a regular profile that can be set using the `SET` query or using a URL parameter in an HTTP query.
Settings profiles can inherit from each other. To use inheritance, indicate the `profile` setting before the other settings that are listed in the profile.
[Original article](https://clickhouse.yandex/docs/en/operations/settings/settings_profiles/) <!--hide-->
docs/zh/operations/settings/settings_profiles.md 0 → 120000
浏览文件 @ 9d651526
../../../en/operations/settings/settings_profiles.md
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或