CXX-739 Apply string::view_or_value to index options

Author: samantharitter

src/bsoncxx/string/view_or_value.hpp

@@ -40,6 +40,11 @@ class BSONCXX_API view_or_value : public bsoncxx::view_or_value<stdx::string_vie
     ///
     using bsoncxx::view_or_value<stdx::string_view, std::string>::view_or_value;
 
+    ///
+    /// Default constructor, equivalent to using an empty string.
+    ///
+    BSONCXX_INLINE view_or_value() = default;
+
     ///
     /// Construct a string::view_or_value using a null-terminated const char *.
     /// The resulting view_or_value will keep a string_view of 'str', so it is

src/mongocxx/collection.cpp

@@ -18,6 +18,7 @@
 #include <cstdint>
 #include <limits>
 #include <tuple>
+#include <unordered_set>
 #include <utility>
 
 #include <bsoncxx/builder/stream/document.hpp>
@@ -591,6 +592,12 @@ bsoncxx::document::value collection::create_index(view_or_value keys,
     ::mongoc_index_opt_wt_t wt_opt{};
     libmongoc::index_opt_init(&opt);
 
+    // keep our safe copies alive
+    bsoncxx::string::view_or_value name_copy{};
+    bsoncxx::string::view_or_value wt_config_copy{};
+    bsoncxx::string::view_or_value default_language_copy{};
+    bsoncxx::string::view_or_value language_override_copy{};
+
     if (options.background()) {
         opt.background = *options.background();
     }
@@ -600,7 +607,8 @@ bsoncxx::document::value collection::create_index(view_or_value keys,
     }
 
     if (options.name()) {
-        opt.name = options.name()->c_str();
+        name_copy = options.name()->terminated();
+        opt.name = name_copy.data();
     }
 
     if (options.sparse()) {
@@ -617,7 +625,8 @@ bsoncxx::document::value collection::create_index(view_or_value keys,
                 options.storage_options().get());
 
             if (wt_options->config_string()) {
-                wt_opt.config_str = wt_options->config_string()->c_str();
+                wt_config_copy = wt_options->config_string()->terminated();
+                wt_opt.config_str = wt_config_copy.data();
             }
             opt.storage_options = reinterpret_cast<mongoc_index_opt_storage_t*>(&wt_opt);
         }
@@ -637,11 +646,13 @@ bsoncxx::document::value collection::create_index(view_or_value keys,
     }
 
     if (options.default_language()) {
-        opt.default_language = options.default_language()->c_str();
+        default_language_copy = options.default_language()->terminated();
+        opt.default_language = default_language_copy.data();
     }
 
     if (options.language_override()) {
-        opt.language_override = options.language_override()->c_str();
+        language_override_copy = options.language_override()->terminated();
+        opt.language_override = language_override_copy.data();
     }
 
     if (options.partial_filter_expression()) {

src/mongocxx/options/index.cpp

@@ -31,7 +31,7 @@ void index::unique(bool unique) {
     _unique = unique;
 }
 
-void index::name(std::string name) {
+void index::name(bsoncxx::string::view_or_value name) {
     _name = std::move(name);
 }
 
@@ -60,11 +60,11 @@ void index::weights(bsoncxx::document::view weights) {
     _weights = weights;
 }
 
-void index::default_language(std::string default_language) {
+void index::default_language(bsoncxx::string::view_or_value default_language) {
     _default_language = std::move(default_language);
 }
 
-void index::language_override(std::string language_override) {
+void index::language_override(bsoncxx::string::view_or_value language_override) {
     _language_override = std::move(language_override);
 }
 
@@ -100,7 +100,7 @@ const stdx::optional<bool>& index::unique() const {
     return _unique;
 }
 
-const stdx::optional<std::string>& index::name() const {
+const stdx::optional<bsoncxx::string::view_or_value>& index::name() const {
     return _name;
 }
 
@@ -124,11 +124,11 @@ const stdx::optional<bsoncxx::document::view>& index::weights() const {
     return _weights;
 }
 
-const stdx::optional<std::string>& index::default_language() const {
+const stdx::optional<bsoncxx::string::view_or_value>& index::default_language() const {
     return _default_language;
 }
 
-const stdx::optional<std::string>& index::language_override() const {
+const stdx::optional<bsoncxx::string::view_or_value>& index::language_override() const {
     return _language_override;
 }
 
@@ -160,11 +160,13 @@ index::base_storage_options::~base_storage_options() = default;
 
 index::wiredtiger_storage_options::~wiredtiger_storage_options() = default;
 
-void index::wiredtiger_storage_options::config_string(std::string config_string) {
+void index::wiredtiger_storage_options::config_string(
+    bsoncxx::string::view_or_value config_string) {
     _config_string = std::move(config_string);
 }
 
-const stdx::optional<std::string>& index::wiredtiger_storage_options::config_string() const {
+const stdx::optional<bsoncxx::string::view_or_value>&
+index::wiredtiger_storage_options::config_string() const {
     return _config_string;
 }
 

src/mongocxx/options/index.hpp

@@ -20,6 +20,7 @@
 
 #include <bsoncxx/document/view.hpp>
 #include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
 #include <mongocxx/stdx.hpp>
 
 namespace mongocxx {
@@ -61,19 +62,19 @@ class MONGOCXX_API index {
         /// @param config_string
         ///   The WiredTiger configuration string.
         ///
-        void config_string(std::string config_string);
+        void config_string(bsoncxx::string::view_or_value config_string);
 
         ///
         /// The current config_string setting.
         ///
         /// @return The current config_string.
         ///
-        const stdx::optional<std::string>& config_string() const;
+        const stdx::optional<bsoncxx::string::view_or_value>& config_string() const;
 
        private:
         friend collection;
         MONGOCXX_PRIVATE int type() const override;
-        stdx::optional<std::string> _config_string;
+        stdx::optional<bsoncxx::string::view_or_value> _config_string;
     };
 
     index();
@@ -120,14 +121,14 @@ class MONGOCXX_API index {
     /// @param name
     ///   The name of the index.
     ///
-    void name(std::string name);
+    void name(bsoncxx::string::view_or_value name);
 
     ///
     /// The current name setting.
     ///
     /// @return The current name.
     ///
-    const stdx::optional<std::string>& name() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& name() const;
 
     ///
     /// Whether or not to create a sparse index. Sparse indexes only reference documents with the
@@ -213,14 +214,14 @@ class MONGOCXX_API index {
     /// @param default_language
     ///   The default language used when creating text indexes.
     ///
-    void default_language(std::string default_language);
+    void default_language(bsoncxx::string::view_or_value default_language);
 
     ///
     /// The current default_language setting.
     ///
     /// @return The current default_language.
     ///
-    const stdx::optional<std::string>& default_language() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& default_language() const;
 
     ///
     /// For text indexes, the name of the field, in the collection’s documents, that contains the
@@ -229,14 +230,14 @@ class MONGOCXX_API index {
     /// @param language_override
     ///   The name of the field that contains the override language for text indexes.
     ///
-    void language_override(std::string language_override);
+    void language_override(bsoncxx::string::view_or_value language_override);
 
     ///
     /// The current name of the field that contains the override language for text indexes.
     ///
     /// @return The name of the field that contains the override language for text indexes.
     ///
-    const stdx::optional<std::string>& language_override() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& language_override() const;
 
     ///
     /// Sets the document for the partial filter expression for partial indexes.
@@ -337,14 +338,14 @@ class MONGOCXX_API index {
 
     stdx::optional<bool> _background;
     stdx::optional<bool> _unique;
-    stdx::optional<std::string> _name;
+    stdx::optional<bsoncxx::string::view_or_value> _name;
     stdx::optional<bool> _sparse;
     std::unique_ptr<base_storage_options> _storage_options;
     stdx::optional<std::int32_t> _expire_after_seconds;
     stdx::optional<std::int32_t> _version;
     stdx::optional<bsoncxx::document::view> _weights;
-    stdx::optional<std::string> _default_language;
-    stdx::optional<std::string> _language_override;
+    stdx::optional<bsoncxx::string::view_or_value> _default_language;
+    stdx::optional<bsoncxx::string::view_or_value> _language_override;
     stdx::optional<bsoncxx::document::view> _partial_filter_expression;
     stdx::optional<std::uint8_t> _twod_sphere_version;
     stdx::optional<std::uint8_t> _twod_bits_precision;