couchbase 3.0.2 → 3.0.3

data/ext/couchbase/operations/search_index_control_query.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_control_query_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::string error{};
 };
@@ -34,6 +33,7 @@ struct search_index_control_query_request {
     using response_type = search_index_control_query_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -52,28 +52,40 @@ struct search_index_control_query_request {
 };
 
 search_index_control_query_response
-make_response(std::error_code ec,
-              search_index_control_query_request& request,
+make_response(error_context::http&& ctx,
+              search_index_control_query_request&,
               search_index_control_query_request::encoded_response_type&& encoded)
 {
-    search_index_control_query_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_control_query_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             if (response.status == "ok") {
                 return response;
             }
         } else if (encoded.status_code == 400) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             response.error = payload.at("error").get_string();
             if (response.error.find("index not found") != std::string::npos) {
-                response.ec = std::make_error_code(error::common_errc::index_not_found);
+                response.ctx.ec = std::make_error_code(error::common_errc::index_not_found);
                 return response;
             }
         }
-        response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+        response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
     }
     return response;
 }

data/ext/couchbase/operations/search_index_drop.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_drop_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::string error{};
 };
@@ -34,6 +33,7 @@ struct search_index_drop_request {
     using response_type = search_index_drop_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -51,26 +51,38 @@ struct search_index_drop_request {
 };
 
 search_index_drop_response
-make_response(std::error_code ec, search_index_drop_request& request, search_index_drop_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, search_index_drop_request&, search_index_drop_request::encoded_response_type&& encoded)
 {
-    search_index_drop_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_drop_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             if (response.status == "ok") {
                 return response;
             }
         } else if (encoded.status_code == 400) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             response.error = payload.at("error").get_string();
             if (response.error.find("index not found") != std::string::npos) {
-                response.ec = std::make_error_code(error::common_errc::index_not_found);
+                response.ctx.ec = std::make_error_code(error::common_errc::index_not_found);
                 return response;
             }
         }
-        response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+        response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
     }
     return response;
 }

data/ext/couchbase/operations/search_index_get.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -25,8 +25,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     search_index index{};
     std::string error{};
@@ -36,6 +35,7 @@ struct search_index_get_request {
     using response_type = search_index_get_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -53,27 +53,39 @@ struct search_index_get_request {
 };
 
 search_index_get_response
-make_response(std::error_code ec, search_index_get_request& request, search_index_get_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, search_index_get_request&, search_index_get_request::encoded_response_type&& encoded)
 {
-    search_index_get_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_get_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             if (response.status == "ok") {
                 response.index = payload.at("indexDef").as<search_index>();
                 return response;
             }
         } else if (encoded.status_code == 400) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             response.error = payload.at("error").get_string();
             if (response.error.find("index not found") != std::string::npos) {
-                response.ec = std::make_error_code(error::common_errc::index_not_found);
+                response.ctx.ec = std::make_error_code(error::common_errc::index_not_found);
                 return response;
             }
         }
-        response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+        response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
     }
     return response;
 }

data/ext/couchbase/operations/search_index_get_all.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -25,8 +25,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_all_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::string impl_version{};
     std::vector<search_index> indexes{};
