couchbase 4.4.1-dev.1 → 4.4.1

package/deps/couchbase-cxx-client/core/utils/json_streaming_lexer.cxx

@@ -27,19 +27,27 @@ namespace couchbase::core::utils::json
 namespace detail
 {
 
-static void
+namespace
+{
+void
 noop_on_complete(std::error_code /* ec */,
                  std::size_t /* number_of_rows */,
                  std::string&& /* meta */)
 { /* do nothing */
 }
 
-static auto
+auto
 noop_on_row(std::string&& /* row */) -> stream_control
 {
   return stream_control::next_row;
 }
 
+void
+noop_on_meta_header_complete(std::error_code /* ec */, std::string&& /* meta_header */)
+{ /* do nothing */
+}
+} // namespace
+
 #define STATE_MARKER_ROOT (reinterpret_cast<void*>(1))
 #define STATE_MARKER_ROWSET (reinterpret_cast<void*>(2))
 
@@ -135,13 +143,18 @@ struct streaming_lexer_impl {
   std::string buffer_{};
   std::string last_key_{};
   std::error_code error_{};
+  utils::movable_function<void(std::error_code, std::string&&)> on_meta_header_complete_{
+    noop_on_meta_header_complete
+  };
   std::function<void(std::error_code, std::size_t, std::string&&)> on_complete_{ noop_on_complete };
   std::function<stream_control(std::string&&)> on_row_{ noop_on_row };
   bool root_has_been_validated_{ false };
 };
 } // namespace detail
 
