HeartLinked commented on code in PR #296: URL: https://github.com/apache/iceberg-cpp/pull/296#discussion_r2554876833
########## src/iceberg/catalog/rest/catalog.cc: ########## @@ -0,0 +1,200 @@ +/* + * 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/catalog/rest/catalog.h" + +#include <memory> +#include <utility> + +#include <cpr/cpr.h> + +#include "iceberg/catalog/rest/config.h" +#include "iceberg/catalog/rest/constant.h" +#include "iceberg/catalog/rest/endpoint_util.h" +#include "iceberg/catalog/rest/http_client_interal.h" +#include "iceberg/catalog/rest/json_internal.h" +#include "iceberg/catalog/rest/types.h" +#include "iceberg/json_internal.h" +#include "iceberg/result.h" +#include "iceberg/table.h" +#include "iceberg/util/macros.h" + +namespace iceberg::rest { + +Result<std::unique_ptr<RestCatalog>> RestCatalog::Make(const RestCatalogConfig& config) { + // Create ResourcePaths and validate URI + ICEBERG_ASSIGN_OR_RAISE(auto paths, ResourcePaths::Make(config)); + + ICEBERG_ASSIGN_OR_RAISE(auto tmp_client, HttpClient::Make(config)); + + const std::string endpoint = paths->V1Config(); + cpr::Parameters params; + ICEBERG_ASSIGN_OR_RAISE(const auto& response, tmp_client->Get(endpoint, params)); + switch (response.status_code) { + case cpr::status::HTTP_OK: { + ICEBERG_ASSIGN_OR_RAISE(auto json, FromJsonString(response.text)); + ICEBERG_ASSIGN_OR_RAISE(auto server_config, CatalogConfigFromJson(json)); + // Merge server config into client config, server config overrides > client config + // properties > server config defaults + auto final_props = std::move(server_config.defaults); + for (const auto& kv : config.configs()) { + final_props.insert_or_assign(kv.first, kv.second); + } + + for (const auto& kv : server_config.overrides) { + final_props.insert_or_assign(kv.first, kv.second); + } + auto final_config = RestCatalogConfig::FromMap(final_props); + ICEBERG_ASSIGN_OR_RAISE(auto client, HttpClient::Make(*final_config)); + ICEBERG_ASSIGN_OR_RAISE(auto final_paths, ResourcePaths::Make(*final_config)); + return std::unique_ptr<RestCatalog>(new RestCatalog( + std::move(final_config), std::move(client), std::move(*final_paths))); + }; + default: { + ICEBERG_ASSIGN_OR_RAISE(auto json, FromJsonString(response.text)); + ICEBERG_ASSIGN_OR_RAISE(auto list_response, ErrorResponseFromJson(json)); + return UnknownError("Error listing namespaces: {}", list_response.error.message); + } + } +} + +RestCatalog::RestCatalog(std::unique_ptr<RestCatalogConfig> config, + std::unique_ptr<HttpClient> client, ResourcePaths paths) + : config_(std::move(config)), client_(std::move(client)), paths_(std::move(paths)) {} + +std::string_view RestCatalog::name() const { + auto it = config_->configs().find(std::string(RestCatalogConfig::kName)); + if (it == config_->configs().end() || it->second.empty()) { + return {""}; + } + return std::string_view(it->second); +} + +Result<std::vector<Namespace>> RestCatalog::ListNamespaces(const Namespace& ns) const { + const std::string endpoint = paths_.V1Namespaces(); + std::vector<Namespace> result; + std::string next_token; + while (true) { + cpr::Parameters params; + if (!ns.levels.empty()) { + params.Add({std::string(kQueryParamParent), EncodeNamespaceForUrl(ns)}); + } + if (!next_token.empty()) { + params.Add({std::string(kQueryParamPageToken), next_token}); + } + ICEBERG_ASSIGN_OR_RAISE(const auto& response, client_->Get(endpoint, params)); + switch (response.status_code) { + case cpr::status::HTTP_OK: { + ICEBERG_ASSIGN_OR_RAISE(auto json, FromJsonString(response.text)); + ICEBERG_ASSIGN_OR_RAISE(auto list_response, ListNamespacesResponseFromJson(json)); + result.insert(result.end(), list_response.namespaces.begin(), + list_response.namespaces.end()); + if (list_response.next_page_token.empty()) { + return result; + } + next_token = list_response.next_page_token; + continue; Review Comment: As refer to the Iceberg REST spec, as well as the iceberg implementations, I believe the current implementation is reasonable. And it passes the current temporary integration tests. ########## src/iceberg/catalog/rest/catalog.cc: ########## @@ -0,0 +1,200 @@ +/* + * 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/catalog/rest/catalog.h" + +#include <memory> +#include <utility> + +#include <cpr/cpr.h> + +#include "iceberg/catalog/rest/config.h" +#include "iceberg/catalog/rest/constant.h" +#include "iceberg/catalog/rest/endpoint_util.h" +#include "iceberg/catalog/rest/http_client_interal.h" +#include "iceberg/catalog/rest/json_internal.h" +#include "iceberg/catalog/rest/types.h" +#include "iceberg/json_internal.h" +#include "iceberg/result.h" +#include "iceberg/table.h" +#include "iceberg/util/macros.h" + +namespace iceberg::rest { + +Result<std::unique_ptr<RestCatalog>> RestCatalog::Make(const RestCatalogConfig& config) { + // Create ResourcePaths and validate URI + ICEBERG_ASSIGN_OR_RAISE(auto paths, ResourcePaths::Make(config)); + + ICEBERG_ASSIGN_OR_RAISE(auto tmp_client, HttpClient::Make(config)); + + const std::string endpoint = paths->V1Config(); + cpr::Parameters params; + ICEBERG_ASSIGN_OR_RAISE(const auto& response, tmp_client->Get(endpoint, params)); + switch (response.status_code) { + case cpr::status::HTTP_OK: { + ICEBERG_ASSIGN_OR_RAISE(auto json, FromJsonString(response.text)); + ICEBERG_ASSIGN_OR_RAISE(auto server_config, CatalogConfigFromJson(json)); + // Merge server config into client config, server config overrides > client config + // properties > server config defaults + auto final_props = std::move(server_config.defaults); + for (const auto& kv : config.configs()) { + final_props.insert_or_assign(kv.first, kv.second); + } + + for (const auto& kv : server_config.overrides) { + final_props.insert_or_assign(kv.first, kv.second); + } + auto final_config = RestCatalogConfig::FromMap(final_props); + ICEBERG_ASSIGN_OR_RAISE(auto client, HttpClient::Make(*final_config)); + ICEBERG_ASSIGN_OR_RAISE(auto final_paths, ResourcePaths::Make(*final_config)); + return std::unique_ptr<RestCatalog>(new RestCatalog( + std::move(final_config), std::move(client), std::move(*final_paths))); + }; + default: { + ICEBERG_ASSIGN_OR_RAISE(auto json, FromJsonString(response.text)); + ICEBERG_ASSIGN_OR_RAISE(auto list_response, ErrorResponseFromJson(json)); + return UnknownError("Error listing namespaces: {}", list_response.error.message); + } + } +} + +RestCatalog::RestCatalog(std::unique_ptr<RestCatalogConfig> config, + std::unique_ptr<HttpClient> client, ResourcePaths paths) + : config_(std::move(config)), client_(std::move(client)), paths_(std::move(paths)) {} + +std::string_view RestCatalog::name() const { + auto it = config_->configs().find(std::string(RestCatalogConfig::kName)); + if (it == config_->configs().end() || it->second.empty()) { + return {""}; + } + return std::string_view(it->second); +} + +Result<std::vector<Namespace>> RestCatalog::ListNamespaces(const Namespace& ns) const { + const std::string endpoint = paths_.V1Namespaces(); + std::vector<Namespace> result; + std::string next_token; + while (true) { + cpr::Parameters params; + if (!ns.levels.empty()) { + params.Add({std::string(kQueryParamParent), EncodeNamespaceForUrl(ns)}); + } + if (!next_token.empty()) { + params.Add({std::string(kQueryParamPageToken), next_token}); + } + ICEBERG_ASSIGN_OR_RAISE(const auto& response, client_->Get(endpoint, params)); + switch (response.status_code) { + case cpr::status::HTTP_OK: { + ICEBERG_ASSIGN_OR_RAISE(auto json, FromJsonString(response.text)); + ICEBERG_ASSIGN_OR_RAISE(auto list_response, ListNamespacesResponseFromJson(json)); + result.insert(result.end(), list_response.namespaces.begin(), + list_response.namespaces.end()); + if (list_response.next_page_token.empty()) { + return result; + } + next_token = list_response.next_page_token; + continue; Review Comment: Thanks for this review! As refer to the Iceberg REST spec, as well as the iceberg implementations, I believe the current implementation is reasonable. And it passes the current temporary integration tests. -- 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]
