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

Changed substitution path name

Browse Source
This commit is contained in:
Alexey Milovidov 2021-09-20 01:50:09 +03:00
parent 510540c7d7
commit f0925b3cf6
23 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/operations/configuration-files.md
View File

@ -32,7 +32,7 @@ You can also declare attributes as coming from environment variables by using `f
## Substitution {#substitution} ## Substitution {#substitution}
The config can also define “substitutions”. If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/yandex/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md#macros)). The config can also define “substitutions”. If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/clickhouse/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md#macros)).
If you want to replace an entire element with a substitution use `include` as element name. If you want to replace an entire element with a substitution use `include` as element name.

2
docs/ja/operations/configuration-files.md
View File

@ -20,7 +20,7 @@ ClickHouseは複数のファイル構成管理をサポートします。 主サ
もし `remove` 指定されると、要素を削除します。 もし `remove` 指定されると、要素を削除します。
この設定はまた、 “substitutions”. 要素が `incl` 属性は、ファイルからの対応する置換が値として使用されます。 デフォルトでは、ファイルへのパスとの置換を行う `/etc/metrika.xml`. これはで変えることができます [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from) サーバー設定の要素。 置換値は、次のように指定されます `/yandex/substitution_name` このファイル内の要素。 で指定された置換の場合 `incl` 存在しない場合は、ログに記録されます。 ClickHouseが不足している置換をログに記録しないようにするには、 `optional="true"` 属性(たとえば、 [マクロ](server-configuration-parameters/settings.md)). この設定はまた、 “substitutions”. 要素が `incl` 属性は、ファイルからの対応する置換が値として使用されます。 デフォルトでは、ファイルへのパスとの置換を行う `/etc/metrika.xml`. これはで変えることができます [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from) サーバー設定の要素。 置換値は、次のように指定されます `/clickhouse/substitution_name` このファイル内の要素。 で指定された置換の場合 `incl` 存在しない場合は、ログに記録されます。 ClickHouseが不足している置換をログに記録しないようにするには、 `optional="true"` 属性(たとえば、 [マクロ](server-configuration-parameters/settings.md)).
置換はZooKeeperからも実行できます。 これを行うには、属性を指定します `from_zk = "/path/to/node"`. 要素の値は、ノードの内容に置き換えられます。 `/path/to/node` 飼育係で。 また、ZooKeeperノードにXMLサブツリー全体を配置することもできます。 置換はZooKeeperからも実行できます。 これを行うには、属性を指定します `from_zk = "/path/to/node"`. 要素の値は、ノードの内容に置き換えられます。 `/path/to/node` 飼育係で。 また、ZooKeeperノードにXMLサブツリー全体を配置することもできます。

2
docs/ru/operations/configuration-files.md
View File

@ -33,7 +33,7 @@ ClickHouse поддерживает многофайловое управлен
## Подстановки {#substitution} ## Подстановки {#substitution}
В конфигурационном файле могут быть указаны «подстановки». Если у элемента присутствует атрибут `incl`, то в качестве значения будет использована соответствующая подстановка из файла. По умолчанию путь к файлу с подстановками - `/etc/metrika.xml`. Он может быть изменён в конфигурации сервера в элементе [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from). Значения подстановок указываются в элементах `/yandex/имя_подстановки` этого файла. Если подстановка, заданная в `incl`, отсутствует, то делается соответствующая запись в лог. Чтобы ClickHouse фиксировал в логе отсутствие подстановки, необходимо указать атрибут `optional="true"` (например, настройки для [macros](server-configuration-parameters/settings.md#macros)). В конфигурационном файле могут быть указаны «подстановки». Если у элемента присутствует атрибут `incl`, то в качестве значения будет использована соответствующая подстановка из файла. По умолчанию путь к файлу с подстановками - `/etc/metrika.xml`. Он может быть изменён в конфигурации сервера в элементе [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from). Значения подстановок указываются в элементах `/clickhouse/имя_подстановки` этого файла. Если подстановка, заданная в `incl`, отсутствует, то делается соответствующая запись в лог. Чтобы ClickHouse фиксировал в логе отсутствие подстановки, необходимо указать атрибут `optional="true"` (например, настройки для [macros](server-configuration-parameters/settings.md#macros)).
Если нужно заменить весь элемент подстановкой, можно использовать `include` как имя элемента. Если нужно заменить весь элемент подстановкой, можно использовать `include` как имя элемента.

2
docs/zh/operations/configuration-files.md
View File

@ -13,7 +13,7 @@ ClickHouse支持多配置文件管理。主配置文件是`/etc/clickhouse-serve
如果指定`remove`属性，则删除该元素。 如果指定`remove`属性，则删除该元素。
此外，配置文件还可指定"substitutions"。如果一个元素有`incl`属性，则文件中的相应替换值将被使用。默认情况下，具有替换的文件的路径为`/etc/metrika.xml`。这可以在服务配置中的[include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from)元素中被修改。替换值在这个文件的`/yandex/substitution_name`元素中被指定。如果`incl`中指定的替换值不存在，则将其记录在日志中。为防止ClickHouse记录丢失的替换，请指定`optional="true"`属性（例如，[宏](server-configuration-parameters/settings.md)设置）。 此外，配置文件还可指定"substitutions"。如果一个元素有`incl`属性，则文件中的相应替换值将被使用。默认情况下，具有替换的文件的路径为`/etc/metrika.xml`。这可以在服务配置中的[include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from)元素中被修改。替换值在这个文件的`/clickhouse/substitution_name`元素中被指定。如果`incl`中指定的替换值不存在，则将其记录在日志中。为防止ClickHouse记录丢失的替换，请指定`optional="true"`属性（例如，[宏](server-configuration-parameters/settings.md)设置）。
替换也可以从ZooKeeper执行。为此，请指定属性`from_zk = "/path/to/node"`。元素值被替换为ZooKeeper节点`/path/to/node`的内容。您还可以将整个XML子树放在ZooKeeper节点上，并将其完全插入到源元素中。 替换也可以从ZooKeeper执行。为此，请指定属性`from_zk = "/path/to/node"`。元素值被替换为ZooKeeper节点`/path/to/node`的内容。您还可以将整个XML子树放在ZooKeeper节点上，并将其完全插入到源元素中。

