CLICKHOUSE-3852: Add ability to set up config parameters from env variables. #2741
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -103,7 +103,8 @@ static ElementIdentifier getElementIdentifier(Node * element) | |||
| { | |||
| const Node * node = attrs->item(i); | |||
| std::string name = node->nodeName(); | |||
| if (name == "replace" || name == "remove" || name == "incl" || name == "from_zk") | |||
| if (name == "replace" || name == "remove" || | |||
| std::count(ConfigProcessor::SUBSTITUTION_ATTRS.begin(), ConfigProcessor::SUBSTITUTION_ATTRS.end(), name) > 0) | |||
There was a problem hiding this comment.
A little bit redundant (the loop always till the end).
std::find is probably better.
| @@ -267,12 +268,13 @@ void ConfigProcessor::doIncludesRecursive( | |||
| return; | |||
| } | |||
|
|
|||
| std::vector<const Node *> attr_nodes; | |||
There was a problem hiding this comment.
Maybe std::map keyed by attribute name is better?
| XMLDocumentPtr env_document; | ||
| auto get_env_node = [&](const std::string & name) -> const Node * | ||
| { | ||
| std::string value = std::getenv(name.c_str()); |
There was a problem hiding this comment.
We can include cstdlib explicitly.
| XMLDocumentPtr env_document; | ||
| auto get_env_node = [&](const std::string & name) -> const Node * | ||
| { | ||
| std::string value = std::getenv(name.c_str()); |
There was a problem hiding this comment.
The getenv() function returns a pointer to the value in the environment, or NULL if there is no match.
Possible initialization of std::string from nullptr.
|
At least we need a test that something works. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en