libcouchbase 1.2.8 → 1.3.0

data/ext/libcouchbase/include/libcouchbase/vbucket.h

@@ -342,7 +342,7 @@ int
 lcbvb_k2vb(lcbvb_CONFIG *cfg, const void *key, lcb_SIZE n);
 
 /**
- * @uncomitted
+ * @uncommitted
  * Determines if a given server index is either a master or a replica for a
  * vbucket
  * @param vbc the configuration

data/ext/libcouchbase/include/libcouchbase/views.h

@@ -295,6 +295,14 @@ LIBCOUCHBASE_API
 void
 lcb_view_cancel(lcb_t instance, lcb_VIEWHANDLE handle);
 
+#ifdef LCB_TRACING
+/**
+ * @uncommitted
+ */
+LIBCOUCHBASE_API
+void lcb_view_set_parent_span(lcb_t instance, lcb_VIEWHANDLE handle, lcbtrace_SPAN *span);
+#endif
+
 /**@}*/
 
 #ifdef __cplusplus

data/ext/libcouchbase/include/memcached/protocol_binary.h

@@ -69,8 +69,16 @@ extern "C"
      * See section 3.1 Magic byte
      */
     typedef enum {
+        /* Request packet from client to server */
         PROTOCOL_BINARY_REQ = 0x80,
-        PROTOCOL_BINARY_RES = 0x81
+        /* Response packet from server to client */
+        PROTOCOL_BINARY_RES = 0x81,
+        /* Response packet from server to client containing frame extras */
+        PROTOCOL_BINARY_ARES = 0x18,
+        /* Request packet from server to client */
+        PROTOCOL_BINARY_SREQ = 0x82,
+        /* Response packet from client to server */
+        PROTOCOL_BINARY_SRES = 0x83
     } protocol_binary_magic;
 
     /**
@@ -152,6 +160,11 @@ extern "C"
          */
         PROTOCOL_BINARY_RESPONSE_XATTR_EINVAL = 0x87,
 
+        /**
+         * Operation attempted with an unknown collection.
+         */
+        PROTOCOL_BINARY_RESPONSE_UNKNOWN_COLLECTION = 0x88,
+
         /*
          * Sub-document specific responses.
          */
@@ -706,28 +719,45 @@ extern "C"
      * Definition of hello's features.
      */
     typedef enum {
-        PROTOCOL_BINARY_FEATURE_DATATYPE = 0x01,
+        PROTOCOL_BINARY_FEATURE_INVALID = 0x01,
         PROTOCOL_BINARY_FEATURE_TLS = 0x2,
         PROTOCOL_BINARY_FEATURE_TCPNODELAY = 0x03,
         PROTOCOL_BINARY_FEATURE_MUTATION_SEQNO = 0x04,
         PROTOCOL_BINARY_FEATURE_TCPDELAY = 0x05,
         PROTOCOL_BINARY_FEATURE_XATTR = 0x06,
         PROTOCOL_BINARY_FEATURE_XERROR = 0x07,
-        PROTOCOL_BINARY_FEATURE_SELECT_BUCKET = 0x08
+        PROTOCOL_BINARY_FEATURE_SELECT_BUCKET = 0x08,
+        PROTOCOL_BINARY_FEATURE_COLLECTIONS = 0x09,
+        PROTOCOL_BINARY_FEATURE_SNAPPY = 0x0a,
+        PROTOCOL_BINARY_FEATURE_JSON = 0x0b,
+        PROTOCOL_BINARY_FEATURE_DUPLEX = 0x0c,
+        PROTOCOL_BINARY_FEATURE_CLUSTERMAP_CHANGE_NOTIFICATION = 0x0d,
+        PROTOCOL_BINARY_FEATURE_UNORDERED_EXECUTION = 0x0e,
+        PROTOCOL_BINARY_FEATURE_TRACING = 0x0f
     } protocol_binary_hello_features;
 
-    #define MEMCACHED_FIRST_HELLO_FEATURE 0x01
-    #define MEMCACHED_TOTAL_HELLO_FEATURES 10
+#define MEMCACHED_FIRST_HELLO_FEATURE 0x01
+#define MEMCACHED_TOTAL_HELLO_FEATURES 15
 
+    // clang-format off
 #define protocol_feature_2_text(a) \
-    (a == PROTOCOL_BINARY_FEATURE_DATATYPE) ? "Datatype" : \
+    (a == PROTOCOL_BINARY_FEATURE_INVALID) ? "Invalid" : \
     (a == PROTOCOL_BINARY_FEATURE_TLS) ? "TLS" : \