2
programs/server/config.xml
View File

@ -718,7 +718,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
programs/server/config.yaml.example
View File

@ -602,7 +602,7 @@ remote_servers:
# If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. # If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
# By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. # By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
# Values for substitutions are specified in /yandex/name_of_substitution elements in that file. # Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
# ZooKeeper is used to store metadata about replicas, when using Replicated tables. # ZooKeeper is used to store metadata about replicas, when using Replicated tables.
# Optional. If you don't use replicated tables, you could omit that. # Optional. If you don't use replicated tables, you could omit that.

2
tests/integration/test_config_corresponding_root/configs/config.xml
View File

@ -209,7 +209,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/integration/test_config_xml_full/configs/config.xml
View File

@ -676,7 +676,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/integration/test_https_replication/configs/config.xml
View File

@ -168,7 +168,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/aes_encryption/configs/clickhouse/config.xml
View File

@ -212,7 +212,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml
View File

@ -212,7 +212,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/example/configs/clickhouse/config.xml
View File

@ -212,7 +212,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml
View File

@ -224,7 +224,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/kerberos/configs/clickhouse/config.xml
View File

@ -216,7 +216,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/ldap/authentication/configs/clickhouse/config.xml
View File

@ -218,7 +218,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
View File

@ -218,7 +218,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
View File

@ -218,7 +218,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/map_type/configs/clickhouse/config.xml
View File

@ -224,7 +224,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/rbac/configs/clickhouse/config.xml
View File

@ -224,7 +224,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
tests/testflows/window_functions/configs/clickhouse/config.xml
View File

@ -224,7 +224,7 @@
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file. <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element. By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
Values for substitutions are specified in /yandex/name_of_substitution elements in that file. Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
--> -->
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables. <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.

2
utils/build/build_debian.sh
View File

@ -3,7 +3,7 @@
# How to build ClickHouse under debian-based systems (ubuntu) # How to build ClickHouse under debian-based systems (ubuntu)
# apt install -y curl sudo # apt install -y curl sudo
# curl https://raw.githubusercontent.com/yandex/ClickHouse/master/utils/build/build_debian.sh | sh # curl https://raw.githubusercontent.com/clickhouse/ClickHouse/master/utils/build/build_debian.sh | sh
# install compiler and libs # install compiler and libs
sudo apt install -y git bash cmake ninja-build gcc-8 g++-8 libicu-dev libreadline-dev gperf sudo apt install -y git bash cmake ninja-build gcc-8 g++-8 libicu-dev libreadline-dev gperf

2
utils/build/build_freebsd.sh
View File

@ -17,7 +17,7 @@
# pkg install -y curl sudo # pkg install -y curl sudo
# curl https://raw.githubusercontent.com/yandex/ClickHouse/master/utils/build/build_freebsd.sh | sh # curl https://raw.githubusercontent.com/clickhouse/ClickHouse/master/utils/build/build_freebsd.sh | sh
# install compiler and libs # install compiler and libs
sudo pkg install devel/git devel/cmake devel/ninja shells/bash devel/icu devel/libltdl databases/unixODBC devel/google-perftools devel/libdouble-conversion archivers/zstd archivers/liblz4 devel/sparsehash devel/re2 sudo pkg install devel/git devel/cmake devel/ninja shells/bash devel/icu devel/libltdl databases/unixODBC devel/google-perftools devel/libdouble-conversion archivers/zstd archivers/liblz4 devel/sparsehash devel/re2

2
utils/clickhouse-docker
View File

@ -24,7 +24,7 @@ param="$1"
if [ "${param}" = "list" ] if [ "${param}" = "list" ]
then then
# https://stackoverflow.com/a/39454426/1555175 # https://stackoverflow.com/a/39454426/1555175
wget -nv https://registry.hub.docker.com/v1/repositories/yandex/clickhouse-server/tags -O - | sed -e 's/[][]//g' -e 's/"//g' -e 's/ //g' | tr '}' '\n' | awk -F: '{print $3}' wget -nv https://registry.hub.docker.com/v1/repositories/clickhouse/clickhouse-server/tags -O - | sed -e 's/[][]//g' -e 's/"//g' -e 's/ //g' | tr '}' '\n' | awk -F: '{print $3}'
else else
docker pull yandex/clickhouse-server:${param} docker pull yandex/clickhouse-server:${param}
tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX) # older version require /nonexistent folder to exist to run clickhouse client :D tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX) # older version require /nonexistent folder to exist to run clickhouse client :D