@@ -36,6 +35,7 @@ struct search_index_get_all_request {
     using response_type = search_index_get_all_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -53,12 +53,18 @@ struct search_index_get_all_request {
 };
 
 search_index_get_all_response
-make_response(std::error_code ec, search_index_get_all_request& request, search_index_get_all_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, search_index_get_all_request&, search_index_get_all_request::encoded_response_type&& encoded)
 {
-    search_index_get_all_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_get_all_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             if (response.status == "ok") {
                 const auto* indexDefs = payload.find("indexDefs");

data/ext/couchbase/operations/search_index_get_documents_count.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_documents_count_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::uint64_t count{ 0 };
     std::string error{};
@@ -35,6 +34,7 @@ struct search_index_get_documents_count_request {
     using response_type = search_index_get_documents_count_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -52,16 +52,21 @@ struct search_index_get_documents_count_request {
 };
 
 search_index_get_documents_count_response
-make_response(std::error_code ec,
-              search_index_get_documents_count_request& request,
+make_response(error_context::http&& ctx,
+              search_index_get_documents_count_request&,
               search_index_get_documents_count_request::encoded_response_type&& encoded)
 {
-    search_index_get_documents_count_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_get_documents_count_response response{ ctx };
+    if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 200: {
-
-                auto payload = tao::json::from_string(encoded.body);
+                tao::json::value payload{};
+                try {
+                    payload = tao::json::from_string(encoded.body);
+                } catch (tao::json::pegtl::parse_error& e) {
+                    response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                    return response;
+                }
                 response.status = payload.at("status").get_string();
                 if (response.status == "ok") {
                     response.count = payload.at("count").get_unsigned();
@@ -70,19 +75,25 @@ make_response(std::error_code ec,
             } break;
             case 400:
             case 500: {
-                auto payload = tao::json::from_string(encoded.body);
+                tao::json::value payload{};
+                try {
+                    payload = tao::json::from_string(encoded.body);
+                } catch (tao::json::pegtl::parse_error& e) {
+                    response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                    return response;
+                }
                 response.status = payload.at("status").get_string();
                 response.error = payload.at("error").get_string();
                 if (response.error.find("index not found") != std::string::npos) {
-                    response.ec = std::make_error_code(error::common_errc::index_not_found);
+                    response.ctx.ec = std::make_error_code(error::common_errc::index_not_found);
                     return response;
                 } else if (response.error.find("no planPIndexes for indexName") != std::string::npos) {
-                    response.ec = std::make_error_code(error::search_errc::index_not_ready);
+                    response.ctx.ec = std::make_error_code(error::search_errc::index_not_ready);
                     return response;
                 }
             } break;
         }
-        response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+        response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
     }
     return response;
 }

data/ext/couchbase/operations/search_index_get_stats.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_stats_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::string error{};
     std::string stats{};
@@ -35,6 +34,7 @@ struct search_index_get_stats_request {
     using response_type = search_index_get_stats_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -52,29 +52,35 @@ struct search_index_get_stats_request {
 };
 
 search_index_get_stats_response
-make_response(std::error_code ec, search_index_get_stats_request& request, search_index_get_stats_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, search_index_get_stats_request&, search_index_get_stats_request::encoded_response_type&& encoded)
 {
-    search_index_get_stats_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_get_stats_response response{ ctx };
+    if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 200:
                 response.stats = encoded.body;
                 return response;
             case 400:
             case 500: {
-                auto payload = tao::json::from_string(encoded.body);
+                tao::json::value payload{};
+                try {
+                    payload = tao::json::from_string(encoded.body);
+                } catch (tao::json::pegtl::parse_error& e) {
+                    response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                    return response;
+                }
                 response.status = payload.at("status").get_string();
                 response.error = payload.at("error").get_string();
                 if (response.error.find("index not found") != std::string::npos) {
-                    response.ec = std::make_error_code(error::common_errc::index_not_found);
+                    response.ctx.ec = std::make_error_code(error::common_errc::index_not_found);
                     return response;
                 } else if (response.error.find("no planPIndexes for indexName") != std::string::npos) {
-                    response.ec = std::make_error_code(error::search_errc::index_not_ready);
+                    response.ctx.ec = std::make_error_code(error::search_errc::index_not_ready);
                     return response;
                 }
             } break;
         }
-        response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+        response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
     }
     return response;
 }

data/ext/couchbase/operations/search_index_upsert.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *     Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_upsert_response {
-    std::string client_context_id;
-    std::error_code ec;
+    error_context::http ctx;
     std::string status{};
     std::string error{};
 };
@@ -34,6 +33,7 @@ struct search_index_upsert_request {
     using response_type = search_index_upsert_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
+    using error_context_type = error_context::http;
 
     static const inline service_type type = service_type::search;
 
@@ -77,29 +77,41 @@ struct search_index_upsert_request {
 };
 
 search_index_upsert_response
-make_response(std::error_code ec, search_index_upsert_request& request, search_index_upsert_request::encoded_response_type&& encoded)
+make_response(error_context::http&& ctx, search_index_upsert_request&, search_index_upsert_request::encoded_response_type&& encoded)
 {
-    search_index_upsert_response response{ request.client_context_id, ec };
-    if (!ec) {
+    search_index_upsert_response response{ ctx };
+    if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             if (response.status == "ok") {
                 return response;
             }
         } else if (encoded.status_code == 400) {
-            auto payload = tao::json::from_string(encoded.body);
+            tao::json::value payload{};
+            try {
+                payload = tao::json::from_string(encoded.body);
+            } catch (tao::json::pegtl::parse_error& e) {
+                response.ctx.ec = std::make_error_code(error::common_errc::parsing_failure);
+                return response;
+            }
             response.status = payload.at("status").get_string();
             response.error = payload.at("error").get_string();
             if (response.error.find("index not found") != std::string::npos) {
-                response.ec = std::make_error_code(error::common_errc::index_not_found);
+                response.ctx.ec = std::make_error_code(error::common_errc::index_not_found);
                 return response;
             } else if (response.error.find("index with the same name already exists") != std::string::npos) {
-                response.ec = std::make_error_code(error::common_errc::index_exists);
+                response.ctx.ec = std::make_error_code(error::common_errc::index_exists);
                 return response;
             }
         }
-        response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+        response.ctx.ec = std::make_error_code(error::common_errc::internal_server_failure);
     }
     return response;
 }