-    (a == PROTOCOL_BINARY_FEATURE_TCPNODELAY) ? "TCP NODELAY" : \
+    (a == PROTOCOL_BINARY_FEATURE_TCPNODELAY) ? "TCP nodelay" : \
     (a == PROTOCOL_BINARY_FEATURE_MUTATION_SEQNO) ? "Mutation seqno" : \
-    (a == PROTOCOL_BINARY_FEATURE_TCPDELAY) ? "TCP DELAY" : \
+    (a == PROTOCOL_BINARY_FEATURE_TCPDELAY) ? "TCP delay" : \
     (a == PROTOCOL_BINARY_FEATURE_XATTR) ? "XATTR" : \
-    (a == PROTOCOL_BINARY_FEATURE_XERROR) ? "Error Map": \
-    (a == PROTOCOL_BINARY_FEATURE_SELECT_BUCKET) ? "Select Bucket": "Unknown"
+    (a == PROTOCOL_BINARY_FEATURE_XERROR) ? "XERROR": \
+    (a == PROTOCOL_BINARY_FEATURE_SELECT_BUCKET) ? "Select bucket": \
+    (a == PROTOCOL_BINARY_FEATURE_COLLECTIONS) ? "Collections": \
+    (a == PROTOCOL_BINARY_FEATURE_SNAPPY) ? "Snappy": \
+    (a == PROTOCOL_BINARY_FEATURE_JSON) ? "JSON": \
+    (a == PROTOCOL_BINARY_FEATURE_DUPLEX) ? "Duplex": \
+    (a == PROTOCOL_BINARY_FEATURE_CLUSTERMAP_CHANGE_NOTIFICATION) ? "Clustermap change notification": \
+    (a == PROTOCOL_BINARY_FEATURE_UNORDERED_EXECUTION) ? "Unordered execution": \
+    (a == PROTOCOL_BINARY_FEATURE_TRACING) ? "Tracing": \
+    "Unknown"
+    // clang-format on
 
     /**
      * The HELLO command is used by the client and the server to agree

data/ext/libcouchbase/packaging/rpm/libcouchbase.spec.in

@@ -5,12 +5,12 @@ Release: @RELEASE@%{?dist}
 Vendor: Couchbase, Inc.
 Packager: Couchbase SDK Team <support@couchbase.com>
 License: ASL 2.0
-Group: System Environment/Libraries
 BuildRequires: gcc, gcc-c++
 BuildRequires: cmake >= 2.8.9
 BuildRequires: pkgconfig(libevent) >= 2
 BuildRequires: libev-devel >= 3
 BuildRequires: openssl-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
 BuildRoot: %{_topdir}/build/@TARREDAS@
@@ -24,21 +24,18 @@ Suggests: %{name}2-tools%{_isa} = %{version}-%{release}
 This is the client and protocol library for Couchbase project.
 
 %package -n %{name}2-libevent
-Group: System Environment/Libraries
 Summary: Couchbase client library - libevent IO back-end
 Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description -n %{name}2-libevent
 This package provides libevent back-end for libcouchbase
 
 %package -n %{name}2-libev
-Group: System Environment/Libraries
 Summary: Couchbase client library - libev IO back-end
 Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description -n %{name}2-libev
 This package provides libev back-end for libcouchbase
 
 %package -n %{name}2-core
-Group: System Environment/Libraries
 Summary: Couchbase client library - core
 Provides: %{name}2%{?_isa} = %{version}-%{release}
 %description -n %{name}2-core
@@ -50,21 +47,19 @@ installed back-end. It is also possible to integrate another IO back-end
 or write your own.
 
 %package -n %{name}2-bin
-Group: Development/Tools
 Summary: Couchbase Client Tools
 Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description -n %{name}2-bin
 This is the CLI tools Couchbase project.
 
 %package devel
-Group: Development/Libraries
 Summary: Couchbase Client & Protocol Library - Header files
 Requires: %{name}2-core%{?_isa} = %{version}-%{release}
 %description devel
 Development files for the Couchbase Client & Protocol Library
 
 %prep
-%setup -q -n @TARREDAS@
+%autosetup -p1 -n@TARREDAS@
 %cmake -DLCB_NO_MOCK=1 -DLCB_BUILD_LIBUV=OFF
 
 %build
@@ -74,7 +69,7 @@ Development files for the Couchbase Client & Protocol Library
 %make_install
 
 %check
-make test
+make %{_smp_mflags} alltests && make test
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -84,26 +79,23 @@ make test
 %postun -n %{name}2-core -p /sbin/ldconfig
 
 %files -n %{name}2-core
-%defattr(-, root, root)
 %{_libdir}/%{name}.so.*
-%doc README.markdown LICENSE RELEASE_NOTES.markdown
+%doc README.markdown RELEASE_NOTES.markdown
+%license LICENSE
+%{_datadir}/systemtap/tapset/libcouchbase.so*
 
 %files -n %{name}2-libevent
-%defattr(-, root, root)
 %{_libdir}/%{name}_libevent.so
 
 %files -n %{name}2-libev
-%defattr(-, root, root)
 %{_libdir}/%{name}_libev.so
 
 %files -n %{name}2-bin
-%defattr(-, root, root)
 %{_bindir}/cbc*
 %{_mandir}/man1/cbc*.1*
 %{_mandir}/man4/cbcrc*.4*
 
 %files devel
-%defattr(-, root, root)
 %{_includedir}/%{name}
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc

data/ext/libcouchbase/plugins/io/libuv/plugin-internal.h

@@ -27,6 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
 
 #include "libuv_compat.h"
 

data/ext/libcouchbase/plugins/io/libuv/plugin-libuv.c

@@ -16,6 +16,7 @@
  */
 
 #include "plugin-internal.h"
