couchbase 3.2.2 → 3.2.5

package/deps/lcb/packaging/deb/control

@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.couchbase.com/develop/c/current
 Vcs-Browser: https://github.com/couchbase/libcouchbase
-Vcs-Git: git://github.com/couchbase/libcouchbase.git
+Vcs-Git: https://github.com/couchbase/libcouchbase.git
 
 Package: libcouchbase3-libevent
 Architecture: any

package/deps/lcb/src/analytics/analytics_handle.cc

@@ -225,7 +225,7 @@ lcb_ANALYTICS_HANDLE_::lcb_ANALYTICS_HANDLE_(lcb_INSTANCE *obj, void *user_cooki
     query_params_ = Json::FastWriter().write(cmd->root());
 
     if (instance_->settings->tracer) {
-        span_ = cmd->parent_span();
+        parent_span_ = cmd->parent_span();
     }
 
     if (ingest_options().method != LCB_INGEST_METHOD_NONE) {
@@ -284,8 +284,7 @@ lcb_STATUS lcb_ANALYTICS_HANDLE_::issue_htreq(const std::string &body)
         htcmd->set_header("cb-on-behalf-of", impostor_);
     }
 
-    LCBTRACE_HTTP_START(instance_->settings, client_context_id_.c_str(), span_, LCBTRACE_TAG_SERVICE_ANALYTICS,
-                        LCBTRACE_THRESHOLD_ANALYTICS, span_);
+    span_ = lcb::trace::start_http_span_with_statement(instance_->settings, this, statement_);
     lcb_cmdhttp_parent_span(htcmd, span_);
 
     lcb_STATUS rc = lcb_http(instance_, this, htcmd);
@@ -394,7 +393,7 @@ void lcb_ANALYTICS_HANDLE_::invoke_row(lcb_RESPANALYTICS *resp, bool is_last)
             resp->rflags |= LCB_RESP_F_EXTDATA;
         }
         Json::Value meta;
-        if (Json::Reader().parse(resp->row, resp->row + resp->nrow, meta)) {
+        if (Json::Reader(Json::Features::strictMode()).parse(resp->row, resp->row + resp->nrow, meta)) {
             const Json::Value &errors = meta["errors"];
             if (errors.isArray() && !errors.empty()) {
                 const Json::Value &err = errors[0];
@@ -456,7 +455,10 @@ void lcb_ANALYTICS_HANDLE_::invoke_row(lcb_RESPANALYTICS *resp, bool is_last)
             }
         }
 
-        LCBTRACE_HTTP_FINISH(span_);
+        if (span_ != nullptr) {
+            lcb::trace::finish_http_span(span_, this);
+            span_ = nullptr;
+        }
         if (http_request_ != nullptr) {
             http_request_->span = nullptr;
         }

package/deps/lcb/src/analytics/analytics_handle.hh

@@ -208,6 +208,32 @@ struct lcb_ANALYTICS_HANDLE_ : lcb::jsparse::Parser::Actions {
         return last_error_;
     }
 
+    static lcbtrace_THRESHOLDOPTS service()
+    {
+        return LCBTRACE_THRESHOLD_ANALYTICS;
+    }
+
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_ANALYTICS;
+        return name;
+    }
+
+    lcbtrace_SPAN *parent_span() const
+    {
+        return parent_span_;
+    }
+
+    const std::string &client_context_id() const
+    {
+        return client_context_id_;
+    }
+
+    int retries() const
+    {
+        return retries_;
+    }
+
   private:
     const lcb_RESPHTTP *http_response_{nullptr};
     lcb_HTTP_HANDLE *http_request_{nullptr};
