couchbase 3.2.4 → 3.2.5

package/binding.gyp

@@ -67,6 +67,11 @@
                     '-pedantic',
                     '-std=gnu99',
                 ]
+            }],
+            ['OS=="linux"', {
+                "libraries": [
+                    '-static-libgcc -static-libstdc++',
+                ]
             }]
         ],
         'sources': [

package/deps/lcb/CMakeLists.txt

@@ -30,7 +30,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
 # Couchbase mock path to download
 SET(COUCHBASE_MOCK_VERSION 1.5.25)
 SET(COUCHBASE_MOCK_URL "https://github.com/couchbase/CouchbaseMock/releases/download/${COUCHBASE_MOCK_VERSION}/CouchbaseMock-${COUCHBASE_MOCK_VERSION}.jar")
-project(libcouchbase VERSION 3.2.4 LANGUAGES C CXX)
+project(libcouchbase VERSION 3.2.5 LANGUAGES C CXX)
 
 if (NOT CMAKE_VERSION VERSION_LESS "3.13")
     # CMP0077: option() honors normal variables

package/deps/lcb/RELEASE_NOTES.markdown

@@ -1,5 +1,17 @@
 # Release Notes
 
+## 3.2.5 (2022-02-08)
+
+CCBC-1486: Add support for preserve expiry to query options
+CCBC-1534, CCBC-1411: improve query error handling
+CCBC-1519: pass extra privilege with KV "on-behalf-of".
+CCBC-1521: fix bootstrap process when client cert is used and error map is supported. If client cert auth is used, once
+the error map response has been received, the negotiation is complete.
+CCBC-1529: load authentication certificate as chain file.
+CCBC-1525: remove stringstream in `collection_qualifier`. Constructing a stringstream object every time
+`collection_qualifier` is constructed is very expensive.
+CCBC-1528: update parsing of "quota limit" error for FTS
+
 ## 3.2.4 (2021-11-23)
 
 CCBC-1522: Filter `DnsQuery` results on Windows by type: only use records with `DNS_TYPE_SRV` type.

package/deps/lcb/cmake/Modules/GetVersionInfo.cmake

@@ -65,7 +65,7 @@ IF(APPLE)
 ELSE()
     SET(LCB_SONAME_MAJOR "8")
 ENDIF()
-SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.5")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.6")
 
 MESSAGE(STATUS "libcouchbase ${LCB_VERSION_MAJOR},${LCB_VERSION_MINOR},${LCB_VERSION_PATCH}")
 MESSAGE(STATUS "Building libcouchbase ${LCB_VERSION}/${LCB_VERSION_CHANGESET}")

package/deps/lcb/doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Couchbase C Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.2.4
+PROJECT_NUMBER         = 3.2.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

package/deps/lcb/gyp_config/common/libcouchbase/configuration.h

@@ -33,7 +33,7 @@
  */
 
 /** @brief libcouchbase version string */
-#define LCB_VERSION_STRING "3.2.4-njs"
+#define LCB_VERSION_STRING "3.2.5-njs"
 
 /**@brief libcouchbase hex version
  *
@@ -50,12 +50,12 @@
  * 2.1.3	| 0x020103
  * 3.0.15	| 0x030015
  */
-#define LCB_VERSION 0x030204
+#define LCB_VERSION 0x030205
 
 /**@brief The SCM revision ID
  * @see LCB_CNTL_CHANGESET
  */
-#define LCB_VERSION_CHANGESET "38cc0708dfcc5a706c6b21dc80bcd84f05890225"
+#define LCB_VERSION_CHANGESET "e4de408c96550b48745b3a142d9827c898d4e96f"
 
 /**@brief The client ID
  */

package/deps/lcb/include/libcouchbase/couchbase.h

