libcouchbase 1.2.8 → 1.3.0

data/ext/libcouchbase/src/vbucket/CMakeLists.txt

@@ -1,2 +1,2 @@
-ADD_LIBRARY(vbucket OBJECT vbucket.c ketama.c ${SOURCE_ROOT}/contrib/cJSON/cJSON.c)
-LCB_UTIL(vbucket)
+ADD_LIBRARY(vbucket-lcb OBJECT vbucket.c ketama.c ${SOURCE_ROOT}/contrib/cJSON/cJSON.c)
+LCB_UTIL(vbucket-lcb)

data/ext/libcouchbase/src/vbucket/vbucket.c

@@ -91,6 +91,16 @@ build_vbmap(lcbvb_CONFIG *cfg, cJSON *cj, unsigned *nitems)
     return NULL;
 }
 
+static void copy_address(char *buf, size_t nbuf, const char *host, lcb_U16 port)
+{
+    if (strchr(host, ':')) {
+        // IPv6 and should be bracketed
+        snprintf(buf, nbuf, "[%s]:%d", host, port);
+    } else {
+        snprintf(buf, nbuf, "%s:%d", host, port);
+    }
+}
+
 static lcbvb_SERVER *
 find_server_memd(lcbvb_SERVER *servers, unsigned n, const char *s)
 {
@@ -98,7 +108,7 @@ find_server_memd(lcbvb_SERVER *servers, unsigned n, const char *s)
     for (ii = 0; ii < n; ii++) {
         char buf[4096] = { 0 };
         lcbvb_SERVER *cur = servers + ii;
-        snprintf(buf, sizeof(buf), "%s:%d", cur->hostname, cur->svc.data);
+        copy_address(buf, sizeof(buf), cur->hostname, cur->svc.data);
         if (!strncmp(s, buf, sizeof(buf))) {
             return cur;
         }
@@ -179,7 +189,7 @@ pair_server_list(lcbvb_CONFIG *cfg, cJSON *vbconfig)
     }
 
     /* allocate an array for the reordered server list */
-    newlist = malloc(sizeof(*cfg->servers) * nsrv);
+    newlist = calloc(nsrv, sizeof(*cfg->servers));
 
     for (ii = 0; ii < nsrv; ii++) {
         char *tmp;
@@ -343,14 +353,14 @@ build_server_strings(lcbvb_CONFIG *cfg, lcbvb_SERVER *server)
     /* get the authority */
     char tmpbuf[4096];
 
-    sprintf(tmpbuf, "%s:%d", server->hostname, server->svc.data);
+    copy_address(tmpbuf, sizeof(tmpbuf), server->hostname, server->svc.data);
     server->authority = strdup(tmpbuf);
     if (!server->authority) {
         SET_ERRSTR(cfg, "Couldn't allocate authority");
         return 0;
     }
 
-    server->svc.hoststrs[LCBVB_SVCTYPE_DATA] = server->authority;
+    server->svc.hoststrs[LCBVB_SVCTYPE_DATA] = strdup(server->authority);
     if (server->viewpath == NULL && server->svc.views) {
         server->viewpath = malloc(strlen(cfg->bname) + 2);
         sprintf(server->viewpath, "/%s", cfg->bname);
@@ -661,7 +671,16 @@ LIBCOUCHBASE_API
 void
 lcbvb_replace_host(lcbvb_CONFIG *cfg, const char *hoststr)
 {
-    unsigned ii;
+    unsigned ii, copy = 0;
+    char *replacement = (char *)hoststr;
+    if (strchr(replacement, ':')) {
+        size_t len = strlen(hoststr);
+        replacement = calloc(len + 2, sizeof(char));
+        replacement[0] = '[';
+        memcpy(replacement + 1, hoststr, len);
+        replacement[len + 1] = ']';
+        copy = 1;
+    }
     for (ii = 0; ii < cfg->nsrv; ++ii) {
         unsigned jj;
         lcbvb_SERVER *srv = cfg->servers + ii;
@@ -671,13 +690,17 @@ lcbvb_replace_host(lcbvb_CONFIG *cfg, const char *hoststr)
         for (jj = 0; jj < 2; ++jj) {
             unsigned kk;
             lcbvb_SERVICES *cursvc = svcs[jj];
-            replace_hoststr(&cursvc->views_base_, hoststr);
+            replace_hoststr(&cursvc->views_base_, replacement);
             for (kk = 0; kk < LCBVB_SVCTYPE__MAX; ++kk) {
-                replace_hoststr(&cursvc->hoststrs[kk], hoststr);
+                replace_hoststr(&cursvc->hoststrs[kk], replacement);
             }
         }
         /* reassign authority */
-        srv->authority = srv->svc.hoststrs[LCBVB_SVCTYPE_DATA];
+        free(srv->authority);
+        srv->authority = strdup(srv->svc.hoststrs[LCBVB_SVCTYPE_DATA]);
+    }
+    if (copy) {
+        free(replacement);
     }
     if (cfg->dtype == LCBVB_DIST_KETAMA) {
         update_ketama(cfg);
@@ -730,6 +753,7 @@ lcbvb_destroy(lcbvb_CONFIG *conf)
         free(srv->cbaspath);
         free_service_strs(&srv->svc);
         free_service_strs(&srv->svc_ssl);
+        free(srv->authority);
     }
     free(conf->servers);
     free(conf->continuum);
@@ -1181,8 +1205,9 @@ lcbvb_get_hostport(lcbvb_CONFIG *cfg,
 
     strp = &svc->hoststrs[type];
     if (*strp == NULL) {
-        *strp = malloc(strlen(srv->hostname) + 20);
-        sprintf(*strp, "%s:%d", srv->hostname, port);
+        size_t strn = strlen(srv->hostname) + 20;
+        *strp = calloc(strn, sizeof(char));
+        copy_address(*strp, strn, srv->hostname, port);
     }
     return *strp;
 }
@@ -1260,7 +1285,6 @@ lcbvb_get_resturl(lcbvb_CONFIG *cfg, unsigned ix,
     lcbvb_SVCTYPE svc, lcbvb_SVCMODE mode)
 {
     char **strp;
-    char buf[4096];
     const char *prefix;
     const char *path;
 
@@ -1301,7 +1325,13 @@ lcbvb_get_resturl(lcbvb_CONFIG *cfg, unsigned ix,
     if (path == NULL) {
         return NULL;
     } else if (!*strp) {
-        sprintf(buf, "%s://%s:%d%s", prefix, srv->hostname, port, path);
+        char buf[4096];
+        if (strchr(srv->hostname, ':')) {
+            // IPv6 and should be bracketed
+            snprintf(buf, sizeof(buf), "%s://[%s]:%d%s", prefix, srv->hostname, port, path);
+        } else {
+            snprintf(buf, sizeof(buf), "%s://%s:%d%s", prefix, srv->hostname, port, path);
+        }
         *strp = strdup(buf);
     }
 
@@ -1336,11 +1366,8 @@ LIBCOUCHBASE_API const char *lcbvb_get_error(const lcbvb_CONFIG *cfg) {
  ******************************************************************************
  ******************************************************************************/
 
-static void
-copy_service(const char *hostname,
-    const lcbvb_SERVICES *src, lcbvb_SERVICES *dst)
+static void copy_service(const char *hostname, const lcbvb_SERVICES *src, lcbvb_SERVICES *dst)
 {
-    char buf[4096];
     *dst = *src;
     memset(&dst->hoststrs, 0, sizeof dst->hoststrs);
     if (src->views_base_) {
@@ -1356,7 +1383,8 @@ copy_service(const char *hostname,
         dst->cbas_base_ = strdup(src->cbas_base_);
     }
     if (dst->data) {
-        sprintf(buf, "%s:%d", hostname, dst->data);
+        char buf[4096];
+        copy_address(buf, sizeof(buf), hostname, dst->data);
         dst->hoststrs[LCBVB_SVCTYPE_DATA] = strdup(buf);
     }
 }
@@ -1452,7 +1480,11 @@ lcbvb_genconfig_ex(lcbvb_CONFIG *vb,
 
         copy_service(src->hostname, &src->svc, &dst->svc);
         copy_service(src->hostname, &src->svc_ssl, &dst->svc_ssl);
-        dst->authority = dst->svc.hoststrs[LCBVB_SVCTYPE_DATA];
+        {
+            char tmpbuf[MAX_AUTHORITY_SIZE] = {0};
+            copy_address(tmpbuf, sizeof(tmpbuf), dst->hostname, dst->svc.data);
+            dst->authority = strdup(tmpbuf);
+        }
     }
 
     for (ii = 0; ii < vb->nvb; ii++) {

data/ext/libcouchbase/src/views/docreq.cc

@@ -1,4 +1,21 @@
-#include "docreq.h"
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2014-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 "viewreq.h"
 #include "internal.h"
 #include "sllist-inl.h"
 
@@ -100,6 +117,14 @@ docreq_handler(void *arg)
             lcb_CMDGET gcmd = { 0 };
 
             LCB_CMD_SET_KEY(&gcmd, cont->docid.iov_base, cont->docid.iov_len);
+#ifdef LCB_TRACING
+            if (cont->parent->parent) {
+                lcb::views::ViewRequest *req = reinterpret_cast<lcb::views::ViewRequest *>(cont->parent->parent);
+                if (req->span) {
+                    LCB_CMD_SET_TRACESPAN(&gcmd, req->span);
+                }
+            }
+#endif
             cont->callback = doc_callback;
             gcmd.cmdflags |= LCB_CMD_F_INTERNAL_CALLBACK;
             rc = lcb_get3(instance, &cont->callback, &gcmd);

data/ext/libcouchbase/src/views/docreq.h

@@ -1,3 +1,20 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2014-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.
+ */
+
 /**
  * Document request routines
  */

data/ext/libcouchbase/src/views/viewreq.cc

@@ -1,3 +1,20 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2014-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 "viewreq.h"
 #include "sllist-inl.h"
 #include "http/http.h"
@@ -188,6 +205,27 @@ cb_docq_throttle(lcb::docreq::Queue *q, int enabled)
 ViewRequest::~ViewRequest() {
     invoke_last();
 
+#ifdef LCB_TRACING
+    if (span) {
+        if (htreq) {
+            lcbio_CTX *ctx = htreq->ioctx;
+            if (ctx) {
+                std::string remote;
+                if (htreq->ipv6) {
+                    remote = "[" + std::string(htreq->host) + "]:" + std::string(htreq->port);
+                } else {
+                    remote = std::string(htreq->host) + ":" + std::string(htreq->port);
+                }
+                lcbtrace_span_add_tag_str(span, LCBTRACE_TAG_PEER_ADDRESS, remote.c_str());
+                lcbtrace_span_add_tag_str(span, LCBTRACE_TAG_LOCAL_ADDRESS,
+                                          lcbio__inet_ntop(&ctx->sock->info->sa_local).c_str());
+            }
+        }
+        lcbtrace_span_finish(span, LCBTRACE_NOW);
+        span = NULL;
+    }
+#endif
+
     if (parser != NULL) {
         delete parser;
     }
@@ -239,7 +277,11 @@ ViewRequest::ViewRequest(lcb_t instance_, const void *cookie_,
       cookie(cookie_), docq(NULL), callback(cmd->callback),
       instance(instance_), refcount(1),
       cmdflags(cmd->cmdflags),
-      lasterr(LCB_SUCCESS) {
+      lasterr(LCB_SUCCESS)
+#ifdef LCB_TRACING
+    , span(NULL)
+#endif
+    {
 
     // Validate:
     if (cmd->nddoc == 0 || cmd->nview == 0 || callback == NULL) {
@@ -270,6 +312,15 @@ ViewRequest::ViewRequest(lcb_t instance_, const void *cookie_,
     lcb_aspend_add(&instance->pendops, LCB_PENDTYPE_COUNTER, NULL);
 
     lasterr = request_http(cmd);
+#ifdef LCB_TRACING
+    if (lasterr == LCB_SUCCESS && instance->settings->tracer) {
+        char id[20] = {0};
+        snprintf(id, sizeof(id), "%p", (void *)this);
+        span = lcbtrace_span_start(instance->settings->tracer, LCBTRACE_OP_DISPATCH_TO_SERVER, LCBTRACE_NOW, NULL);
+        lcbtrace_span_add_tag_str(span, LCBTRACE_TAG_OPERATION_ID, id);
+        lcbtrace_span_add_system_tags(span, instance->settings, LCBTRACE_TAG_SERVICE_VIEW);
+    }
+#endif
 }
 
 LIBCOUCHBASE_API
@@ -316,3 +367,15 @@ void ViewRequest::cancel() {
         }
     }
 }
+
+#ifdef LCB_TRACING
+
+LIBCOUCHBASE_API
+void lcb_view_set_parent_span(lcb_t, lcb_VIEWHANDLE handle, lcbtrace_SPAN *span)
+{
+    if (handle && handle->span) {
+        lcbtrace_span_set_parent(handle->span, span);
+    }
+}
+
+#endif

data/ext/libcouchbase/src/views/viewreq.h

@@ -1,3 +1,20 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2014-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 <libcouchbase/views.h>
 #include <libcouchbase/pktfwd.h>
@@ -60,6 +77,10 @@ struct ViewRequest : lcb::jsparse::Parser::Actions {
     unsigned refcount;
     uint32_t cmdflags;
     lcb_error_t lasterr;
+#ifdef LCB_TRACING
+    lcbtrace_SPAN *span;
+#endif
+
 };
 
 }

data/ext/libcouchbase/tests/CMakeLists.txt

@@ -3,7 +3,7 @@ IF (NOT (WIN32 AND CMAKE_COMPILER_IS_GNUCC))
     SET(gtest_force_shared_crt ON CACHE BOOL "" )
     SET(BUILD_SHARED_LIBS ON)
 ENDIF()
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/gtest-1.7.0 gtest)
+ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/contrib/gtest-1.7.0 gtest)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_EXECUTABLE(check-all EXCLUDE_FROM_ALL
@@ -34,10 +34,10 @@ ENDIF()
 ADD_EXECUTABLE(nonio-tests EXCLUDE_FROM_ALL nonio_tests.cc ${T_BASIC_SRC})
 
 ADD_EXECUTABLE(mc-tests EXCLUDE_FROM_ALL nonio_tests.cc ${T_MC_SRC}
-    $<TARGET_OBJECTS:mcreq> $<TARGET_OBJECTS:netbuf> $<TARGET_OBJECTS:vbucket>)
+    $<TARGET_OBJECTS:mcreq> $<TARGET_OBJECTS:mcreq-cxx> $<TARGET_OBJECTS:netbuf> $<TARGET_OBJECTS:vbucket-lcb>)
 
 ADD_EXECUTABLE(mc-malloc-tests EXCLUDE_FROM_ALL nonio_tests.cc ${T_MC_SRC}
-    $<TARGET_OBJECTS:mcreq> $<TARGET_OBJECTS:netbuf-malloc> $<TARGET_OBJECTS:vbucket>)
+    $<TARGET_OBJECTS:mcreq> $<TARGET_OBJECTS:mcreq-cxx> $<TARGET_OBJECTS:netbuf-malloc> $<TARGET_OBJECTS:vbucket-lcb>)
 
 ADD_EXECUTABLE(netbuf-tests
     EXCLUDE_FROM_ALL nonio_tests.cc basic/t_netbuf.cc $<TARGET_OBJECTS:netbuf>)
@@ -75,9 +75,8 @@ ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/tests/CouchbaseMock.jar AND NOT LCB_NO_MO
 INCLUDE_DIRECTORIES(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 TARGET_LINK_LIBRARIES(unit-tests couchbaseS gtest)
 TARGET_LINK_LIBRARIES(nonio-tests couchbaseS gtest)
-TARGET_LINK_LIBRARIES(mc-tests gtest ${LCB_SNAPPY_LINK})
-TARGET_LINK_LIBRARIES(mc-malloc-tests
-    gtest ${LCB_SNAPPY_LINK})
+TARGET_LINK_LIBRARIES(mc-tests couchbaseS gtest)
+TARGET_LINK_LIBRARIES(mc-malloc-tests couchbaseS gtest)
 TARGET_LINK_LIBRARIES(netbuf-tests gtest)
 TARGET_LINK_LIBRARIES(rdb-tests gtest)
 TARGET_LINK_LIBRARIES(sock-tests couchbaseS gtest)
@@ -92,6 +91,7 @@ ENDIF()
 ADD_CUSTOM_TARGET(alltests DEPENDS check-all unit-tests nonio-tests
     rdb-tests sock-tests vbucket-tests mc-tests htparse-tests)
 
+
 ADD_TEST(NAME BUILD-TESTS COMMAND ${CMAKE_COMMAND} --build "${PROJECT_BINARY_DIR}" --target alltests)
 
 MACRO(DEFINE_MOCKTEST plugin test)

data/ext/libcouchbase/tests/basic/t_base64.cc

@@ -18,17 +18,35 @@
 #include <gtest/gtest.h>
 
 extern "C" {
-    extern int lcb_base64_encode(const char *src, char *dst,
-                                 size_t sz);
+extern int lcb_base64_encode(const char *src, size_t nsrc, char *dst, size_t ndst);
+extern int lcb_base64_decode(const char *src, size_t nsrc, char *dst, size_t ndst);
+
+extern int lcb_base64_encode2(const char *src, size_t nsrc, char **dst, size_t *ndst);
+extern int lcb_base64_decode2(const char *src, size_t nsrc, char **dst, size_t *ndst);
 }
 
 class Base64 : public ::testing::Test
 {
-protected:
-    void validate(const char *src, const char *result) {
+  protected:
+    void validate(const char *src, const char *result)
+    {
         char dest[1024];
-        ASSERT_NE(-1, lcb_base64_encode(src, dest, sizeof(dest)));
+        ASSERT_GE(lcb_base64_encode(src, strlen(src), dest, sizeof(dest)), 0);
         EXPECT_STREQ(result, dest);
+        memset(dest, 0, sizeof(dest));
+        ASSERT_GE(lcb_base64_decode(result, strlen(result), dest, sizeof(dest)), 0);
+        EXPECT_STREQ(src, dest);
+
+        char *tmp = NULL;
+        size_t ntmp = 0;
+        ASSERT_GE(lcb_base64_encode2(src, strlen(src), &tmp, &ntmp), 0);
+        EXPECT_STREQ(result, tmp);
+        free(tmp);
+        tmp = NULL;
+        ntmp = 0;
+        ASSERT_GE(lcb_base64_decode2(result, strlen(result), &tmp, &ntmp), 0);
+        EXPECT_STREQ(src, tmp);
+        free(tmp);
     }
 };
 
@@ -62,7 +80,6 @@ TEST_F(Base64, testWikipediaExample)
     validate("sure.", "c3VyZS4=");
 }
 
-
 TEST_F(Base64, testStuff)
 {
     // Dummy test data. It looks like the "base64" command line
@@ -79,3 +96,14 @@ TEST_F(Base64, testStuff)
     validate("blahblah:bla@@h", "YmxhaGJsYWg6YmxhQEBo");
     validate("blahblah:bla@@h\n", "YmxhaGJsYWg6YmxhQEBoCg==");
 }
+
+TEST_F(Base64, testTooSmallOutputBuffer)
+{
+    const char *plain = "foobar";
+    const char *base64 = "Zm9vYmFy";
+
+    char dest[2];
+
+    ASSERT_EQ(lcb_base64_encode(plain, strlen(plain), dest, sizeof(dest)), -1);
+    ASSERT_EQ(lcb_base64_decode(base64, strlen(base64), dest, sizeof(dest)), -1);
+}