fix review

Author: HeartLinked

src/iceberg/catalog/rest/meson.build

@@ -46,4 +46,4 @@ iceberg_rest_dep = declare_dependency(
 meson.override_dependency('iceberg-rest', iceberg_rest_dep)
 pkg.generate(iceberg_rest_lib)
 
-install_headers(['rest_catalog.h'], subdir: 'iceberg/catalog/rest')
+install_headers(['rest_catalog.h', 'types.h'], subdir: 'iceberg/catalog/rest')

src/iceberg/catalog/rest/request_types.h

@@ -23,6 +23,8 @@
 
 #include <cpr/cpr.h>
 
+#include "iceberg/catalog/rest/types.h"
+
 namespace iceberg::catalog::rest {
 
 RestCatalog::RestCatalog(const std::string& base_url) : base_url_(std::move(base_url)) {}

src/iceberg/catalog/rest/rest_catalog.cc

@@ -19,32 +19,68 @@
 
 #pragma once
 
+#include <memory>
 #include <optional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "iceberg/catalog/rest/iceberg_rest_export.h"
 #include "iceberg/table_identifier.h"
-#include "iceberg/table_metadata.h"
+#include "iceberg/type_fwd.h"
 
-/// \file iceberg/catalog/rest/response_types.h
-/// Defines all response body structures for the Iceberg REST Catalog API,
-/// representing the JSON results returned by /v1 endpoints (excluding HTTP headers like
-/// ETag).
+/// \file iceberg/catalog/rest/types.h
+/// Request and response types for Iceberg REST Catalog API.
 
 namespace iceberg::rest {
 
+// Request Types
+
+/// \brief Request to create a namespace.
+struct ICEBERG_REST_EXPORT CreateNamespaceRequest {
+  Namespace namespace_;  // required
+  std::unordered_map<std::string, std::string> properties;
+};
+
+/// \brief Update or delete namespace properties request.
+struct ICEBERG_REST_EXPORT UpdateNamespacePropertiesRequest {
+  std::vector<std::string> removals;
+  std::unordered_map<std::string, std::string> updates;
+};
+
+/// \brief Request to create a table.
+struct ICEBERG_REST_EXPORT CreateTableRequest {
+  std::string name;  // required
+  std::string location;
+  std::shared_ptr<Schema> schema;  // required
+  std::shared_ptr<PartitionSpec> partition_spec;
+  std::shared_ptr<SortOrder> write_order;
+  std::optional<bool> stage_create;
+  std::unordered_map<std::string, std::string> properties;
+};
+
+/// \brief Request to register a table.
+struct ICEBERG_REST_EXPORT RegisterTableRequest {
+  std::string name;               // required
+  std::string metadata_location;  // required
+  bool overwrite = false;
+};
+
+/// \brief Request to rename a table.
+struct ICEBERG_REST_EXPORT RenameTableRequest {
+  TableIdentifier source;       // required
+  TableIdentifier destination;  // required
+};
+
 /// \brief An opaque token that allows clients to make use of pagination for list APIs.
 using PageToken = std::string;
 
 /// \brief Result body for table create/load/register APIs.
-/// \details Matches **components/schemas/LoadTableResult** in the REST spec.
 struct ICEBERG_REST_EXPORT LoadTableResult {
   std::optional<std::string> metadata_location;
-  TableMetadata metadata;  // required
+  std::shared_ptr<TableMetadata> metadata;  // required  // required
   std::unordered_map<std::string, std::string> config;
-  // TODO(Li Feiyang): Add std::vector<StorageCredential> storage_credentials;
+  // TODO(Li Feiyang): Add std::shared_ptr<StorageCredential> storage_credential;
 };
 
 /// \brief Alias of LoadTableResult used as the body of CreateTableResponse
@@ -53,42 +89,34 @@ using CreateTableResponse = LoadTableResult;
 /// \brief Alias of LoadTableResult used as the body of LoadTableResponse
 using LoadTableResponse = LoadTableResult;
 
-/// \brief Alias of LoadTableResult used as the body of RegisterTableResponse
-using RegisterTableResponse = LoadTableResult;
-
 /// \brief Response body for listing namespaces.
-/// Contains all namespaces and an optional pagination token.
 struct ICEBERG_REST_EXPORT ListNamespacesResponse {
-  std::optional<PageToken> next_page_token;
+  PageToken next_page_token;
   std::vector<Namespace> namespaces;
 };
 
 /// \brief Response body after creating a namespace.
-/// \details Contains the created namespace and its resolved properties.
 struct ICEBERG_REST_EXPORT CreateNamespaceResponse {
   Namespace namespace_;  // required
   std::unordered_map<std::string, std::string> properties;
 };
 
 /// \brief Response body for loading namespace properties.
-/// \details Contains stored properties, may be null if unsupported by the server.
 struct ICEBERG_REST_EXPORT GetNamespaceResponse {
   Namespace namespace_;  // required
   std::unordered_map<std::string, std::string> properties;
 };
 
 /// \brief Response body after updating namespace properties.
-/// \details Lists keys that were updated, removed, or missing.
 struct ICEBERG_REST_EXPORT UpdateNamespacePropertiesResponse {
   std::vector<std::string> updated;  // required
   std::vector<std::string> removed;  // required
   std::vector<std::string> missing;
 };
 
 /// \brief Response body for listing tables in a namespace.
-/// \details Contains all table identifiers and an optional pagination token.
 struct ICEBERG_REST_EXPORT ListTablesResponse {
-  std::optional<PageToken> next_page_token;
+  PageToken next_page_token;
   std::vector<TableIdentifier> identifiers;
 };