@@ -710,6 +710,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdget_timeout(lcb_CMDGET *cmd, uint32_t timeout
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdget_on_behalf_of(lcb_CMDGET *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdget_on_behalf_of_extra_privilege(lcb_CMDGET *cmd, const char *privilege,
+                                                                    size_t privilege_len);
 
 LIBCOUCHBASE_API lcb_STATUS lcb_get(lcb_INSTANCE *instance, void *cookie, const lcb_CMDGET *cmd);
 /**@}*/
@@ -816,6 +821,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdgetreplica_timeout(lcb_CMDGETREPLICA *cmd, ui
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdgetreplica_on_behalf_of(lcb_CMDGETREPLICA *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdgetreplica_on_behalf_of_extra_privilege(lcb_CMDGETREPLICA *cmd,
+                                                                           const char *privilege, size_t privilege_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_getreplica(lcb_INSTANCE *instance, void *cookie, const lcb_CMDGETREPLICA *cmd);
 
 /**@}*/
@@ -843,6 +853,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdexists_timeout(lcb_CMDEXISTS *cmd, uint32_t t
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdexists_on_behalf_of(lcb_CMDEXISTS *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdexists_on_behalf_of_extra_privilege(lcb_CMDEXISTS *cmd, const char *privilege,
+                                                                       size_t privilege_len);
 
 LIBCOUCHBASE_API lcb_STATUS lcb_exists(lcb_INSTANCE *instance, void *cookie, const lcb_CMDEXISTS *cmd);
 
@@ -994,6 +1009,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdstore_timeout(lcb_CMDSTORE *cmd, uint32_t tim
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdstore_on_behalf_of(lcb_CMDSTORE *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdstore_on_behalf_of_extra_privilege(lcb_CMDSTORE *cmd, const char *privilege,
+                                                                      size_t privilege_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_store(lcb_INSTANCE *instance, void *cookie, const lcb_CMDSTORE *cmd);
 /**@}*/
 
@@ -1103,6 +1123,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdremove_timeout(lcb_CMDREMOVE *cmd, uint32_t t
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdremove_on_behalf_of(lcb_CMDREMOVE *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdremove_on_behalf_of_extra_privilege(lcb_CMDREMOVE *cmd, const char *privilege,
+                                                                       size_t privilege_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_remove(lcb_INSTANCE *instance, void *cookie, const lcb_CMDREMOVE *cmd);
 
 /**@}*/
@@ -1196,6 +1221,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdcounter_timeout(lcb_CMDCOUNTER *cmd, uint32_t
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdcounter_on_behalf_of(lcb_CMDCOUNTER *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdcounter_on_behalf_of_extra_privilege(lcb_CMDCOUNTER *cmd, const char *privilege,
+                                                                        size_t privilege_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_counter(lcb_INSTANCE *instance, void *cookie, const lcb_CMDCOUNTER *cmd);
 
 /**@} (Group: Counter) */
@@ -1277,6 +1307,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdunlock_timeout(lcb_CMDUNLOCK *cmd, uint32_t t
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdunlock_on_behalf_of(lcb_CMDUNLOCK *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdunlock_on_behalf_of_extra_privilege(lcb_CMDUNLOCK *cmd, const char *privilege,
+                                                                       size_t privilege_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_unlock(lcb_INSTANCE *instance, void *cookie, const lcb_CMDUNLOCK *cmd);
 
 /**@} (Group: Unlock) */
@@ -1348,6 +1383,11 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdtouch_timeout(lcb_CMDTOUCH *cmd, uint32_t tim
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdtouch_on_behalf_of(lcb_CMDTOUCH *cmd, const char *data, size_t data_len);
+/**
+ * @internal Internal: This should never be used and is not supported.
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdtouch_on_behalf_of_extra_privilege(lcb_CMDTOUCH *cmd, const char *privilege,
+                                                                      size_t privilege_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_touch(lcb_INSTANCE *instance, void *cookie, const lcb_CMDTOUCH *cmd);
 
 /**@} (Group: Touch) */
@@ -3070,6 +3110,16 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdquery_option(lcb_CMDQUERY *cmd, const char *n
                                                 size_t value_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdquery_handle(lcb_CMDQUERY *cmd, lcb_QUERY_HANDLE **handle);
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdquery_timeout(lcb_CMDQUERY *cmd, uint32_t timeout);
+ /**
+ * @uncommitted
+ * Indicates that the query engine to preserve expiration values set on any
+ * documents modified by this query.
+ *
+ *
+ * @param cmd the command
+ * @param preserve_expiry if non-zero, the query will preserve expiration values
+ */
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdquery_preserve_expiry(lcb_CMDQUERY *cmd, int preserve_expiry);
 
 /**
  * @internal Internal: This should never be used and is not supported.
@@ -3290,6 +3340,8 @@ LIBCOUCHBASE_API lcb_STATUS lcb_cmdsubdoc_timeout(lcb_CMDSUBDOC *cmd, uint32_t t
  * @internal Internal: This should never be used and is not supported.
  */
 LIBCOUCHBASE_API lcb_STATUS lcb_cmdsubdoc_on_behalf_of(lcb_CMDSUBDOC *cmd, const char *data, size_t data_len);
+LIBCOUCHBASE_API lcb_STATUS lcb_cmdsubdoc_on_behalf_of_extra_privilege(lcb_CMDSUBDOC *cmd, const char *privilege,
+                                                                       size_t privilege_len);
 
 LIBCOUCHBASE_API lcb_STATUS lcb_subdoc(lcb_INSTANCE *instance, void *cookie, const lcb_CMDSUBDOC *cmd);
 /** @} */

package/deps/lcb/include/libcouchbase/error.h

@@ -250,6 +250,8 @@ LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_rc(const lcb_QUERY_ERROR_CONTEXT *c
 LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_first_error_code(const lcb_QUERY_ERROR_CONTEXT *ctx, uint32_t *code);
 LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_first_error_message(const lcb_QUERY_ERROR_CONTEXT *ctx,
                                                                  const char **message, size_t *message_len);
+LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_error_response_body(const lcb_QUERY_ERROR_CONTEXT *ctx, const char **body,
+                                                                 size_t *body_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_statement(const lcb_QUERY_ERROR_CONTEXT *ctx, const char **statement,
                                                        size_t *statement_len);
 LIBCOUCHBASE_API lcb_STATUS lcb_errctx_query_client_context_id(const lcb_QUERY_ERROR_CONTEXT *ctx, const char **id,
@@ -388,7 +390,8 @@ lcb_errmap_callback lcb_set_errmap_callback(lcb_INSTANCE *instance, lcb_errmap_c
     X(LCB_RETRY_REASON_CIRCUIT_BREAKER_OPEN,                 13,     1,                      0)              \
     X(LCB_RETRY_REASON_QUERY_PREPARED_STATEMENT_FAILURE,     14,     1,                      0)              \
     X(LCB_RETRY_REASON_ANALYTICS_TEMPORARY_FAILURE,          15,     1,                      0)              \
-    X(LCB_RETRY_REASON_SEARCH_TOO_MANY_REQUESTS,             16,     1,                      0)
+    X(LCB_RETRY_REASON_SEARCH_TOO_MANY_REQUESTS,             16,     1,                      0)              \
+    X(LCB_RETRY_REASON_QUERY_ERROR_RETRYABLE,                17,     1,                      0)
 /* clang-format on */
 
 typedef enum {

package/deps/lcb/libcouchbase.gyp

@@ -12,6 +12,7 @@
                 'msvs_settings': {
                     'VCCLCompilerTool': {
                         'RuntimeLibrary': 1,  # static debug
+                        'ExceptionHandling': 2
                     },
                 },
             },
@@ -20,6 +21,7 @@
                 'msvs_settings': {
                     'VCCLCompilerTool': {
                         'RuntimeLibrary': 0,  # static release
+                        'ExceptionHandling': 2
                     },
                 },
             }
@@ -64,6 +66,11 @@
                     ]
                 }
             }],
+            ['OS=="linux"', {
+                "libraries": [
+                    '-static-libgcc -static-libstdc++',
+                ]
+            }],
         ]
     },
 
@@ -155,7 +162,6 @@
             'type': 'static_library',
             'sources': [
                 'contrib/HdrHistogram_c/src/hdr_encoding.c',
-                'contrib/HdrHistogram_c/src/hdr_histogram_log_no_op.c',
                 'contrib/HdrHistogram_c/src/hdr_histogram_log.c',
                 'contrib/HdrHistogram_c/src/hdr_histogram.c',
                 'contrib/HdrHistogram_c/src/hdr_interval_recorder.c',

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

@@ -187,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();
@@ -210,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

@@ -127,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();
@@ -145,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

@@ -186,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();
@@ -208,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

@@ -60,7 +60,8 @@ struct lcb_CMDGETREPLICA_ {
         return LCB_SUCCESS;
     }
 
-    int selected_replica_index() const {
+    int selected_replica_index() const
+    {
         return select_index_;
     }
 
@@ -162,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();
@@ -182,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

@@ -154,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();
@@ -174,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_store.hh

@@ -371,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();
@@ -402,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

@@ -445,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();
@@ -469,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

@@ -138,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();
@@ -157,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

@@ -141,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();
@@ -160,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/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

package/deps/lcb/src/internal.h

@@ -259,7 +259,8 @@ lcb_STATUS lcb_initialize_socket_subsystem(void);
 lcb_STATUS lcb_reinit(lcb_INSTANCE *obj, const char *connstr);
 
 lcb_RETRY_ACTION lcb_kv_should_retry(const lcb_settings *settings, const mc_PACKET *pkt, lcb_STATUS err);
-lcb_RETRY_ACTION lcb_query_should_retry(const lcb_settings *settings, lcb_QUERY_HANDLE *query, lcb_STATUS err);
+lcb_RETRY_ACTION lcb_query_should_retry(const lcb_settings *settings, lcb_QUERY_HANDLE *query, lcb_STATUS err,
+                                        int retry_attribute);
 
 lcb_RESPCALLBACK lcb_find_callback(lcb_INSTANCE *instance, lcb_CALLBACK_TYPE cbtype);
 

package/deps/lcb/src/mcserver/negotiate.cc

@@ -660,6 +660,9 @@ GT_NEXT_PACKET:
                         status);
                 set_error(LCB_ERR_PROTOCOL_ERROR, "GET_ERRMAP response unexpected", &resp);
             }
+            if (settings->keypath) {
+                completed = !maybe_select_bucket();
+            }
             // Note, there is no explicit state transition here. LIST_MECHS is
             // pipelined after this request.
             break;

package/deps/lcb/src/n1ql/n1ql.cc

@@ -52,10 +52,14 @@ static lcb_RETRY_REASON query_code_to_reason(lcb_STATUS err)
     }
 }
 
-lcb_RETRY_ACTION lcb_query_should_retry(const lcb_settings *settings, lcb_QUERY_HANDLE *query, lcb_STATUS err)
+lcb_RETRY_ACTION lcb_query_should_retry(const lcb_settings *settings, lcb_QUERY_HANDLE *query, lcb_STATUS err,
+                                        int retry_attribute)
 {
     lcb_RETRY_ACTION retry_action{};
     lcb_RETRY_REASON retry_reason = query_code_to_reason(err);
+    if (retry_attribute) {
+        retry_reason = LCB_RETRY_REASON_QUERY_ERROR_RETRYABLE;
+    }
     if (err == LCB_ERR_TIMEOUT) {
         /* We can't exceed a timeout for ETIMEDOUT */
         retry_action.should_retry = 0;