+#include <libcouchbase/plugins/io/bsdio-inl.c>
 
 static my_uvreq_t *alloc_uvreq(my_sockdata_t *sock, generic_callback_t callback);
 static void set_last_error(my_iops_t *io, int error);

data/ext/libcouchbase/plugins/io/select/plugin-select.c

@@ -342,7 +342,10 @@ sel_destroy_iops(struct lcb_io_opt_st *iops)
     sel_EVENT *ev;
     sel_TIMER *tm;
 
-    assert(io->event_loop == 0);
+    if (io->event_loop != 0) {
+        fprintf(stderr, "WARN: libcouchbase(plugin-select): the event loop might be still active, but it still try to "
+                        "free resources\n");
+    }
     LCB_LIST_SAFE_FOR(ii, nn, &io->events.list) {
         ev = LCB_LIST_ITEM(ii, sel_EVENT, list);
         sel_event_free(iops, ev);

data/ext/libcouchbase/src/auth-priv.h

@@ -1,3 +1,20 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2017-2018 Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
 #ifndef LCB_AUTH_PRIV_H
 #define LCB_AUTH_PRIV_H
 #include <libcouchbase/auth.h>
@@ -17,17 +34,22 @@ public:
     const std::string& password() const { return m_password; }
 
     // Get the username and password for a specific bucket
-    const std::string& username_for(const char *bucket) const;
-    const std::string& password_for(const char *bucket) const;
+    const std::string username_for(const char *host, const char *port, const char *bucket) const;
+    const std::string password_for(const char *host, const char *port, const char *bucket) const;
 
     const Map& buckets() const { return m_buckets; }
-    Authenticator() : m_refcount(1), m_mode(LCBAUTH_MODE_CLASSIC) {}
+    Authenticator() : m_refcount(1), m_mode(LCBAUTH_MODE_CLASSIC), m_usercb(NULL), m_passcb(NULL), m_cookie(NULL)
+    {
+    }
     Authenticator(const Authenticator&);
 
     size_t refcount() const { return m_refcount; }
     void incref() { ++m_refcount; }
     void decref() { if (!--m_refcount) { delete this; } }
     lcb_error_t set_mode(lcbauth_MODE mode_) {
+        if (mode_ == LCBAUTH_MODE_DYNAMIC && (m_usercb == NULL || m_passcb == NULL)) {
+            return LCB_EINVAL;
+        }
         if (m_buckets.size() || m_username.size() || m_password.size()) {
             return LCB_ERROR;
         } else {
@@ -40,13 +62,23 @@ public:
     lcb_error_t add(const std::string& user, const std::string& pass, int flags) {
         return add(user.c_str(), pass.c_str(), flags);
     }
+    lcb_error_t set_callbacks(void *cookie, lcb_AUTHCALLBACK usercb, lcb_AUTHCALLBACK passcb)
+    {
+        m_usercb = usercb;
+        m_passcb = passcb;
+        m_cookie = cookie;
+        return LCB_SUCCESS;
+    }
 
-private:
+  private:
     Map m_buckets;
     std::string m_username;
     std::string m_password;
     size_t m_refcount;
     lcbauth_MODE m_mode;
+    lcb_AUTHCALLBACK m_usercb;
+    lcb_AUTHCALLBACK m_passcb;
+    void *m_cookie;
 };
 }
 #endif

data/ext/libcouchbase/src/auth.cc

@@ -1,3 +1,20 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2017-2018 Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
 #include <libcouchbase/couchbase.h>
 #include "auth-priv.h"
 
@@ -18,6 +35,10 @@ lcbauth_add_pass(lcb_AUTHENTICATOR *auth, const char *u, const char *p, int flag
 lcb_error_t
 Authenticator::add(const char *u, const char *p, int flags)
 {
+    if (!u) {
+        return LCB_EINVAL;
+    }
+
     if (!(flags & (LCBAUTH_F_BUCKET|LCBAUTH_F_CLUSTER))) {
         return LCB_EINVAL;
     }
@@ -49,33 +70,45 @@ Authenticator::add(const char *u, const char *p, int flags)
 
 static const std::string EmptyString;
 
-const std::string&
-Authenticator::username_for(const char *bucket) const {
-    if (m_mode == LCBAUTH_MODE_CLASSIC) {
-        // Find bucket specific credentials:
-        const Map::const_iterator it = m_buckets.find(bucket);
-        if (it == m_buckets.end()) {
-            return EmptyString;
-        } else {
-            return it->first;
-        }
-    } else {
-        return m_username;
+const std::string Authenticator::username_for(const char *host, const char *port, const char *bucket) const
+{
+    switch (m_mode) {
+        case LCBAUTH_MODE_RBAC:
+            return m_username;
+        case LCBAUTH_MODE_DYNAMIC:
+            if (m_usercb != NULL) {
+                return m_usercb(m_cookie, host, port, bucket);
+            }
+            break;
+        case LCBAUTH_MODE_CLASSIC:
+            // Find bucket specific credentials:
+            const Map::const_iterator it = m_buckets.find(bucket);
+            if (it != m_buckets.end()) {
+                return it->first;
+            }
+            break;
     }
+    return EmptyString;
 }
 
-const std::string&
-Authenticator::password_for(const char *bucket) const {
-    if (m_mode == LCBAUTH_MODE_CLASSIC) {
-        const Map::const_iterator it = m_buckets.find(bucket);
-        if (it == m_buckets.end()) {
-            return EmptyString;
-        } else {
-            return it->second;
-        }
-    } else {
-        return m_password;
+const std::string Authenticator::password_for(const char *host, const char *port, const char *bucket) const
+{
+    switch (m_mode) {
+        case LCBAUTH_MODE_RBAC:
+            return m_password;
+        case LCBAUTH_MODE_DYNAMIC:
+            if (m_passcb != NULL) {
+                return m_passcb(m_cookie, host, port, bucket);
+            }
+            break;
+        case LCBAUTH_MODE_CLASSIC:
+            const Map::const_iterator it = m_buckets.find(bucket);
+            if (it != m_buckets.end()) {
+                return it->second;
+            }
+            break;
     }
+    return EmptyString;
 }
 
 void
@@ -90,10 +123,10 @@ lcbauth_unref(lcb_AUTHENTICATOR *auth)
     auth->decref();
 }
 
-Authenticator::Authenticator(const Authenticator& other)
-    : m_buckets(other.m_buckets), m_username(other.m_username),
-      m_password(other.m_password), m_refcount(1),
-      m_mode(other.m_mode) {
+Authenticator::Authenticator(const Authenticator &other)
+    : m_buckets(other.m_buckets), m_username(other.m_username), m_password(other.m_password), m_refcount(1),
+      m_mode(other.m_mode), m_usercb(other.m_usercb), m_passcb(other.m_passcb), m_cookie(other.m_cookie)
+{
 }
 
 lcb_AUTHENTICATOR *
@@ -105,3 +138,9 @@ lcb_error_t
 lcbauth_set_mode(lcb_AUTHENTICATOR *src, lcbauth_MODE mode) {
     return src->set_mode(mode);
 }
+
+lcb_error_t lcbauth_set_callbacks(lcb_AUTHENTICATOR *auth, void *cookie, lcb_AUTHCALLBACK usercb,
+                                  lcb_AUTHCALLBACK passcb)
+{
+    return auth->set_callbacks(cookie, usercb, passcb);
+}

data/ext/libcouchbase/src/bootstrap.cc

@@ -204,7 +204,7 @@ lcb_error_t Bootstrap::bootstrap(unsigned options) {
         next_ts += LCB_US2NS(LCBT_SETTING(parent, weird_things_delay));
         if (now < next_ts && errcounter < errthresh) {
             lcb_log(LOGARGS(parent, INFO),
-                "Not requesting a config refresh because of throttling parameters. Next refresh possible in %ums or %u errors. "
+                "Not requesting a config refresh because of throttling parameters. Next refresh possible in %" PRIu64 "ms or %u errors. "
                 "See LCB_CNTL_CONFDELAY_THRESH and LCB_CNTL_CONFERRTHRESH to modify the throttling settings",
                 LCB_NS2US(next_ts-now)/1000, (unsigned)errthresh-errcounter);
             return LCB_SUCCESS;

data/ext/libcouchbase/src/bucketconfig/bc_cccp.cc

@@ -29,9 +29,10 @@
 #include <lcbio/timer-cxx.h>
 #include <lcbio/ssl.h>
 #include "ctx-log-inl.h"
+
+#define LOGFMT CTX_LOGFMT
+#define LOGID(p) CTX_LOGID(p->ioctx)
 #define LOGARGS(cccp, lvl) cccp->parent->settings, "cccp", LCB_LOG_##lvl, __FILE__, __LINE__
-#define LOGFMT "<%s:%s> "
-#define LOGID(cccp) get_ctx_host(cccp->ioctx), get_ctx_port(cccp->ioctx)
 
 struct CccpCookie;
 
@@ -140,13 +141,15 @@ CccpProvider::schedule_next_request(lcb_error_t err, bool can_rollover)
     lcb::Server* server = instance->find_server(*next_host);
     if (server) {
         cmdcookie = new CccpCookie(this);
-        lcb_log(LOGARGS(this, DEBUG), "Re-Issuing CCCP Command on server struct %p (%s:%s)", (void*)server, next_host->host, next_host->port);
+        lcb_log(LOGARGS(this, TRACE), "Re-Issuing CCCP Command on server struct %p (" LCB_HOST_FMT ")", (void *)server,
+                LCB_HOST_ARG(this->parent->settings, next_host));
         timer.rearm(settings().config_node_timeout);
         instance->request_config(cmdcookie, server);
 
     } else {
 
-        lcb_log(LOGARGS(this, INFO), "Requesting connection to node %s:%s for CCCP configuration", next_host->host, next_host->port);
+        lcb_log(LOGARGS(this, INFO), "Requesting connection to node " LCB_HOST_FMT " for CCCP configuration",
+                LCB_HOST_ARG(this->parent->settings, next_host));
         creq = instance->memd_sockpool->get(*next_host,
             settings().config_node_timeout,
             on_connected, this);
@@ -262,6 +265,7 @@ on_connected(lcbio_SOCKET *sock, void *data, lcb_error_t err, lcbio_OSERR)
     ioprocs.cb_read = io_read_handler;
     cccp->ioctx = lcbio_ctx_new(sock, data, &ioprocs);
     cccp->ioctx->subsys = "bc_cccp";
+    sock->service = LCBIO_SERVICE_CFG;
     cccp->request_config();
 }
 
@@ -324,7 +328,7 @@ CccpProvider::config_updated(lcbvb_CONFIG *vbc)
         const char *mcaddr = lcbvb_get_hostport(vbc,
             ii, LCBVB_SVCTYPE_DATA, mode);
         if (!mcaddr) {
-            lcb_log(LOGARGS(this, DEBUG), "Node %lu has no data service", ii);
+            lcb_log(LOGARGS(this, DEBUG), "Node %lu has no data service", (unsigned long int)ii);
             continue;
         }
         nodes->add(mcaddr, LCB_CONFIG_MCD_PORT);
@@ -383,7 +387,7 @@ CccpProvider::on_io_read()
         return_error(LCB_PROTOCOL_ERROR);
     }
 
-    std::string jsonstr(resp.body<const char*>(), resp.bodylen());
+    std::string jsonstr(resp.value(), resp.vallen());
     std::string hoststr(lcbio_get_host(lcbio_ctx_sock(ioctx))->host);
 
     resp.release(ioctx);
@@ -429,7 +433,8 @@ void CccpProvider::dump(FILE *fp) const {
 
     for (size_t ii = 0; ii < nodes->size(); ii++) {
         const lcb_host_t &curhost = (*nodes)[ii];
-        fprintf(fp, "CCCP NODE: %s:%s\n", curhost.host, curhost.port);
+        lcb_settings *dummy = NULL;
+        fprintf(fp, "CCCP NODE: " LCB_HOST_FMT "\n", LCB_HOST_ARG(dummy, &curhost));
     }
     fprintf(fp, "## END CCCP PROVIDER DUMP ##\n");
 }