-static auto
+namespace
+{
+auto
 convert_status(jsonsl_error_t error) -> std::error_code
 {
   switch (error) {
@@ -232,7 +245,7 @@ convert_status(jsonsl_error_t error) -> std::error_code
   return errc::streaming_json_lexer::generic;
 }
 
-static auto
+auto
 error_callback(jsonsl_t lexer,
                jsonsl_error_t error,
                struct jsonsl_state_st* /* state */,
@@ -241,13 +254,17 @@ error_callback(jsonsl_t lexer,
   auto* impl = static_cast<detail::streaming_lexer_impl*>(lexer->data);
 
   impl->error_ = convert_status(error);
+
+  impl->on_meta_header_complete_(impl->error_, {});
+  impl->on_meta_header_complete_ = detail::noop_on_meta_header_complete;
+
   impl->on_complete_(impl->error_, impl->number_of_rows_, {});
   impl->on_complete_ = detail::noop_on_complete;
 
   return 0;
 }
 
-static void
+void
 meta_header_complete_callback(jsonsl_t lexer,
                               jsonsl_action_t /* action */,
                               struct jsonsl_state_st* state,
@@ -258,9 +275,13 @@ meta_header_complete_callback(jsonsl_t lexer,
   impl->meta_buffer_.append(impl->buffer_.c_str(), state->pos_begin);
   impl->meta_header_length_ = state->pos_begin;
   lexer->action_callback_PUSH = nullptr;
+
+  auto meta_header = impl->meta_buffer_;
+  impl->on_meta_header_complete_({}, std::move(meta_header));
+  impl->on_meta_header_complete_ = detail::noop_on_meta_header_complete;
 }
 
-static void
+void
 trailer_pop_callback(jsonsl_t lexer,
                      jsonsl_action_t /* action */,
                      struct jsonsl_state_st* state,
@@ -279,10 +300,16 @@ trailer_pop_callback(jsonsl_t lexer,
   impl->meta_buffer_.resize(impl->meta_header_length_);
   impl->meta_buffer_.append(impl->get_buffer_region(impl->last_row_end_position_));
   impl->meta_complete_ = true;
+
+  // This will have no effect if on_meta_header_complete has already been called.
+  auto meta_header = impl->meta_buffer_;
+  impl->on_meta_header_complete_({}, std::move(meta_header));
+  impl->on_meta_header_complete_ = detail::noop_on_meta_header_complete;
+
   impl->on_complete_({}, impl->number_of_rows_, std::move(impl->meta_buffer_));
 }
 
-static void
+void
 row_pop_callback(jsonsl_t lexer,
                  jsonsl_action_t /* action */,
                  struct jsonsl_state_st* state,
@@ -325,7 +352,7 @@ row_pop_callback(jsonsl_t lexer,
   }
 }
 
-static void
+void
 initial_action_pop_callback(jsonsl_t lexer,
                             jsonsl_action_t action,
                             struct jsonsl_state_st* state,
@@ -347,7 +374,7 @@ initial_action_pop_callback(jsonsl_t lexer,
   }
 }
 
-static void
+void
 initial_action_push_callback(jsonsl_t lexer,
                              jsonsl_action_t /* action */,
                              struct jsonsl_state_st* state,
@@ -372,6 +399,7 @@ initial_action_push_callback(jsonsl_t lexer,
     state->data = STATE_MARKER_ROWSET;
   }
 }
+} // namespace
 
 json::streaming_lexer::streaming_lexer(const std::string& pointer_expression, std::uint32_t depth)
 {
@@ -408,6 +436,13 @@ streaming_lexer::feed(std::string_view data)
   impl_->min_pos_ = impl_->keep_position_;
 }
 
+void
+streaming_lexer::on_metadata_header_complete(
+  utils::movable_function<void(std::error_code, std::string&&)> handler)
+{
+  impl_->on_meta_header_complete_ = std::move(handler);
+}
+
 void
 streaming_lexer::on_complete(
   std::function<void(std::error_code, std::size_t, std::string&&)> handler)

package/deps/couchbase-cxx-client/core/utils/json_streaming_lexer.hxx

@@ -21,6 +21,8 @@
 
 #include <couchbase/error_codes.hxx>
 
+#include "movable_function.hxx"
+
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -52,6 +54,8 @@ public:
 
   void feed(std::string_view data);
 
+  void on_metadata_header_complete(
+    utils::movable_function<void(std::error_code ec, std::string&& meta_header)> handler);
   void on_complete(
     std::function<void(std::error_code ec, std::size_t number_of_rows, std::string&& meta)>
       handler);

package/deps/couchbase-cxx-client/core/utils/url_codec.cxx

@@ -103,7 +103,7 @@ url_encode(Ti first, Ti last, To& o, bool check_encoded = true) -> bool
 
       o.insert(o.end(), first, first + 1);
     } else {
-      unsigned int c = static_cast<unsigned char>(*first);
+      const unsigned int c = static_cast<unsigned char>(*first);
       std::size_t numbytes = 0;
 
       if ((c & 0x80) == 0) { /* ASCII character */
@@ -147,12 +147,15 @@ url_decode(Ti first, Ti last, To out, std::size_t& nout) -> bool
 {
   for (; first != last && *first != '\0'; ++first) {
     if (*first == '%') {
+      // TODO(CXXCBC-549)
+      // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
       char nextbuf[3] = { 0 };
       std::size_t jj = 0;
       ++first;
       nextbuf[0] = *first;
       for (; first != last && jj < 2; ++jj) {
-        nextbuf[jj] = *first;
+        // TODO(CXXCBC-549)
+        nextbuf[jj] = *first; // NOLINT(cppcoreguidelines-pro-bounds-constant-array-index)
         if (jj != 1) {
           ++first;
         }
@@ -162,7 +165,7 @@ url_decode(Ti first, Ti last, To out, std::size_t& nout) -> bool
       }
 
       char* end = nullptr;
-      unsigned long octet = std::strtoul(nextbuf, &end, 16);
+      const unsigned long octet = std::strtoul(nextbuf, &end, 16);
       if (octet == ULONG_MAX || (octet == 0 && end == nextbuf)) {
         return false;
       }
@@ -374,7 +377,7 @@ escape(const std::string& s, encoding mode) -> std::string
     return s;
   }
 
-  std::size_t required = s.size() + 2 * hex_count;
+  const std::size_t required = s.size() + (2 * hex_count);
   std::string t;
   t.resize(required);
 

package/deps/couchbase-cxx-client/couchbase/analytics_index_manager.hxx

@@ -63,7 +63,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void create_dataverse(std::string dataverse_name,
+  void create_dataverse(const std::string& dataverse_name,
                         const create_dataverse_analytics_options& options,
                         create_dataverse_analytics_handler&& handler) const;
 
@@ -77,7 +77,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto create_dataverse(std::string dataverse_name,
+  [[nodiscard]] auto create_dataverse(const std::string& dataverse_name,
                                       const create_dataverse_analytics_options& options) const
     -> std::future<error>;
 
@@ -91,7 +91,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void drop_dataverse(std::string dataverse_name,
+  void drop_dataverse(const std::string& dataverse_name,
                       const drop_dataverse_analytics_options& options,
                       drop_dataverse_analytics_handler&& handler) const;
 
@@ -105,7 +105,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto drop_dataverse(std::string dataverse_name,
+  [[nodiscard]] auto drop_dataverse(const std::string& dataverse_name,
                                     const drop_dataverse_analytics_options& options) const
     -> std::future<error>;
 
@@ -120,8 +120,8 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void create_dataset(std::string dataset_name,
-                      std::string bucket_name,
+  void create_dataset(const std::string& dataset_name,
+                      const std::string& bucket_name,
                       const create_dataset_analytics_options& options,
                       create_dataset_analytics_handler&& handler) const;
 
@@ -136,8 +136,8 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto create_dataset(std::string dataset_name,
-                                    std::string bucket_name,
+  [[nodiscard]] auto create_dataset(const std::string& dataset_name,
+                                    const std::string& bucket_name,
                                     const create_dataset_analytics_options& options) const
     -> std::future<error>;
 
@@ -151,7 +151,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void drop_dataset(std::string dataset_name,
+  void drop_dataset(const std::string& dataset_name,
                     const drop_dataset_analytics_options& options,
                     drop_dataset_analytics_handler&& handler) const;
 
@@ -165,7 +165,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto drop_dataset(std::string dataset_name,
+  [[nodiscard]] auto drop_dataset(const std::string& dataset_name,
                                   const drop_dataset_analytics_options& options) const
     -> std::future<error>;
 
@@ -205,9 +205,9 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void create_index(std::string index_name,
-                    std::string dataset_name,
-                    std::map<std::string, std::string> fields,
+  void create_index(const std::string& index_name,
+                    const std::string& dataset_name,
+                    const std::map<std::string, std::string>& fields,
                     const create_index_analytics_options& options,
                     create_index_analytics_handler&& handler) const;
 
@@ -223,9 +223,9 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto create_index(std::string index_name,
-                                  std::string dataset_name,
-                                  std::map<std::string, std::string> fields,
+  [[nodiscard]] auto create_index(const std::string& index_name,
+                                  const std::string& dataset_name,
+                                  const std::map<std::string, std::string>& fields,
                                   const create_index_analytics_options& options) const
     -> std::future<error>;
 
@@ -240,8 +240,8 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void drop_index(std::string index_name,
-                  std::string dataset_name,
+  void drop_index(const std::string& index_name,
+                  const std::string& dataset_name,
                   const drop_index_analytics_options& options,
                   drop_index_analytics_handler&& handler) const;
 
@@ -256,8 +256,8 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto drop_index(std::string index_name,
-                                std::string dataset_name,
+  [[nodiscard]] auto drop_index(const std::string& index_name,
+                                const std::string& dataset_name,
                                 const drop_index_analytics_options& options) const
     -> std::future<error>;
 
@@ -425,8 +425,8 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void drop_link(std::string link_name,
-                 std::string dataverse_name,
+  void drop_link(const std::string& link_name,
+                 const std::string& dataverse_name,
                  const drop_link_analytics_options& options,
                  drop_link_analytics_handler&& handler) const;
 
@@ -441,8 +441,8 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto drop_link(std::string link_name,
-                               std::string dataverse_name,
+  [[nodiscard]] auto drop_link(const std::string& link_name,
+                               const std::string& dataverse_name,
                                const drop_link_analytics_options& options) const
     -> std::future<error>;
 

package/deps/couchbase-cxx-client/couchbase/bucket_manager.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/create_bucket_options.hxx>
 #include <couchbase/drop_bucket_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/flush_bucket_options.hxx>
 #include <couchbase/get_all_buckets_options.hxx>
 #include <couchbase/get_bucket_options.hxx>

package/deps/couchbase-cxx-client/couchbase/create_bucket_options.hxx

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 
 #include <functional>
 

package/deps/couchbase-cxx-client/couchbase/date_range_facet_result.hxx

@@ -20,6 +20,7 @@
 #include <couchbase/search_date_range.hxx>
 #include <couchbase/search_facet_result.hxx>
 
+#include <memory>
 #include <string>
 #include <vector>
 

package/deps/couchbase-cxx-client/couchbase/drop_bucket_options.hxx

@@ -17,10 +17,10 @@
 
 #pragma once
 
+#include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
+
 #include <functional>
-#include <memory>
-#include <optional>
-#include <string>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/couchbase/expiry.hxx

@@ -43,13 +43,13 @@ std::uint32_t
 expiry_relative(std::chrono::seconds expiry);
 
 /**
- * @param time_point
+ * @param expiry point in time
  * @return value encoding absolute time for KV protocol
  *
  * @since 1.0.0
  * @internal
  */
 std::uint32_t
-expiry_absolute(std::chrono::system_clock::time_point time_point);
+expiry_absolute(std::chrono::system_clock::time_point expiry);
 #endif
 } // namespace couchbase::core::impl

package/deps/couchbase-cxx-client/couchbase/flush_bucket_options.hxx

@@ -17,10 +17,8 @@
 
 #pragma once
 
-#include <functional>
-#include <memory>
-#include <optional>
-#include <string>
+#include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/couchbase/get_all_buckets_options.hxx

@@ -17,12 +17,11 @@
 
 #pragma once
 
+#include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/management/bucket_settings.hxx>
 
 #include <functional>
-#include <memory>
-#include <optional>
-#include <string>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/couchbase/get_bucket_options.hxx

@@ -17,12 +17,11 @@
 
 #pragma once
 
+#include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/management/bucket_settings.hxx>
 
 #include <functional>
-#include <memory>
-#include <optional>
-#include <string>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/couchbase/match_query.hxx

@@ -69,7 +69,7 @@ public:
    */
   auto prefix_length(std::uint32_t length) -> match_query&
   {
-    if (length <= 0) {
+    if (length == 0) {
       throw std::invalid_argument("prefix_length must be positive");
     }
 

package/deps/couchbase-cxx-client/couchbase/query_index_manager.hxx

@@ -58,7 +58,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void get_all_indexes(std::string bucket_name,
+  void get_all_indexes(const std::string& bucket_name,
                        const get_all_query_indexes_options& options,
                        get_all_query_indexes_handler&& handler) const;
 
@@ -72,7 +72,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto get_all_indexes(std::string bucket_name,
+  [[nodiscard]] auto get_all_indexes(const std::string& bucket_name,
                                      const get_all_query_indexes_options& options) const
     -> std::future<std::pair<error, std::vector<management::query_index>>>;
 
@@ -88,7 +88,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void create_index(std::string bucket_name,
+  void create_index(const std::string& bucket_name,
                     std::string index_name,
                     std::vector<std::string> keys,
                     const create_query_index_options& options,
@@ -106,7 +106,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto create_index(std::string bucket_name,
+  [[nodiscard]] auto create_index(const std::string& bucket_name,
                                   std::string index_name,
                                   std::vector<std::string> keys,
                                   const create_query_index_options& options) const
@@ -122,7 +122,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void create_primary_index(std::string bucket_name,
+  void create_primary_index(const std::string& bucket_name,
                             const create_primary_query_index_options& options,
                             create_primary_query_index_handler&& handler) const;
 
@@ -136,7 +136,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto create_primary_index(std::string bucket_name,
+  [[nodiscard]] auto create_primary_index(const std::string& bucket_name,
                                           const create_primary_query_index_options& options) const
     -> std::future<error>;
 
@@ -150,7 +150,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void drop_primary_index(std::string bucket_name,
+  void drop_primary_index(const std::string& bucket_name,
                           const drop_primary_query_index_options& options,
                           drop_primary_query_index_handler&& handler) const;
 
@@ -164,7 +164,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto drop_primary_index(std::string bucket_name,
+  [[nodiscard]] auto drop_primary_index(const std::string& bucket_name,
                                         const drop_primary_query_index_options& options) const
     -> std::future<error>;
 
@@ -179,7 +179,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void drop_index(std::string bucket_name,
+  void drop_index(const std::string& bucket_name,
                   std::string index_name,
                   const drop_query_index_options& options,
                   drop_query_index_handler&& handler) const;
@@ -195,7 +195,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto drop_index(std::string bucket_name,
+  [[nodiscard]] auto drop_index(const std::string& bucket_name,
                                 std::string index_name,
                                 const drop_query_index_options& options) const
     -> std::future<error>;
@@ -212,7 +212,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void build_deferred_indexes(std::string bucket_name,
+  void build_deferred_indexes(const std::string& bucket_name,
                               const build_query_index_options& options,
                               build_deferred_query_indexes_handler&& handler) const;
 
@@ -228,7 +228,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto build_deferred_indexes(std::string bucket_name,
+  [[nodiscard]] auto build_deferred_indexes(const std::string& bucket_name,
                                             const build_query_index_options& options) const
     -> std::future<error>;
 
@@ -243,7 +243,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  void watch_indexes(std::string bucket_name,
+  void watch_indexes(const std::string& bucket_name,
                      std::vector<std::string> index_names,
                      const watch_query_indexes_options& options,
                      watch_query_indexes_handler&& handler) const;
@@ -259,7 +259,7 @@ public:
    * @since 1.0.0
    * @committed
    */
-  [[nodiscard]] auto watch_indexes(std::string bucket_name,
+  [[nodiscard]] auto watch_indexes(const std::string& bucket_name,
                                    std::vector<std::string> index_names,
                                    const watch_query_indexes_options& options) const
     -> std::future<error>;

package/deps/couchbase-cxx-client/couchbase/query_result.hxx

@@ -20,9 +20,6 @@
 #include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/query_meta_data.hxx>
 
-#include <chrono>
-#include <cinttypes>
-#include <optional>
 #include <vector>
 
 namespace couchbase

package/deps/couchbase-cxx-client/couchbase/search_meta_data.hxx

@@ -46,6 +46,9 @@ public:
    * @volatile
    */
   explicit search_meta_data(internal_search_meta_data internal);
+  search_meta_data(search_meta_data&& other) noexcept;
+  ~search_meta_data();
+  auto operator=(search_meta_data&& other) noexcept -> search_meta_data&;
 
   /**
    * Returns the client context identifier string set on the search request.

package/deps/couchbase-cxx-client/couchbase/search_row.hxx

@@ -43,6 +43,9 @@ public:
    * @volatile
    */
   explicit search_row(internal_search_row internal);
+  search_row(search_row&& other) noexcept;
+  ~search_row();
+  auto operator=(search_row&& other) noexcept -> search_row&;
 
   /**
    * @since 1.0.0

package/deps/couchbase-cxx-client/couchbase/search_row_location.hxx

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <cinttypes>
+#include <memory>
 #include <optional>
 #include <string>
 #include <vector>
@@ -39,7 +40,7 @@ public:
    * @since 1.0.0
    * @internal
    */
-  explicit search_row_location(internal_search_row_location location);
+  explicit search_row_location(internal_search_row_location internal);
 
   search_row_location();
 

package/deps/couchbase-cxx-client/couchbase/search_row_locations.hxx

@@ -20,6 +20,7 @@
 #include <couchbase/search_row_location.hxx>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -42,6 +43,9 @@ public:
    * @internal
    */
   explicit search_row_locations(internal_search_row_locations internal);
+  ~search_row_locations();
+  search_row_locations(search_row_locations&& other) noexcept;
+  auto operator=(search_row_locations&& other) noexcept -> search_row_locations&;
 
   /**
    * @since 1.0.0

package/deps/couchbase-cxx-client/couchbase/search_sort_field.hxx

@@ -65,13 +65,13 @@ public:
    * search_sort_field_type::date for DateTime fields, or @ref search_sort_field_type::number for
    * numeric/geo fields.
    *
-   * @param desc field type
+   * @param value field type
    * @return pointer to this
    *
    * @since 1.0.0
    * @committed
    */
-  auto type(search_sort_field_type desc) -> search_sort_field&;
+  auto type(search_sort_field_type value) -> search_sort_field&;
 
   /**
    * Specifies the search-order for index-fields that contain multiple values (in consequence of