Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YAML Configuration for ClickHouse #21858

Merged
merged 1 commit into from
May 22, 2021
Merged

Conversation

BoloniniD
Copy link
Contributor

@BoloniniD BoloniniD commented Mar 18, 2021

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • New Feature

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Added YAML configuration support to configuration loader. This closes #3607.

@robot-clickhouse robot-clickhouse added doc-alert pr-feature Pull request with new product feature labels Mar 18, 2021
@robot-clickhouse robot-clickhouse added the submodule changed At least one submodule changed in this PR. label Mar 18, 2021
@BoloniniD BoloniniD marked this pull request as ready for review March 25, 2021 07:17
@BoloniniD BoloniniD marked this pull request as draft March 25, 2021 07:18
@vitlibar vitlibar self-assigned this Apr 6, 2021
@BoloniniD BoloniniD force-pushed the yaml-cfg branch 2 times, most recently from d35783f to ca2bdc3 Compare April 9, 2021 11:00
@BoloniniD
Copy link
Contributor Author

I've moved YAML to XML translation function into a separate class and corrected the code in ConfigProcessor.cpp, the code looks better overall.

@BoloniniD BoloniniD force-pushed the yaml-cfg branch 9 times, most recently from 0ad2abb to 7546f06 Compare April 21, 2021 22:27
@Felixoid
Copy link
Member

Felixoid commented May 8, 2021

Looks like it will fix #3607

users:
default:
networks:
~replace: replace
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tab

@BoloniniD BoloniniD marked this pull request as ready for review May 11, 2021 07:41
base/daemon/BaseDaemon.cpp Outdated Show resolved Hide resolved
base/bridge/CMakeLists.txt Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
tests/integration/helpers/0_common_instance_config.yaml Outdated Show resolved Hide resolved
tests/integration/helpers/cluster.py Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Show resolved Hide resolved
src/Common/Config/YAMLParser.h Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.h Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
tests/integration/helpers/cluster.py Outdated Show resolved Hide resolved
@vitlibar
Copy link
Member

Why have you changed contrib/NuRaft and contrib/datasketches-cpp?

base/daemon/BaseDaemon.cpp Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
src/Common/Config/ConfigProcessor.cpp Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.h Outdated Show resolved Hide resolved
src/Common/Config/YAMLParser.cpp Outdated Show resolved Hide resolved
contrib/CMakeLists.txt Outdated Show resolved Hide resolved
@vitlibar vitlibar merged commit b89da7b into ClickHouse:master May 22, 2021
azat added a commit to azat/ClickHouse that referenced this pull request May 30, 2021
I'm using such hack to hide the password:

    $ clickhouse-client --config <(echo '<config><password></password></config>')

But this had been broken in ClickHouse#21858

v2: add a test
v3: fail for unsupported extensions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-feature Pull request with new product feature submodule changed At least one submodule changed in this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a way to configure ClickHouse through YAML
7 participants