shangxinli commented on code in PR #1031: URL: https://github.com/apache/iceberg-cpp/pull/1031#discussion_r4350512013
########## src/iceberg/encryption/key_management_client.cc: ########## @@ -0,0 +1,97 @@ +/* + * 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 "iceberg/encryption/key_management_client.h" + +#include <mutex> + +#include "iceberg/util/macros.h" +#include "iceberg/util/string_util.h" + +namespace iceberg { + +namespace { + +struct RegistryState { + std::mutex mutex; + std::unordered_map<std::string, KmsRegistry::Factory> factories; +}; + +RegistryState& State() { + static RegistryState state; + return state; +} + +} // namespace + +void KmsRegistry::Register(std::string name, Factory factory) { + auto& state = State(); + std::lock_guard lock(state.mutex); + state.factories.insert_or_assign(std::move(name), std::move(factory)); +} + +Result<std::shared_ptr<KeyManagementClient>> KmsRegistry::Load( + std::string_view name, const Properties& properties) { + Factory factory; + { + auto& state = State(); + std::lock_guard lock(state.mutex); + auto it = state.factories.find(std::string(name)); + if (it == state.factories.end()) { + return NotFound( + "KMS client not found: {}. Built-in clients must be enabled at build time " + "(ICEBERG_KMS_AWS, ICEBERG_KMS_GCP, ICEBERG_KMS_AZURE); custom clients must be " + "registered with KmsRegistry::Register", + name); + } + factory = it->second; + } + ICEBERG_ASSIGN_OR_RAISE(auto client, factory()); Review Comment: Good catch - Load now rejects an empty factory with an invalid-argument error instead of invoking it, with a regression test that fails with bad_function_call without the guard. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
