Skip to content

rest: build resource paths from final config #482

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.

Sign up for GitHub

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
wgtmac merged 3 commits into from
Jan 6, 2026
Merged

rest: build resource paths from final config #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72a2ef9
feat(rest): build resource paths after get config.
plusplusjiajia Jan 4, 2026
6c7b2cf
remove SetBaseUri in ResourcePaths
plusplusjiajia Jan 5, 2026
3edf52c
revert changing ResourcePaths:Config()
plusplusjiajia Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/iceberg/catalog/rest/resource_paths.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ Result<std::unique_ptr<ResourcePaths>> ResourcePaths::Make(std::string base_uri,
ResourcePaths::ResourcePaths(std::string base_uri, const std::string& prefix)
: base_uri_(std::move(base_uri)), prefix_(prefix.empty() ? "" : (prefix + "/")) {}

Status ResourcePaths::SetBaseUri(const std::string& base_uri) {
if (base_uri.empty()) {
return InvalidArgument("Base URI is empty");
}
base_uri_ = base_uri;
return {};
}

Result<std::string> ResourcePaths::Config() const {
return std::format("{}/v1/config", base_uri_);
}
Expand Down
4 changes: 0 additions & 4 deletions src/iceberg/catalog/rest/resource_paths.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <string>

#include "iceberg/catalog/rest/iceberg_rest_export.h"
#include "iceberg/catalog/rest/type_fwd.h"
#include "iceberg/result.h"
#include "iceberg/type_fwd.h"

Expand All @@ -44,9 +43,6 @@ class ICEBERG_REST_EXPORT ResourcePaths {
static Result<std::unique_ptr<ResourcePaths>> Make(std::string base_uri,
const std::string& prefix);

/// \brief Set the base URI of the REST catalog server.
Status SetBaseUri(const std::string& base_uri);

/// \brief Get the /v1/config endpoint path.
Result<std::string> Config() const;

Expand Down
4 changes: 3 additions & 1 deletion src/iceberg/catalog/rest/rest_catalog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ Result<std::shared_ptr<RestCatalog>> RestCatalog::Make(

// Update resource paths based on the final config
ICEBERG_ASSIGN_OR_RAISE(auto final_uri, final_config->Uri());
ICEBERG_RETURN_UNEXPECTED(paths->SetBaseUri(std::string(TrimTrailingSlash(final_uri))));
ICEBERG_ASSIGN_OR_RAISE(
paths, ResourcePaths::Make(std::string(TrimTrailingSlash(final_uri)),
final_config->Get(RestCatalogProperties::kPrefix)));

return std::shared_ptr<RestCatalog>(
new RestCatalog(std::move(final_config), std::move(file_io), std::move(paths),
Expand Down
Loading