my first version

Author: HeartLinked

CMakeLists.txt

@@ -28,6 +28,9 @@ project(Iceberg
         DESCRIPTION "Iceberg C++ Project"
         LANGUAGES CXX)
 
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/iceberg/version.h.in"
+               "${CMAKE_BINARY_DIR}/src/iceberg/version.h")
+
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

src/iceberg/catalog.h

@@ -26,6 +26,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include "iceberg/iceberg_export.h"
 #include "iceberg/result.h"
 #include "iceberg/table_identifier.h"
 #include "iceberg/type_fwd.h"
@@ -43,6 +44,13 @@ class ICEBERG_EXPORT Catalog {
   /// \brief Return the name for this catalog
   virtual std::string_view name() const = 0;
 
+  /// \brief List child namespaces from the given namespace.
+  ///
+  /// \param ns the parent namespace
+  /// \return a list of child namespaces;
+  ///         ErrorKind::kNoSuchNamespace if the given namespace does not exist
+  virtual Result<std::vector<Namespace>> ListNamespaces(const Namespace& ns) const = 0;
+
   /// \brief Create a namespace with associated properties.
   ///
   /// \param ns the namespace to create
@@ -54,13 +62,6 @@ class ICEBERG_EXPORT Catalog {
       const Namespace& ns,
       const std::unordered_map<std::string, std::string>& properties) = 0;
 
-  /// \brief List child namespaces from the given namespace.
-  ///
-  /// \param ns the parent namespace
-  /// \return a list of child namespaces;
-  ///         ErrorKind::kNoSuchNamespace if the given namespace does not exist
-  virtual Result<std::vector<Namespace>> ListNamespaces(const Namespace& ns) const = 0;
-
   /// \brief Get metadata properties for a namespace.
   ///
   /// \param ns the namespace to look up
@@ -69,6 +70,12 @@ class ICEBERG_EXPORT Catalog {
   virtual Result<std::unordered_map<std::string, std::string>> GetNamespaceProperties(
       const Namespace& ns) const = 0;
 
+  /// \brief Check whether the namespace exists.
+  ///
+  /// \param ns the namespace to check
+  /// \return true if the namespace exists, false otherwise
+  virtual Result<bool> NamespaceExists(const Namespace& ns) const = 0;
+
   /// \brief Drop a namespace.
   ///
   /// \param ns the namespace to drop
@@ -77,12 +84,6 @@ class ICEBERG_EXPORT Catalog {
   ///         ErrorKind::kNotAllowed if the namespace is not empty
   virtual Status DropNamespace(const Namespace& ns) = 0;
 
-  /// \brief Check whether the namespace exists.
-  ///
-  /// \param ns the namespace to check
-  /// \return true if the namespace exists, false otherwise
-  virtual Result<bool> NamespaceExists(const Namespace& ns) const = 0;
-
   /// \brief Update a namespace's properties by applying additions and removals.
   ///
   /// \param ns the namespace to update

src/iceberg/catalog/rest/CMakeLists.txt

@@ -22,18 +22,28 @@ set(ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS)
 set(ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS)
 set(ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS)
 
-list(APPEND ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS
-     "$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>" cpr::cpr)
-list(APPEND ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS
-     "$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>" cpr::cpr)
+list(APPEND
+     ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS
+     "$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>"
+     cpr::cpr
+     nlohmann_json::nlohmann_json)
+list(APPEND
+     ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS
+     "$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>"
+     cpr::cpr
+     nlohmann_json::nlohmann_json)
 list(APPEND
      ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS
      "$<IF:$<TARGET_EXISTS:Iceberg::iceberg_static>,Iceberg::iceberg_static,Iceberg::iceberg_shared>"
-     "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,cpr::cpr>")
+     "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,cpr::cpr>"
+     "$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,Iceberg::nlohmann_json,nlohmann_json::nlohmann_json>"
+)
 list(APPEND
      ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS
      "$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
-     "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,cpr::cpr>")
+     "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,cpr::cpr>"
+     "$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,Iceberg::nlohmann_json,nlohmann_json::nlohmann_json>"
+)
 
 add_iceberg_lib(iceberg_rest
                 SOURCES

src/iceberg/catalog/rest/config.h

@@ -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.
+ */
+
+// namespace iceberg::rest {
+
+// class ICEBERG_REST_EXPORT RestCatalogConfig {
+//  public:
+//   std::string uri;
+//   std::optional<std::string> warehouse;
+//   std::map<std::string, std::string> props;
+
+//   // Endpoint builder methods
+//   std::string config_endpoint() const;
+//   std::string namespaces_endpoint() const;
+//   std::string namespace_endpoint(const Namespace& ns) const;
+//   std::string tables_endpoint(const Namespace& ns) const;
+//   std::string table_endpoint(const TableIdentifier& table) const;
+//   std::string rename_table_endpoint() const;
+// };
+
+// }  // namespace iceberg::rest
+
+#pragma once
+
+#include <format>
+#include <map>
+#include <optional>
+#include <string>
+
+#include "constant.h"
+#include "iceberg/catalog/rest/iceberg_rest_export.h"
+#include "iceberg/table_identifier.h"
+#include "iceberg/util/config.h"
+#include "util.h"
+
+/// \file iceberg/catalog/rest/config.h
+/// RestCatalogConfig implementation for Iceberg REST API.
+
+namespace iceberg::rest {
+
+class ICEBERG_REST_EXPORT RestCatalogConfig : public ConfigBase<RestCatalogConfig> {
+ public:
+  const std::string& GetUri() const { return uri_; }
+
+  const std::optional<std::string>& GetWarehouse() const { return warehouse_; }
+
+  RestCatalogConfig& SetUri(std::string uri) {
+    uri_ = std::move(uri);
+    return *this;
+  }
+
+  RestCatalogConfig& SetWarehouse(std::string warehouse) {
+    warehouse_ = std::move(warehouse);
+    return *this;
+  }
+
+  std::string GetConfigEndpoint() const {
+    return std::format("{}/{}/config", TrimTrailingSlash(uri_), kPathV1);
+  }
+
+  /// \brief Get the namespaces endpoint
+  std::string GetNamespacesEndpoint() const {
+    return std::format("{}/{}/namespaces", TrimTrailingSlash(uri_), kPathV1);
+  }
+
+  /// \brief Get the namespace endpoint
+  std::string GetNamespaceEndpoint(const Namespace& ns) const {
+    return std::format("{}/{}/namespaces/{}", TrimTrailingSlash(uri_), kPathV1,
+                       EncodeNamespaceForUrl(ns));
+  }
+
+  /// \brief Get the tables endpoint
+  std::string GetTablesEndpoint(const Namespace& ns) const {
+    return std::format("{}/{}/namespaces/{}/tables", TrimTrailingSlash(uri_), kPathV1,
+                       EncodeNamespaceForUrl(ns));
+  }
+
+  /// \brief Get the rename table endpoint
+  std::string GetRenameTableEndpoint() const {
+    return std::format("{}/{}/tables/rename", TrimTrailingSlash(uri_), kPathV1);
+  }
+
+  /// \brief Get the table endpoint
+  std::string GetTableEndpoint(const TableIdentifier& table) const {
+    return std::format("{}/{}/namespaces/{}/tables/{}", TrimTrailingSlash(uri_), kPathV1,
+                       EncodeNamespaceForUrl(table.ns), table.name);
+  }
+
+ private:
+  std::string uri_;
+  std::optional<std::string> warehouse_;
+};
+
+}  // namespace iceberg::rest

src/iceberg/catalog/rest/constant.h

@@ -0,0 +1,43 @@
+/*
+ * 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 <string_view>
+
+#include "iceberg/version.h"
+
+/// \file iceberg/catalog/rest/constant.h
+/// Constant values for Iceberg REST API.
+
+namespace iceberg::rest {
+
+constexpr std::string_view kHeaderContentType = "Content-Type";
+constexpr std::string_view kHeaderAccept = "Accept";
+constexpr std::string_view kHeaderXClientVersion = "X-Client-Version";
+constexpr std::string_view kHeaderUserAgent = "User-Agent";
+
+constexpr std::string_view kMimeTypeApplicationJson = "application/json";
+constexpr std::string_view kClientVersion = "0.14.1";
+constexpr std::string_view kUserAgentPrefix = "iceberg-cpp/";
+constexpr std::string_view kUserAgent = "iceberg-cpp/" ICEBERG_VERSION_STRING;
+
+constexpr std::string_view kPathV1 = "v1";
+
+}  // namespace iceberg::rest

src/iceberg/catalog/rest/error.h

@@ -0,0 +1,50 @@
+/*
+ * 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 <optional>
+#include <string>
+#include <vector>
+
+#include <nlohmann/json.hpp>
+
+#include "iceberg/result.h"
+
+namespace iceberg::rest {
+
+struct ApiErrorModel {
+  std::string message;
+  std::string type;
+  uint16_t code;
+  std::optional<std::vector<std::string>> stack;
+
+  // 转换到项目统一的 Error 类型
+  operator Error() const;
+};
+
+// 嵌套的 ErrorResponse 结构
+struct ApiErrorResponse {
+  ApiErrorModel error;
+  operator Error() const { return error; }
+};
+
+void from_json(const nlohmann::json& j, ApiErrorModel& e);
+void from_json(const nlohmann::json& j, ApiErrorResponse& e);
+
+}  // namespace iceberg::rest