-
Notifications
You must be signed in to change notification settings - Fork 70
feat: add base config implementation #92
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
Merged
+230
−1
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1b61005
feat: introduce a new config class to manage configurable options fol…
yingcai-cy 0297da8
fix linter issue.
yingcai-cy 7d5c901
apply review comments.
yingcai-cy 825e482
fix review issus.
yingcai-cy ae4a549
Apply review comments.
yingcai-cy b0984a7
Apply review comments for tests.
yingcai-cy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include <format> | ||
| #include <functional> | ||
| #include <string> | ||
| #include <unordered_map> | ||
|
|
||
| #include "iceberg/exception.h" | ||
|
|
||
| namespace iceberg { | ||
| namespace internal { | ||
| // Default conversion functions | ||
| template <typename U> | ||
| std::string DefaultToString(const U& val) { | ||
| if constexpr ((std::is_signed_v<U> && std::is_integral_v<U>) || | ||
| std::is_floating_point_v<U>) { | ||
| return std::to_string(val); | ||
| } else if constexpr (std::is_same_v<U, bool>) { | ||
| return val ? "true" : "false"; | ||
| } else if constexpr (std::is_same_v<U, std::string> || | ||
| std::is_same_v<U, std::string_view>) { | ||
| return val; | ||
| } else { | ||
| throw IcebergError( | ||
| std::format("Explicit to_str() is required for {}", typeid(U).name())); | ||
| } | ||
| } | ||
|
|
||
| template <typename U> | ||
| U DefaultFromString(const std::string& val) { | ||
| if constexpr (std::is_same_v<U, std::string>) { | ||
| return val; | ||
| } else if constexpr (std::is_same_v<U, bool>) { | ||
| return val == "true"; | ||
| } else if constexpr (std::is_signed_v<U> && std::is_integral_v<U>) { | ||
| return static_cast<U>(std::stoll(val)); | ||
| } else if constexpr (std::is_floating_point_v<U>) { | ||
| return static_cast<U>(std::stod(val)); | ||
| } else { | ||
| throw IcebergError( | ||
| std::format("Explicit from_str() is required for {}", typeid(U).name())); | ||
| } | ||
| } | ||
| } // namespace internal | ||
|
|
||
| template <class ConcreteConfig> | ||
| class ConfigBase { | ||
| public: | ||
| template <typename T> | ||
| class Entry { | ||
| public: | ||
| Entry(std::string key, const T& val, | ||
| std::function<std::string(const T&)> to_str = internal::DefaultToString<T>, | ||
| std::function<T(const std::string&)> from_str = internal::DefaultFromString<T>) | ||
| : key_{std::move(key)}, default_{val}, to_str_{to_str}, from_str_{from_str} {} | ||
|
|
||
| private: | ||
| const std::string key_; | ||
| const T default_; | ||
| const std::function<std::string(const T&)> to_str_; | ||
| const std::function<T(const std::string&)> from_str_; | ||
|
|
||
| friend ConfigBase; | ||
| friend ConcreteConfig; | ||
|
|
||
| public: | ||
| const std::string& key() const { return key_; } | ||
|
|
||
| const T& value() const { return default_; } | ||
| }; | ||
|
|
||
| template <typename T> | ||
| ConfigBase& Set(const Entry<T>& entry, const T& val) { | ||
| configs_.emplace(entry.key_, entry.to_str_(val)); | ||
| return *this; | ||
| } | ||
|
|
||
| template <typename T> | ||
| ConfigBase& Unset(const Entry<T>& entry) { | ||
| configs_.erase(entry.key_); | ||
| return *this; | ||
| } | ||
|
|
||
| ConfigBase& Reset() { | ||
| configs_.clear(); | ||
| return *this; | ||
| } | ||
|
|
||
| template <typename T> | ||
| T Get(const Entry<T>& entry) const { | ||
| auto iter = configs_.find(entry.key_); | ||
| return iter != configs_.cend() ? entry.from_str_(iter->second) : entry.default_; | ||
| } | ||
|
|
||
| const std::unordered_map<std::string, std::string>& configs() const { return configs_; } | ||
|
|
||
| protected: | ||
| std::unordered_map<std::string, std::string> configs_; | ||
| }; | ||
|
|
||
| } // namespace iceberg |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,110 @@ | ||||||
| /* | ||||||
| * Licensed to the Apache Software Foundation (ASF) under one | ||||||
| * or more contributor license agreements. See the NOTICE file | ||||||
| * distributed with this work for additional information | ||||||
| * regarding copyright ownership. The ASF licenses this file | ||||||
| * to you under the Apache License, Version 2.0 (the | ||||||
| * "License"); you may not use this file except in compliance | ||||||
| * with the License. You may obtain a copy of the License at | ||||||
| * | ||||||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| * | ||||||
| * Unless required by applicable law or agreed to in writing, | ||||||
| * software distributed under the License is distributed on an | ||||||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||||||
| * KIND, either express or implied. See the License for the | ||||||
| * specific language governing permissions and limitations | ||||||
| * under the License. | ||||||
| */ | ||||||
|
|
||||||
| #include <string> | ||||||
|
|
||||||
| #include <gtest/gtest.h> | ||||||
| #include <iceberg/util/config.h> | ||||||
|
|
||||||
| namespace iceberg { | ||||||
|
|
||||||
| enum class TestEnum { VALUE1, VALUE2, VALUE3 }; | ||||||
|
|
||||||
| std::string enumToString(const TestEnum& val) { | ||||||
| switch (val) { | ||||||
| case TestEnum::VALUE1: | ||||||
| return "VALUE1"; | ||||||
| case TestEnum::VALUE2: | ||||||
| return "VALUE2"; | ||||||
| case TestEnum::VALUE3: | ||||||
| return "VALUE3"; | ||||||
| default: | ||||||
| throw std::runtime_error("Invalid enum value"); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| TestEnum stringToEnum(const std::string& val) { | ||||||
|
||||||
| TestEnum stringToEnum(const std::string& val) { | |
| TestEnum StringToEnum(const std::string& val) { |
nit
Outdated
Collaborator
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: maybe we should follow the k-prefix pattern for static const variables.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit