1

Author: HeartLinked

src/iceberg/catalog/rest/http_client.cc

@@ -19,6 +19,8 @@
 
 #include "iceberg/catalog/rest/http_client.h"
 
+#include <expected>
+
 #include <cpr/cpr.h>
 #include <nlohmann/json.hpp>
 
@@ -113,7 +115,7 @@ ErrorResponse BuildDefaultErrorResponse(const cpr::Response& response) {
 /// \brief Tries to parse the response body as an ErrorResponse.
 Result<ErrorResponse> TryParseErrorResponse(const std::string& text) {
   if (text.empty()) {
-    return ErrorResponse();
+    return InvalidArgument("Empty response body");
   }
   ICEBERG_ASSIGN_OR_RAISE(auto json_result, FromJsonString(text));
   ICEBERG_ASSIGN_OR_RAISE(auto error_result, ErrorResponseFromJson(json_result));

src/iceberg/catalog/rest/rest_catalog.cc

@@ -142,8 +142,9 @@ Result<std::unordered_map<std::string, std::string>> RestCatalog::GetNamespacePr
 
 Status RestCatalog::DropNamespace(const Namespace& ns) {
   ICEBERG_ASSIGN_OR_RAISE(auto endpoint, paths_->Namespace_(ns));
-  auto response_or_error =
-      client_->Delete(endpoint, /*headers=*/{}, *DropNamespaceErrorHandler::Instance());
+  ICEBERG_ASSIGN_OR_RAISE(
+      const auto& response,
+      client_->Delete(endpoint, /*headers=*/{}, *DropNamespaceErrorHandler::Instance()));
   return {};
 }