@@ -219,6 +245,7 @@ struct lcb_ANALYTICS_HANDLE_ : lcb::jsparse::Parser::Actions {
     lcb_U32 timeout_{0};
     // How many rows were received. Used to avoid parsing the meta
     size_t rows_number_{0};
+    int retries_{0};
 
     /** Request body as received from the application */
     Json::Value json{};
@@ -240,6 +267,7 @@ struct lcb_ANALYTICS_HANDLE_ : lcb::jsparse::Parser::Actions {
     lcb::docreq::Queue *document_queue_{nullptr};
     unsigned refcount{1};
 
+    lcbtrace_SPAN *parent_span_{nullptr};
     lcbtrace_SPAN *span_{nullptr};
     std::string impostor_{};
 };

package/deps/lcb/src/capi/cmd_counter.hh

@@ -30,6 +30,12 @@
  */
 struct lcb_CMDCOUNTER_ {
   public:
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_COUNTER;
+        return name;
+    }
+
     lcb_STATUS expiry(std::uint32_t expiry)
     {
         if (!initialize_if_does_not_exist_) {
@@ -181,6 +187,17 @@ struct lcb_CMDCOUNTER_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -204,6 +221,7 @@ struct lcb_CMDCOUNTER_ {
     bool initialize_if_does_not_exist_{false};
     lcb_DURABILITY_LEVEL durability_level_{LCB_DURABILITYLEVEL_NONE};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_exists.hh

@@ -28,6 +28,12 @@
  * @private
  */
 struct lcb_CMDEXISTS_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_EXISTS;
+        return name;
+    }
+
     lcb_STATUS key(std::string key)
     {
         key_ = std::move(key);
@@ -121,6 +127,17 @@ struct lcb_CMDEXISTS_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -139,6 +156,7 @@ struct lcb_CMDEXISTS_ {
     void *cookie_{nullptr};
     std::string key_{};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_get.hh

@@ -34,6 +34,11 @@ enum class get_mode {
  * @private
  */
 struct lcb_CMDGET_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_GET;
+        return name;
+    }
 
     lcb_STATUS with_touch(std::uint32_t expiry)
     {
@@ -181,6 +186,17 @@ struct lcb_CMDGET_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -203,6 +219,7 @@ struct lcb_CMDGET_ {
     get_mode mode_{get_mode::normal};
     bool cookie_is_callback_{false};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /** @private */

package/deps/lcb/src/capi/cmd_get_replica.hh

@@ -36,6 +36,12 @@ enum class get_replica_mode {
  * @private
  */
 struct lcb_CMDGETREPLICA_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_GET_FROM_REPLICA;
+        return name;
+    }
+
     lcb_STATUS mode(get_replica_mode mode)
     {
         mode_ = mode;
@@ -54,7 +60,8 @@ struct lcb_CMDGETREPLICA_ {
         return LCB_SUCCESS;
     }
 
-    int selected_replica_index() const {
+    int selected_replica_index() const
+    {
         return select_index_;
     }
 
@@ -156,6 +163,17 @@ struct lcb_CMDGETREPLICA_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -176,6 +194,7 @@ struct lcb_CMDGETREPLICA_ {
     get_replica_mode mode_{get_replica_mode::any};
     int select_index_{0};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 struct lcb_RESPGETREPLICA_ {

package/deps/lcb/src/capi/cmd_query.cc

@@ -268,6 +268,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdquery_on_behalf_of(lcb_CMDQUERY *cmd, const c
     return cmd->on_behalf_of(std::string(data, data_len));
 }
 
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdquery_preserve_expiry(lcb_CMDQUERY *cmd, int preserve_expiry)
+{
+    return cmd->preserve_expiry(preserve_expiry);
+}
+
 LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_rc(const lcb_QUERY_ERROR_CONTEXT *ctx)
 {
     return ctx->rc;
@@ -287,6 +292,14 @@ LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_first_error_message(const lcb_QUERY
     return LCB_SUCCESS;
 }
 
+LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_error_response_body(const lcb_QUERY_ERROR_CONTEXT *ctx, const char **body,
+                                                                 size_t *body_len)
+{
+    *body = ctx->error_response_body;
+    *body_len = ctx->error_response_body_len;
+    return LCB_SUCCESS;
+}
+
 LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_statement(const lcb_QUERY_ERROR_CONTEXT *ctx, const char **statement,
                                                        size_t *statement_len)
 {

package/deps/lcb/src/capi/cmd_query.hh

@@ -30,20 +30,22 @@
  */
 struct lcb_QUERY_ERROR_CONTEXT_ {
     lcb_STATUS rc;
-    uint32_t first_error_code;
-    const char *first_error_message;
-    size_t first_error_message_len;
-    const char *statement;
-    size_t statement_len;
-    const char *client_context_id;
-    size_t client_context_id_len;
-    const char *query_params;
-    size_t query_params_len;
-    uint32_t http_response_code;
-    const char *http_response_message;
-    size_t http_response_message_len;
-    const char *endpoint;
-    size_t endpoint_len;
+    uint32_t first_error_code{};
+    const char *first_error_message{};
+    size_t first_error_message_len{};
+    const char *error_response_body{};
+    size_t error_response_body_len{};
+    const char *statement{};
+    size_t statement_len{};
+    const char *client_context_id{};
+    size_t client_context_id_len{};
+    const char *query_params{};
+    size_t query_params_len{};
+    uint32_t http_response_code{};
+    const char *http_response_message{};
+    size_t http_response_message_len{};
+    const char *endpoint{};
+    size_t endpoint_len{};
 };
 
 /**
@@ -203,6 +205,12 @@ struct lcb_CMDQUERY_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS preserve_expiry(bool preserve_expiry)
+    {
+        root_["preserve_expiry"] = preserve_expiry;
+        return LCB_SUCCESS;
+    }
+
     lcb_STATUS callback(lcb_QUERY_CALLBACK row_callback)
     {
         callback_ = row_callback;

package/deps/lcb/src/capi/cmd_remove.hh

@@ -28,6 +28,12 @@
  * @private
  */
 struct lcb_CMDREMOVE_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_REMOVE;
+        return name;
+    }
+
     lcb_STATUS cas(std::uint64_t cas)
     {
         cas_ = cas;
@@ -148,6 +154,17 @@ struct lcb_CMDREMOVE_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -168,6 +185,7 @@ struct lcb_CMDREMOVE_ {
     std::uint64_t cas_{0};
     lcb_DURABILITY_LEVEL durability_level_{LCB_DURABILITYLEVEL_NONE};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_search.hh

@@ -70,6 +70,12 @@ struct lcb_RESPSEARCH_ {
  * @private
  */
 struct lcb_CMDSEARCH_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_SEARCH;
+        return name;
+    }
+
     bool has_callback() const
     {
         return callback_ != nullptr;

package/deps/lcb/src/capi/cmd_store.hh

@@ -35,6 +35,16 @@ enum class durability_mode {
  * @private
  */
 struct lcb_CMDSTORE_ {
+    const std::string &operation_name() const
+    {
+        static std::map<int, std::string> names{
+            {LCB_STORE_UPSERT, LCBTRACE_OP_UPSERT}, {LCB_STORE_REPLACE, LCBTRACE_OP_REPLACE},
+            {LCB_STORE_APPEND, LCBTRACE_OP_APPEND}, {LCB_STORE_PREPEND, LCBTRACE_OP_PREPEND},
+            {LCB_STORE_INSERT, LCBTRACE_OP_INSERT},
+        };
+        return names[operation_];
+    }
+
     lcb_STATUS operation(lcb_STORE_OPERATION operation)
     {
         operation_ = operation;
@@ -123,24 +133,6 @@ struct lcb_CMDSTORE_ {
         return false;
     }
 
-    const char *operation_name() const
-    {
-        switch (operation_) {
-            case LCB_STORE_UPSERT:
-                return LCBTRACE_OP_UPSERT;
-            case LCB_STORE_REPLACE:
-                return LCBTRACE_OP_REPLACE;
-            case LCB_STORE_APPEND:
-                return LCBTRACE_OP_APPEND;
-            case LCB_STORE_PREPEND:
-                return LCBTRACE_OP_PREPEND;
-            case LCB_STORE_INSERT:
-                return LCBTRACE_OP_INSERT;
-        }
-        lcb_assert(false && "unknown operation name");
-        return "unknown";
-    }
-
     lcb_STATUS flags(std::uint32_t flags)
     {
         if (operation_ == LCB_STORE_APPEND || operation_ == LCB_STORE_PREPEND) {
@@ -245,13 +237,16 @@ struct lcb_CMDSTORE_ {
 
     lcb_STATUS value(const lcb_IOV *iov, std::size_t iov_len)
     {
-        std::stringstream ss;
+        std::size_t total_size = 0;
+        for (std::size_t i = 0; i < iov_len; ++i) {
+            total_size += iov[i].iov_len;
+        }
+        value_.reserve(total_size);
         for (std::size_t i = 0; i < iov_len; ++i) {
             if (iov[i].iov_len > 0 && iov[i].iov_base != nullptr) {
-                ss << std::string(static_cast<const char *>(iov[i].iov_base), iov[i].iov_len);
+                value_.append(static_cast<const char *>(iov[i].iov_base), iov[i].iov_len);
             }
         }
-        value_ = ss.str();
         return LCB_SUCCESS;
     }
 
@@ -376,6 +371,17 @@ struct lcb_CMDSTORE_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -407,6 +413,7 @@ struct lcb_CMDSTORE_ {
     bool cookie_is_callback_{false};
     bool preserve_expiry_{false};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_subdoc.hh

@@ -114,6 +114,12 @@ struct subdoc_spec_options {
  * This structure is provided in an array to the lcb_CMDSUBDOC::specs field.
  */
 struct subdoc_spec {
+    bool is_lookup() const
+    {
+        return opcode_ == subdoc_opcode::get || opcode_ == subdoc_opcode::get_count ||
+               opcode_ == subdoc_opcode::get_fulldoc || opcode_ == subdoc_opcode::exist;
+    }
+
     subdoc_opcode opcode() const
     {
         return opcode_;
@@ -216,11 +222,23 @@ struct lcb_SUBDOCSPECS_ {
         return specs_;
     }
 
+    bool is_lookup() const
+    {
+        return specs_.empty() || specs_[0].is_lookup();
+    }
+
   private:
     std::vector<subdoc_spec> specs_{};
 };
 
 struct lcb_CMDSUBDOC_ {
+    const std::string &operation_name() const
+    {
+        static std::string lookup_in_name = LCBTRACE_OP_LOOKUPIN;
+        static std::string mutate_in_name = LCBTRACE_OP_MUTATEIN;
+        return specs_.is_lookup() ? lookup_in_name : mutate_in_name;
+    }
+
     const subdoc_options &options() const
     {
         return options_;
@@ -427,6 +445,17 @@ struct lcb_CMDSUBDOC_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -451,6 +480,7 @@ struct lcb_CMDSUBDOC_ {
     lcb_SUBDOCSPECS_ specs_{};
     bool preserve_expiry_{false};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_touch.hh

@@ -28,6 +28,12 @@
  * @private
  */
 struct lcb_CMDTOUCH_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_TOUCH;
+        return name;
+    }
+
     lcb_STATUS expiry(std::uint32_t expiry)
     {
         expiry_ = expiry;
@@ -132,6 +138,17 @@ struct lcb_CMDTOUCH_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -151,6 +168,7 @@ struct lcb_CMDTOUCH_ {
     void *cookie_{nullptr};
     std::string key_{};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_unlock.hh

@@ -28,6 +28,12 @@
  * @private
  */
 struct lcb_CMDUNLOCK_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_UNLOCK;
+        return name;
+    }
+
     lcb_STATUS cas(std::uint64_t cas)
     {
         if (cas == 0) {
@@ -135,6 +141,17 @@ struct lcb_CMDUNLOCK_ {
         return LCB_SUCCESS;
     }
 
+    lcb_STATUS on_behalf_of_add_extra_privilege(std::string privilege)
+    {
+        extra_privileges_.emplace_back(std::move(privilege));
+        return LCB_SUCCESS;
+    }
+
+    const std::vector<std::string> &extra_privileges() const
+    {
+        return extra_privileges_;
+    }
+
     bool want_impersonation() const
     {
         return !impostor_.empty();
@@ -154,6 +171,7 @@ struct lcb_CMDUNLOCK_ {
     std::string key_{};
     std::uint64_t cas_{};
     std::string impostor_{};
+    std::vector<std::string> extra_privileges_{};
 };
 
 /**

package/deps/lcb/src/capi/cmd_view.hh

@@ -47,6 +47,12 @@ struct lcb_VIEW_ERROR_CONTEXT_ {
 
 /** @private */
 struct lcb_CMDVIEW_ {
+    static const std::string &operation_name()
+    {
+        static std::string name = LCBTRACE_OP_VIEW;
+        return name;
+    }
+
     bool view_or_design_document_empty() const
     {
         return view_name_.empty() || design_document_name_.empty();

package/deps/lcb/src/capi/collection_qualifier.hh

@@ -21,7 +21,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <string>
-#include <sstream>
 #include <stdexcept>
 
 namespace lcb
@@ -48,11 +47,10 @@ struct collection_qualifier {
         if (collection_name != nullptr && collection_name_len > 0) {
             collection_.assign(collection_name, collection_name_len);
         }
-        std::stringstream ss;
-        ss << (scope_.empty() ? "_default" : scope_);
-        ss << '.';
-        ss << (collection_.empty() ? "_default" : collection_);
-        spec_ = ss.str();
+
+        spec_ = (scope_.empty() ? "_default" : scope_) +
+                '.' +
+                (collection_.empty() ? "_default" : collection_);
     }
 
     const std::string &scope() const
@@ -135,8 +133,8 @@ struct collection_qualifier {
         return true;
     }
 
-    std::string scope_{};
-    std::string collection_{};
+    std::string scope_{"_default"};
+    std::string collection_{"_default"};
     std::string spec_{};
     std::uint32_t resolved_collection_id_{0};
     bool resolved_{false};