CXX-3238 propagate the entire mongoc reply document to v_noabi::operation_exception (#1545)

Author: eramongodb

src/mongocxx/lib/mongocxx/v1/exception.cpp

@@ -19,6 +19,7 @@
 #include <bsoncxx/v1/array/value.hpp>
 #include <bsoncxx/v1/document/value.hpp>
 #include <bsoncxx/v1/document/view.hpp>
+#include <bsoncxx/v1/stdx/optional.hpp>
 #include <bsoncxx/v1/stdx/string_view.hpp>
 #include <bsoncxx/v1/types/id.hpp>
 #include <bsoncxx/v1/types/view.hpp>
@@ -185,9 +186,9 @@ std::error_category const& type_error_category() {
 class exception::impl {
    public:
     bsoncxx::v1::array::value _error_labels;
-    bsoncxx::v1::array::value _write_concern_errors;
-    bsoncxx::v1::array::value _write_errors;
-    bsoncxx::v1::array::value _error_replies;
+
+    // For backward compatibility with v_noabi::operation_exception.
+    bsoncxx::v1::stdx::optional<bsoncxx::v1::document::value> _reply;
 };
 
 bool exception::has_error_label(bsoncxx::v1::stdx::string_view label) const {
@@ -332,32 +333,16 @@ void exception::internal::set_error_labels(exception& self, bsoncxx::v1::documen
     set_array_field("errorLabels", self._impl->_error_labels, v);
 }
 
-void exception::internal::set_write_concern_errors(exception& self, bsoncxx::v1::document::view v) {
-    set_array_field("writeConcernErrors", self._impl->_write_concern_errors, v);
-}
-
-void exception::internal::set_write_errors(exception& self, bsoncxx::v1::document::view v) {
-    set_array_field("writeErrors", self._impl->_write_errors, v);
-}
-
-void exception::internal::set_error_replies(exception& self, bsoncxx::v1::document::view v) {
-    set_array_field("errorReplies", self._impl->_error_replies, v);
+void exception::internal::set_reply(exception& self, bsoncxx::v1::document::value v) {
+    self._impl->_reply = std::move(v);
 }
 
 bsoncxx::v1::array::view exception::internal::get_error_labels(exception const& self) {
     return self._impl->_error_labels;
 }
 
-bsoncxx::v1::array::view exception::internal::get_write_concern_errors(exception const& self) {
-    return self._impl->_write_concern_errors;
-}
-
-bsoncxx::v1::array::view exception::internal::get_write_errors(exception const& self) {
-    return self._impl->_write_errors;
-}
-
-bsoncxx::v1::array::view exception::internal::get_error_replies(exception const& self) {
-    return self._impl->_error_replies;
+bsoncxx::v1::stdx::optional<bsoncxx::v1::document::value> const& exception::internal::get_reply(exception const& self) {
+    return self._impl->_reply;
 }
 
 void throw_exception(bson_error_t const& error) {
@@ -377,9 +362,7 @@ void throw_exception(bson_error_t const& error, bsoncxx::v1::document::value doc
     auto ex = make_exception(error);
 
     exception::internal::set_error_labels(ex, doc);
-    exception::internal::set_write_concern_errors(ex, doc);
-    exception::internal::set_write_errors(ex, doc);
-    exception::internal::set_error_replies(ex, doc);
+    exception::internal::set_reply(ex, std::move(doc));
 
     throw std::move(ex);
 }

src/mongocxx/lib/mongocxx/v1/exception.hh

@@ -21,6 +21,7 @@
 #include <bsoncxx/v1/detail/type_traits.hpp>
 #include <bsoncxx/v1/document/value.hpp>
 #include <bsoncxx/v1/document/view.hpp>
+#include <bsoncxx/v1/stdx/optional.hpp>
 
 #include <system_error>
 #include <utility>
@@ -57,14 +58,10 @@ class exception::internal {
     }
 
     static MONGOCXX_ABI_EXPORT_CDECL_TESTING(void) set_error_labels(exception& self, bsoncxx::v1::document::view v);
-    static void set_write_concern_errors(exception& self, bsoncxx::v1::document::view v);
-    static void set_write_errors(exception& self, bsoncxx::v1::document::view v);
-    static void set_error_replies(exception& self, bsoncxx::v1::document::view v);
+    static void set_reply(exception& self, bsoncxx::v1::document::value v);
 
     static bsoncxx::v1::array::view get_error_labels(exception const& self);
-    static bsoncxx::v1::array::view get_write_concern_errors(exception const& self);
-    static bsoncxx::v1::array::view get_write_errors(exception const& self);
-    static bsoncxx::v1::array::view get_error_replies(exception const& self);
+    static bsoncxx::v1::stdx::optional<bsoncxx::v1::document::value> const& get_reply(exception const& self);
 };
 
 [[noreturn]] MONGOCXX_ABI_EXPORT_CDECL_TESTING(void) throw_exception(bson_error_t const& error);

src/mongocxx/lib/mongocxx/v1/server_error.cpp

@@ -97,9 +97,6 @@ bsoncxx::v1::document::view server_error::raw() const {
 server_error::server_error(int code, char const* message, std::unique_ptr<impl> impl)
     : v1::exception{v1::exception::internal::make(code, server_error_category(), message)}, _impl{std::move(impl)} {
     v1::exception::internal::set_error_labels(*this, _impl->_raw);
-    v1::exception::internal::set_write_concern_errors(*this, _impl->_raw);
-    v1::exception::internal::set_write_errors(*this, _impl->_raw);
-    v1::exception::internal::set_error_replies(*this, _impl->_raw);
 }
 
 server_error server_error::internal::make(int code, char const* message, bsoncxx::v1::document::value raw) {

src/mongocxx/lib/mongocxx/v_noabi/mongocxx/mongoc_error.hh

@@ -14,7 +14,6 @@
 
 #pragma once
 
-#include <bsoncxx/v1/array/view.hpp>
 #include <bsoncxx/v1/detail/type_traits.hpp>
 #include <bsoncxx/v1/stdx/string_view.hpp>
 
@@ -36,8 +35,6 @@
 
 #include <bsoncxx/private/bson.hh>
 
-#include <mongocxx/private/scoped_bson.hh>
-
 namespace mongocxx {
 namespace v_noabi {
 
@@ -118,24 +115,9 @@ template <
             strip_ec_msg(ptr->what(), ptr->code()).c_str()};
     }
 
-    // Array fields must be represented as "raw server error" document fields.
-    {
-        scoped_bson doc;
-
-        auto const append_array_field = [&](char const* name, bsoncxx::v1::array::view field) {
-            if (!field.empty()) {
-                doc += scoped_bson{BCON_NEW(name, BCON_ARRAY(scoped_bson_view{field}.bson()))};
-            }
-        };
-
-        append_array_field("errorLabels", v1::exception::internal::get_error_labels(ex));
-        append_array_field("writeConcernErrors", v1::exception::internal::get_write_concern_errors(ex));
-        append_array_field("writeErrors", v1::exception::internal::get_write_errors(ex));
-        append_array_field("errorReplies", v1::exception::internal::get_error_replies(ex));
-
-        if (!doc.view().empty()) {
-            throw exception_type{code, from_v1(std::move(doc).value()), strip_ec_msg(ex.what(), ex.code()).c_str()};
-        }
+    // Propagate the original mongoc reply document as the "raw server error" document.
+    if (auto const& reply = v1::exception::internal::get_reply(ex)) {
+        throw exception_type{code, from_v1(*reply), strip_ec_msg(ex.what(), ex.code()).c_str()};
     }
 
     // No "raw server error" document is required.