couchbase 3.2.4 → 3.2.6

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.3.3 LANGUAGES C CXX)
 
 if (NOT CMAKE_VERSION VERSION_LESS "3.13")
     # CMP0077: option() honors normal variables
@@ -278,20 +278,30 @@ ELSE()
         # and set the appropriate OpenSSL variables
         IF(APPLE)
             IF(NOT OpenSSL_DIR)
-                EXECUTE_PROCESS(COMMAND brew --prefix openssl
+                EXECUTE_PROCESS(COMMAND brew --prefix openssl@1.1
                     OUTPUT_VARIABLE OPENSSL_ROOT_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
                 MESSAGE(STATUS "Found OpenSSL Prefix: ${OPENSSL_ROOT_DIR}")
             ENDIF()
         ENDIF()
         FIND_PACKAGE(OpenSSL)
+        # If it still not found, try to locate it using pkg-config
+        IF(NOT OPENSSL_FOUND AND UNIX)
+            find_package(PkgConfig)
+            IF(PkgConfig_FOUND)
+                pkg_check_modules(OPENSSL openssl11)
+                IF(OPENSSL_FOUND)
+                    SET(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIRS})
+                    SET(OPENSSL_LIBRARIES ${OPENSSL_LINK_LIBRARIES})
+                ENDIF()
+            ENDIF()
+        ENDIF()
     ENDIF(NOT OPENSSL_FOUND)
 
     IF(OPENSSL_FOUND)
         MESSAGE(STATUS "SSL Found: ${OPENSSL_VERSION} (${OPENSSL_LIBRARIES})")
     ELSE()
-        MESSAGE(STATUS "SSL Not Found. SSL support will be disabled")
-        ADD_DEFINITIONS(-DLCB_NO_SSL=1)
+        MESSAGE(FATAL_ERROR "SSL Not Found. Use LCB_NO_SSL to produce build without OpenSSL")
     ENDIF()
 ENDIF()
 
@@ -299,7 +309,14 @@ ADD_SUBDIRECTORY(src/vbucket)
 ADD_SUBDIRECTORY(contrib/cbsasl)
 ADD_SUBDIRECTORY(contrib/cliopts)
 ADD_SUBDIRECTORY(src/ssl)
-ADD_SUBDIRECTORY(contrib/lcb-jsoncpp)
+IF(NOT LCB_JSONCPP_LIB)
+    ADD_SUBDIRECTORY(contrib/lcb-jsoncpp)
+ENDIF()
+IF(NOT LCB_JSONCPP_INCLUDE_DIR)
+    INCLUDE_DIRECTORIES(contrib/lcb-jsoncpp)
+ELSE()
+    INCLUDE_DIRECTORIES(${LCB_JSONCPP_INCLUDE_DIR})
+ENDIF()
 IF(NOT LCB_SNAPPY_LIB)
     ADD_SUBDIRECTORY(contrib/snappy)
 ENDIF()
@@ -344,11 +361,13 @@ SET(LCB_CORE_OBJS
     $<TARGET_OBJECTS:lcbcore>
     $<TARGET_OBJECTS:lcbcore-cxx>
     $<TARGET_OBJECTS:lcb_jsparse>
-    $<TARGET_OBJECTS:lcb_jsoncpp>
     ${LCB_DTRACE_OBJECT}
     ${lcb_plat_objs}
     ${lcb_ssl_objs})
 
+IF(NOT LCB_JSONCPP_LIB)
+    LIST (APPEND LCB_CORE_OBJS $<TARGET_OBJECTS:lcb_jsoncpp>)
+ENDIF()
 IF(NOT LCB_SNAPPY_LIB)
     LIST (APPEND LCB_CORE_OBJS $<TARGET_OBJECTS:lcb_snappy>)
 ENDIF()
@@ -400,6 +419,9 @@ ENDIF()
 IF(LIBPROFILER)
     SET(LCB_LINK_DEPS ${LCB_LINK_DEPS} ${LIBPROFILER})
 ENDIF()
+IF(LCB_JSONCPP_LIB)
+    SET(LCB_LINK_DEPS ${LCB_LINK_DEPS} ${LCB_JSONCPP_LIB})
+ENDIF()
 IF(LCB_SNAPPY_LIB)
     SET(LCB_LINK_DEPS ${LCB_LINK_DEPS} ${LCB_SNAPPY_LIB})
 ENDIF()

package/deps/lcb/README.markdown

@@ -6,6 +6,11 @@ This is the C client library for [Couchbase](http://www.couchbase.com)
 It communicates with the cluster and speaks the relevant protocols
 necessary to connect to the cluster and execute data operations.
 
+## Support and Feedback
+
+If you find an issue, please file it in [our JIRA issue tracker](https://couchbase.com/issues/browse/CCBC). Also you are
+always welcome on [our forum](https://forums.couchbase.com/c/c-sdk) and [Discord](https://discord.com/invite/sQ5qbPZuTh).
+
 ## Features
 
 * Can function as either a synchronous or asynchronous library
@@ -110,15 +115,6 @@ servers the spec will look like `couchbase://localhost,default` or `couchbase://
 Also tests expecting `beer-sample` bucket loaded. It comes with the server. Look at "Sample buckets" section of Admin
 Console.
 
-## Bugs, Support, Issues
-You may report issues in the library in our issue tracker at
-<https://issues.couchbase.com>. Sign up for an account and file an issue
-against the _Couchbase C Client Library_ project.
-
-The developers of the library hang out in IRC on `#libcouchbase` on
-irc.freenode.net.
-
-
 ## Examples
 
 * The `examples` directory

package/deps/lcb/RELEASE_NOTES.markdown

@@ -1,19 +1,94 @@
 # Release Notes
 
+## 3.3.3 (2022-09-09)
+* CCBC-1565: load system CAs when the trust certificate is not provided
+
+  When the user has not set any root ca provider but is using TLS then we
+  should trust both the system store and the Capella root CA.
+
+* CCBC-1564: update error message for authentication failure
+
+* CCBC-1568: skip logging for closed SSL IO contexts
+
+  OpenSSL might still invoke IO callbacks after the actual context has
+  been closed. This more likely could happen with libuv-style IO.
+
+  This patch ensures that once socket context has been closed, its pointer
+  in SSL object will be erased.
+
+* Added cbc-bucket-list command to list all buckets.
+
+## 3.3.2 (2022-08-29)
+
+* CCBC-1559: cbc-n1qlback: give time to IO loop in case of failure.
+
+  In schenario where all query nodes suddenly failed over and/or removed
+  from the cluster, all requests in cbc-n1qlback will start failing.
+  Because the libcouchbase knows that the latest config does not have any
+  query nodes, it rejects all queries immediately. The single-threaded
+  nature of libcouchbase does not allow the IO loop to run in background,
+  and the code in the tool does not run `lcb_wait` in case of failure.
+
+  As a fix, we run `lcb_tick_nowait` in case of failure, which is enough
+  for libcouchbase to give IO loop a chance to check for any pending
+  events and invoke corresponding callbacks.
+
+* CCBC-1552: Allow building with external jsoncpp
+
+* CCBC-1544: update feedback links: Jira, Forums and Discord
+
+* CCBC-1556: clarify log messages related to config cache
+
+* CCBC-1557: allow caching cluster-level configurations
+    
+  The library will cache cluster-level configurations only if the
+  `config_cache= connection` string option is set to directory (ends
+  with '/' symbol), otherwise it will cache only buckets configurations
+  (note that in this case the application should use unique cache name for
+  each bucket, otherwise the library will ignore cache if the bucket name
+  will not match).
+
+## 3.3.1 (2022-05-25)
+
+* CCBC-1550: Fixed RPM packages for CentOS 7, now they will require OpenSSL 1.1 during build. Also build script will not
+automatically define `LCB_NO_SSL` option if OpenSSL is not found. For builds without TLS support, this option must be
+explicitly defined.
+
+* CCBC-1546: cbc-pillowfight: add '--rand-space-per-thread' to allow threads to work from different rand numbers.
+
+## 3.3.0 (2022-05-09)
+
+* CCBC-1538: use 64-bit integer to store time in IOCP plugin
+* CCBC-1540: bundle capella ca certificate with SDK
+* CCBC-1526: do not validate length of collection specifier. Length will be checked on the server-side. 
+* CCBC-1527: pillowfight: deallocate all memory during shutdown
+
+## 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.
+* CCBC-1522: Filter `DnsQuery` results on Windows by type: only use records with `DNS_TYPE_SRV` type.
 
-CCBC-1521: Fixed bootstrap process when client certificate is used. We always pipeline error map request with `HELLO`
+* CCBC-1521: Fixed bootstrap process when client certificate is used. We always pipeline error map request with `HELLO`
 request, and usually await for `hello`+`error_map` responses, because after that goes SASL authentication (and then
 optional selection of the bucket) which cannot be completely pipelined. But in case of client certificate, we might
 terminate bootstrap process too early if the bootstrap process does not require immediate selection of the bucket.
     
-CCBC-1432: Support for rate limiting error codes: `LCB_ERR_RATE_LIMITED` and `LCB_ERR_QUOTA_LIMITED`.
+* CCBC-1432: Support for rate limiting error codes: `LCB_ERR_RATE_LIMITED` and `LCB_ERR_QUOTA_LIMITED`.
 
-CCBC-1514: Do not translate unknown error with "item-only" attribute into `LCB_ERR_CAS_MISMATCH`.
+* CCBC-1514: Do not translate unknown error with "item-only" attribute into `LCB_ERR_CAS_MISMATCH`.
 
-CCBC-1515: Performance optimization: replace `sstream` with string `append()`. Only if list of IO vectors supplied for
+* CCBC-1515: Performance optimization: replace `sstream` with string `append()`. Only if list of IO vectors supplied for
 value in mutation operations.
 
 ## 3.2.3 (2021-10-20)

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.11")
 
 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.3.3
 
 # 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/doc/cbc.markdown

@@ -20,6 +20,7 @@
 `cbc lock` _KEY_ [_OPTIONS_]<br>
 `cbc unlock` _KEY_ _CAS_ [_OPTIONS_]<br>
 `cbc admin` _-P PASSWORD_ _RESTAPI_ [_OPTIONS_]<br>
+`cbc bucket-list` _-P PASSWORD_ [_OPTIONS_]<br>
 `cbc bucket-create` _-P PASSWORD_ _NAME_ [_OPTIONS_]<br>
 `cbc bucket-delete` _-P PASSWORD_ _NAME_ [_OPTIONS_]<br>
 `cbc bucket-flush` _NAME_ [_OPTIONS_]<br>
@@ -362,6 +363,15 @@ In addition to the [OPTIONS](#OPTIONS) specified above, the following options ar
   Specify the HTTP method to use for the specific request. The default method is
   `GET`.
 
+### bucket-list
+
+List the buckets in the cluster
+
+In addition to the [OPTIONS](#OPTIONS) specified above, the following options are recognized:
+
+* `-r`, `--raw`:
+  Print unformatted server response in JSON form.
+
 ### bucket-create
 
 Create a bucket in the cluster.

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.3.3-njs"
 
 /**@brief libcouchbase hex version
  *
@@ -50,12 +50,12 @@
  * 2.1.3	| 0x020103
  * 3.0.15	| 0x030015
  */
-#define LCB_VERSION 0x030204
+#define LCB_VERSION 0x030303
 
 /**@brief The SCM revision ID
  * @see LCB_CNTL_CHANGESET
  */
-#define LCB_VERSION_CHANGESET "38cc0708dfcc5a706c6b21dc80bcd84f05890225"
+#define LCB_VERSION_CHANGESET "66ff4fad9947e6fb60be06b3aeb57a8b77fbada2"
 
 /**@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

@@ -72,7 +72,7 @@ X(LCB_ERR_REQUEST_CANCELED,         202, LCB_ERROR_TYPE_SHARED, 0, "A request is
 X(LCB_ERR_INVALID_ARGUMENT,         203, LCB_ERROR_TYPE_SHARED, LCB_ERROR_FLAG_INPUT, "It is unambiguously determined that the error was caused because of invalid arguments from the user") \
 X(LCB_ERR_SERVICE_NOT_AVAILABLE,    204, LCB_ERROR_TYPE_SHARED, 0, "It was determined from the config unambiguously that the service is not available") \
 X(LCB_ERR_INTERNAL_SERVER_FAILURE,  205, LCB_ERROR_TYPE_SHARED, 0, "Internal server error") \
-X(LCB_ERR_AUTHENTICATION_FAILURE,   206, LCB_ERROR_TYPE_SHARED, LCB_ERROR_FLAG_INPUT, "Authentication error") \
+X(LCB_ERR_AUTHENTICATION_FAILURE,   206, LCB_ERROR_TYPE_SHARED, LCB_ERROR_FLAG_INPUT, "Authentication error. Possible reasons: incorrect authentication configuration, bucket doesn't exist or bucket may be hibernated.") \
 X(LCB_ERR_TEMPORARY_FAILURE,        207, LCB_ERROR_TYPE_SHARED, LCB_ERROR_FLAG_TRANSIENT, "Temporary failure") \
 X(LCB_ERR_PARSING_FAILURE,          208, LCB_ERROR_TYPE_SHARED, 0, "Parsing failed") \
 X(LCB_ERR_CAS_MISMATCH,             209, LCB_ERROR_TYPE_SHARED, LCB_ERROR_FLAG_INPUT, "CAS mismatch") \
@@ -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/packaging/rpm/libcouchbase.spec.in

@@ -15,7 +15,7 @@ BuildRequires: cmake >= 3.5.1
 
 BuildRequires: pkgconfig(libevent) >= 2
 BuildRequires: libev-devel >= 3
-BuildRequires: openssl-devel
+BuildRequires: openssl11-devel
 BuildRequires: systemtap-sdt-devel, systemtap-devel
 URL: https://developer.couchbase.com/server/other-products/release-notes-archives/c-sdk
 Source: https://packages.couchbase.com/clients/c/@TARREDAS@.tar.gz

package/deps/lcb/plugins/io/iocp/iocp_iops.h

@@ -155,7 +155,7 @@ int iocp_w32err_2errno(DWORD error);
 DWORD iocp_set_last_error(lcb_io_opt_t io, SOCKET sock);
 
 /** Get current timestamp in microseconds */
-lcb_U32 iocp_micros(void);
+uint64_t iocp_micros(void);
 
 /** Get current timestamp in milliseconds */
 #define iocp_millis() (iocp_micros() / 1000)

package/deps/lcb/plugins/io/iocp/iocp_loop.c

@@ -209,9 +209,9 @@ static void deque_expired_timers(iocp_t *io, lcb_U64 now)
 /** Maximum amount of time the I/O can hog the loop */
 #define IOCP_IOLOOP_MAXTIME 1000
 
-static int should_yield(lcb_U32 start)
+static int should_yield(uint64_t start)
 {
-    lcb_U32 now = iocp_micros();
+    uint64_t now = iocp_micros();
     return now - start > IOCP_IOLOOP_MAXTIME;
 }
 
@@ -238,7 +238,7 @@ static void iocp_run_loop(lcb_io_opt_t iobase, int is_tick)
 
     do {
         /** To ensure we don't starve pending timers, use an iteration */
-        lcb_U32 usStartTime;
+        uint64_t usStartTime;
 
         if (!now) {
             now = iocp_millis();

package/deps/lcb/plugins/io/iocp/iocp_util.c

@@ -44,9 +44,9 @@ DWORD iocp_set_last_error(lcb_io_opt_t io, SOCKET sock)
     return werr;
 }
 
-lcb_uint32_t iocp_micros(void)
+uint64_t iocp_micros(void)
 {
-    return (lcb_uint32_t)(gethrtime() / 1000);
+    return gethrtime() / 1000;
 }
 
 LPFN_CONNECTEX iocp_initialize_connectex(SOCKET sock)

package/deps/lcb/src/bucketconfig/bc_file.cc

@@ -45,6 +45,7 @@ struct FileProvider : Provider, Listener {
         }
     }
     void write_cache(lcbvb_CONFIG *cfg);
+    void mkcachefile(const char *name, const char *bucket);
 
     /* Overrides */
     ConfigInfo *get_cached() override;
@@ -58,6 +59,7 @@ struct FileProvider : Provider, Listener {
     int last_errno;
     bool is_readonly; /* Whether the config cache should _not_ overwrite the file */
     lcb::io::Timer<FileProvider, &FileProvider::reload_cache> timer;
+    bool do_not_cache_cluster{true};
 };
 
 FileProvider::Status FileProvider::load_cache()
@@ -70,7 +72,9 @@ FileProvider::Status FileProvider::load_cache()
 
     if (!ifs.is_open() || !ifs.good()) {
         int save_errno = last_errno = errno;
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Couldn't open for reading: %s", LOGID(this), strerror(save_errno));
+        lcb_log(LOGARGS(this, WARN),
+                LOGFMT "Couldn't open config cache for reading (%s). Proceed to next configuration provider.",
+                LOGID(this), strerror(save_errno));
         return CACHE_ERROR;
     }
 
@@ -118,17 +122,26 @@ FileProvider::Status FileProvider::load_cache()
         goto GT_DONE;
     }
 
-    if (lcbvb_get_distmode(vbc) != LCBVB_DIST_VBUCKET) {
+    if (lcbvb_get_distmode(vbc) == LCBVB_DIST_KETAMA) {
         lcb_log(LOGARGS(this, ERROR), LOGFMT "Not applying cached memcached config", LOGID(this));
         goto GT_DONE;
     }
 
-    if (settings().bucket == nullptr) {
-        lcb_log(LOGARGS(this, ERROR), LOGFMT "Bucket name is nullptr", LOGID(this));
+    if (settings().bucket == nullptr && vbc->bname != nullptr) {
+        lcb_log(
+            LOGARGS(this, DEBUG),
+            LOGFMT
+            "The cached configuration has bucket associated, but the connection does not have it. Ignore the cache.",
+            LOGID(this));
         goto GT_DONE;
-    }
-
-    if (strcmp(vbc->bname, settings().bucket) != 0) {
+    } else if (settings().bucket != nullptr && vbc->bname == nullptr) {
+        lcb_log(
+            LOGARGS(this, DEBUG),
+            LOGFMT
+            "The connection has bucket associated, but the cached configuration does not have it. Ignore the cache.",
+            LOGID(this));
+        goto GT_DONE;
+    } else if (settings().bucket != nullptr && vbc->bname != nullptr && strcmp(vbc->bname, settings().bucket) != 0) {
         lcb_log(LOGARGS(this, ERROR), LOGFMT "Bucket name in file is different from the one requested", LOGID(this));
         goto GT_DONE;
     }
@@ -152,7 +165,7 @@ GT_DONE:
 
 void FileProvider::write_cache(lcbvb_CONFIG *cfg)
 {
-    if (filename.empty() || is_readonly || cfg->bname == nullptr || cfg->bname_len == 0) {
+    if (filename.empty() || is_readonly || (do_not_cache_cluster && parent->settings->conntype == LCB_TYPE_CLUSTER)) {
         return;
     }
 
@@ -234,7 +247,7 @@ FileProvider::FileProvider(Confmon *parent_)
     parent->add_listener(this);
 }
 
-static std::string mkcachefile(const char *name, const char *bucket)
+void FileProvider::mkcachefile(const char *name, const char *bucket)
 {
     std::string buffer;
     bool is_dir = false;
@@ -252,22 +265,23 @@ static std::string mkcachefile(const char *name, const char *bucket)
         is_dir = true;
     }
     if (is_dir) {
+        // append bucket name only if we know that cachefile is directory
         if (bucket == nullptr) {
-            return "";
+            buffer += ".cluster";
+            do_not_cache_cluster = false;
+        } else {
+            buffer += bucket;
         }
-        // append bucket name only if we know that
-        // cachefile is directory
-        buffer += bucket;
     }
 
-    return buffer;
+    filename = buffer;
 }
 
 bool lcb::clconfig::file_set_filename(Provider *p, const char *f, bool ro)
 {
     auto *provider = static_cast<FileProvider *>(p);
     provider->enabled = true;
-    provider->filename = mkcachefile(f, p->parent->settings->bucket);
+    provider->mkcachefile(f, p->parent->settings->bucket);
     if (provider->filename.empty()) {
         return false;
     }

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_{};
 };
 
 /**