libcouchbase 1.2.8 → 1.3.0

data/ext/libcouchbase/src/operations/remove.cc

@@ -49,7 +49,8 @@ lcb_remove3(lcb_t instance, const void *cookie, const lcb_CMDREMOVE * cmd)
     pkt->u_rdata.reqdata.cookie = cookie;
     pkt->u_rdata.reqdata.start = gethrtime();
     memcpy(SPAN_BUFFER(&pkt->kh_span), hdr.bytes, sizeof(hdr.bytes));
-    TRACE_REMOVE_BEGIN(&hdr, cmd);
+    LCBTRACE_KV_START(instance->settings, cmd, LCBTRACE_OP_REMOVE, pkt->opaque, pkt->u_rdata.reqdata.span);
+    TRACE_REMOVE_BEGIN(instance, &hdr, cmd);
     LCB_SCHED_ADD(instance, pl, pkt);
     return LCB_SUCCESS;
 }

data/ext/libcouchbase/src/operations/store.cc

@@ -73,6 +73,15 @@ handle_dur_storecb(mc_PIPELINE *, mc_PACKET *pkt,
         goto GT_BAIL;
     }
 
+#ifdef LCB_TRACING
+    {
+        lcbtrace_SPAN *span = MCREQ_PKT_RDATA(pkt)->span;
+        if (span) {
+            mctx->setspan(mctx, span);
+        }
+    }
+#endif
+
     lcbdurctx_set_durstore(mctx, 1);
     err = mctx->addcmd(mctx, (lcb_CMDBASE*)&dcmd);
     if (err != LCB_SUCCESS) {
@@ -149,19 +158,11 @@ get_esize_and_opcode(
 
 
 static int
-can_compress(lcb_t instance, const mc_PIPELINE *pipeline,
-    const lcb_VALBUF *vbuf, lcb_datatype_t datatype)
+can_compress(lcb_t instance, const mc_PIPELINE *pipeline, lcb_datatype_t datatype)
 {
     const lcb::Server *server = static_cast<const lcb::Server*>(pipeline);
     int compressopts = LCBT_SETTING(instance, compressopts);
 
-    if (mcreq_compression_supported() == 0) {
-        return 0;
-    }
-
-    if (vbuf->vtype != LCB_KV_COPY) {
-        return 0;
-    }
     if ((compressopts & LCB_COMPRESS_OUT) == 0) {
         return 0;
     }
@@ -243,9 +244,9 @@ do_store3(lcb_t instance, const void *cookie,
         return err;
     }
 
-    should_compress = can_compress(instance, pipeline, vbuf, datatype);
+    should_compress = can_compress(instance, pipeline, datatype);
     if (should_compress) {
-        int rv = mcreq_compress_value(pipeline, packet, &vbuf->u_buf.contig);
+        int rv = mcreq_compress_value(pipeline, packet, vbuf, instance->settings, &should_compress);
         if (rv != 0) {
             mcreq_release_packet(pipeline, packet);
             return LCB_CLIENT_ENOMEM;
@@ -260,7 +261,7 @@ do_store3(lcb_t instance, const void *cookie,
         const lcb_CMDSTOREDUR *dcmd = (const lcb_CMDSTOREDUR *)cmd;
         persist_u = dcmd->persist_to;
         replicate_u = dcmd->replicate_to;
-        if (dcmd->replicate_to == -1 || dcmd->persist_to == -1) {
+        if (dcmd->replicate_to == (char)-1 || dcmd->persist_to == (char)-1) {
             duropts = LCB_DURABILITY_VALIDATE_CAPMAX;
         }
 
@@ -290,7 +291,8 @@ do_store3(lcb_t instance, const void *cookie,
     if (should_compress || (datatype & LCB_VALUE_F_SNAPPYCOMP)) {
         hdr->request.datatype |= PROTOCOL_BINARY_DATATYPE_COMPRESSED;
     }
-    if (datatype & LCB_VALUE_F_JSON) {
+
+    if ((datatype & LCB_VALUE_F_JSON) && static_cast<const lcb::Server*>(pipeline)->supports_json()) {
         hdr->request.datatype |= PROTOCOL_BINARY_DATATYPE_JSON;
     }
 
@@ -301,7 +303,8 @@ do_store3(lcb_t instance, const void *cookie,
 
     memcpy(SPAN_BUFFER(&packet->kh_span), scmd.bytes, hsize);
     LCB_SCHED_ADD(instance, pipeline, packet);
-    TRACE_STORE_BEGIN(hdr, (lcb_CMDSTORE* )cmd);
+    LCBTRACE_KV_START(instance->settings, cmd, LCBTRACE_OP_STORE2NAME(operation), packet->opaque, MCREQ_PKT_RDATA(packet)->span);
+    TRACE_STORE_BEGIN(instance, hdr, (lcb_CMDSTORE *)cmd);
     return LCB_SUCCESS;
 }
 

data/ext/libcouchbase/src/operations/touch.cc

@@ -16,6 +16,7 @@
  */
 
 #include "internal.h"
+#include "trace.h"
 
 LIBCOUCHBASE_API
 lcb_error_t
@@ -48,6 +49,8 @@ lcb_touch3(lcb_t instance, const void *cookie, const lcb_CMDTOUCH *cmd)
     pkt->u_rdata.reqdata.cookie = cookie;
     pkt->u_rdata.reqdata.start = gethrtime();
     LCB_SCHED_ADD(instance, pl, pkt);
+    LCBTRACE_KV_START(instance->settings, cmd, LCBTRACE_OP_TOUCH, pkt->opaque, pkt->u_rdata.reqdata.span);
+    TRACE_TOUCH_BEGIN(instance, hdr, cmd);
     return LCB_SUCCESS;
 }
 

data/ext/libcouchbase/src/packetutils.h

@@ -28,6 +28,7 @@
 typedef struct packet_info_st packet_info;
 #else
 #include "contrib/lcb-jsoncpp/lcb-jsoncpp.h"
+#include <math.h>
 namespace lcb {
 class Server;
 
@@ -124,18 +125,66 @@ public:
         return res.response.datatype;
     }
 
+    #define FRAMING_EXTRAS_TRACING 0x00
+#if defined(_MSC_VER)
+#define __lcb_round(d) ((d) > 0.0) ? ((d) + 0.5) : ((d) - 0.5)
+#else
+#define __lcb_round(d) round(d)
+#endif
+
+    uint64_t duration() const {
+        if (ffextlen() == 0) {
+            return 0;
+        }
+
+        const char *end, *ptr;
+        ptr = ffext();
+        end = ptr + ffextlen();
+
+        for (; ptr < end;) {
+            uint8_t control = *ptr;
+            uint8_t id = control & 0xF0;
+            uint8_t len = control & 0x0F;
+            ptr++;
+            if (id == FRAMING_EXTRAS_TRACING && len == sizeof(uint16_t)) {
+                uint16_t encoded;
+                memcpy(&encoded, ptr, sizeof(uint16_t));
+                encoded = ntohs(encoded);
+                return (uint64_t)__lcb_round(pow(encoded, 1.74) / 2);
+            }
+            ptr += len;
+        }
+        return 0;
+    }
+
+#undef __lcb_round
+
+    /**
+     * Gets a pointer starting at the packet's flexible framing ext field
+     */
+    const char *ffext() const {
+        return body<const char*>();
+    }
+
+    /**
+     * Gets a pointer starting at the packet's ext field.
+     */
+    const char *ext() const {
+        return body<const char*>() + ffextlen();
+    }
+
     /**
      * Gets a pointer starting at the packet's key field. Only use if NKEY is 0
      */
     const char *key() const {
-        return body<const char*>() + extlen();
+        return body<const char*>() + extlen() + ffextlen();
     }
 
     /**
      * Gets a pointer starting at the packet's value field. Only use if NVALUE is 0
      */
     const char *value() const {
-        return body<const char*>() + keylen() + extlen();
+        return body<const char*>() + keylen() + extlen() + ffextlen();
     }
 
     /**
@@ -143,7 +192,7 @@ public:
      * which is after the key (if applicable) and extras (if applicable).
      */
     uint32_t vallen() const {
-        return bodylen() - (keylen() + extlen());
+        return bodylen() - (keylen() + extlen() + ffextlen());
     }
 
 
@@ -183,7 +232,11 @@ public:
      * Gets the key size, if included in the packet.
      */
     uint16_t keylen() const {
-        return ntohs(res.response.keylen);
+        if (res.response.magic == PROTOCOL_BINARY_ARES) {
+            return (res.response.keylen >> 8) & 0xff;
+        } else {
+            return ntohs(res.response.keylen);
+        }
     }
 
     /**
@@ -193,6 +246,17 @@ public:
         return (res.response.extlen);
     }
 
+    /**
+     * Gets flexible framing extras length
+     */
+    uint8_t ffextlen() const {
+        if (res.response.magic == PROTOCOL_BINARY_ARES) {
+            return res.response.keylen & 0xff;
+        } else {
+            return 0;
+        }
+    }
+
     /**
      * Gets the raw unconverted 'opaque' 32 bit field
      */

data/ext/libcouchbase/src/probes.d

@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2012 Couchbase, Inc.
+ *     Copyright 2012-2017 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -15,158 +15,112 @@
  *   limitations under the License.
  */
 
-provider libcouchbase {
-    probe get_begin(uint32_t,       /* opaque */
-                    uint16_t,       /* vbucket */
-                    uint8_t,        /* opcode (get, gat, getl) */
-                    const char*,    /* key */
-                    size_t,         /* nkey */
-                    uint32_t);      /* expiration */
-    probe get_end(uint32_t,     /* opaque */
-                  uint16_t,     /* vbucket */
-                  uint8_t,      /* opcode (get, gat, getl) */
-                  uint16_t,     /* return code (from libcouchbase) */
-                  const char*,  /* key */
-                  size_t,       /* nkey */
-                  const char*,  /* bytes */
-                  size_t,       /* nbytes */
-                  uint32_t,     /* flags */
-                  uint64_t,     /* cas */
-                  uint8_t);     /* datatype */
+provider libcouchbase
+{
+    probe get_begin(void *,       /* lcb_t */
+                    uint32_t,     /* opaque */
+                    uint16_t,     /* vbucket */
+                    uint8_t,      /* opcode (get, gat, getl) */
+                    const char *, /* key */
+                    size_t,       /* nkey */
+                    uint32_t);    /* expiration */
+    probe get_end(void *,         /* lcb_t */
+                  uint32_t,       /* opaque */
+                  uint8_t,        /* opcode (get, gat, getl) */
+                  uint64_t,       /* latency, ns */
+                  uint16_t,       /* return code (from libcouchbase) */
+                  const char *,   /* key */
+                  size_t,         /* nkey */
+                  const char *,   /* bytes */
+                  size_t,         /* nbytes */
+                  uint32_t,       /* flags */
+                  uint64_t,       /* cas */
+                  uint8_t);       /* datatype */
 
-    probe unlock_begin(uint32_t,    /* opaque */
-                       uint16_t,    /* vbucket */
-                       uint8_t,     /* opcode */
-                       const char*, /* key */
-                       size_t);     /* nkey */
-    probe unlock_end(uint32_t,      /* opaque */
-                     uint16_t,      /* vbucket */
-                     uint8_t,       /* opcode */
-                     uint16_t,      /* return code (from libcouchbase) */
-                     const char*,   /* key */
-                     size_t);       /* nkey */
+    probe unlock_begin(void *,       /* lcb_t */
+                       uint32_t,     /* opaque */
+                       uint16_t,     /* vbucket */
+                       uint8_t,      /* opcode */
+                       const char *, /* key */
+                       size_t);      /* nkey */
+    probe unlock_end(void *,         /* lcb_t */
+                     uint32_t,       /* opaque */
+                     uint8_t,        /* opcode */
+                     uint64_t,       /* latency, ns */
+                     uint16_t,       /* return code (from libcouchbase) */
+                     const char *,   /* key */
+                     size_t);        /* nkey */
 
-    probe store_begin(uint32_t,     /* opaque */
+    probe store_begin(void *,       /* lcb_t */
+                      uint32_t,     /* opaque */
                       uint16_t,     /* vbucket */
                       uint8_t,      /* opcode (set, add, replace, append, prepend) */
-                      const char*,  /* key */
+                      const char *, /* key */
                       size_t,       /* nkey */
-                      const char*,  /* bytes */
+                      const char *, /* bytes */
                       size_t,       /* nbytes */
                       uint32_t,     /* flags */
                       uint64_t,     /* cas */
                       uint8_t,      /* datatype */
                       uint32_t);    /* expiration */
-    probe store_end(uint32_t,       /* opaque */
-                    uint16_t,       /* vbucket */
+    probe store_end(void *,         /* lcb_t */
+                    uint32_t,       /* opaque */
                     uint8_t,        /* opcode (set, add, replace, append, prepend) */
+                    uint64_t,       /* latency, ns */
                     uint16_t,       /* return code (from libcouchbase) */
-                    const char*,    /* key */
+                    const char *,   /* key */
                     size_t,         /* nkey */
                     uint64_t);      /* cas */
 
-    probe arithmetic_begin(uint32_t,    /* opaque */
-                           uint16_t,    /* vbucket */
-                           uint8_t,     /* opcode (increment, decrement) */
-                           const char*, /* key */
-                           size_t,      /* nkey */
-                           uint64_t,    /* delta */
-                           uint64_t,    /* initial */
-                           uint32_t);   /* expiration */
-    probe arithmetic_end(uint32_t,      /* opaque */
-                         uint16_t,      /* vbucket */
-                         uint8_t,       /* opcode (increment, decrement) */
-                         uint16_t,      /* return code (from libcouchbase) */
-                         const char*,   /* key */
-                         size_t,        /* nkey */
-                         uint64_t,      /* value */
-                         uint64_t);     /* cas */
-
-    probe touch_begin(uint32_t,       /* opaque */
-                      uint16_t,       /* vbucket */
-                      uint8_t,        /* opcode */
-                      const char*,    /* key */
-                      size_t,         /* nkey */
-                      uint32_t);      /* expiration */
-    probe touch_end(uint32_t,     /* opaque */
-                    uint16_t,     /* vbucket */
-                    uint8_t,      /* opcode */
-                    uint16_t,     /* return code (from libcouchbase) */
-                    const char*,  /* key */
-                    size_t,       /* nkey */
-                    uint64_t);    /* cas */
-
-    probe remove_begin(uint32_t,       /* opaque */
-                       uint16_t,       /* vbucket */
-                       uint8_t,        /* opcode */
-                       const char*,    /* key */
-                       size_t);        /* nkey */
-    probe remove_end(uint32_t,     /* opaque */
-                     uint16_t,     /* vbucket */
-                     uint8_t,      /* opcode */
-                     uint16_t,     /* return code (from libcouchbase) */
-                     const char*,  /* key */
-                     size_t,       /* nkey */
-                     uint64_t);    /* cas */
+    probe arithmetic_begin(void *,       /* lcb_t */
+                           uint32_t,     /* opaque */
+                           uint16_t,     /* vbucket */
+                           uint8_t,      /* opcode (increment, decrement) */
+                           const char *, /* key */
+                           size_t,       /* nkey */
+                           uint64_t,     /* delta */
+                           uint64_t,     /* initial */
+                           uint32_t);    /* expiration */
+    probe arithmetic_end(void *,         /* lcb_t */
+                         uint32_t,       /* opaque */
+                         uint8_t,        /* opcode (increment, decrement) */
+                         uint64_t,       /* latency, ns */
+                         uint16_t,       /* return code (from libcouchbase) */
+                         const char *,   /* key */
+                         size_t,         /* nkey */
+                         uint64_t,       /* value */
+                         uint64_t);      /* cas */
 
-    probe flush_begin(uint32_t,        /* opaque */
-                      uint16_t,        /* vbucket */
-                      uint8_t,         /* opcode */
-                      const char*);    /* server_endpoint */
-    probe flush_progress(uint32_t,     /* opaque */
-                         uint16_t,     /* vbucket */
-                         uint8_t,      /* opcode */
-                         uint16_t,     /* return code (from libcouchbase) */
-                         const char*); /* server_endpoint */
-    probe flush_end(uint32_t,     /* opaque */
-                    uint16_t,     /* vbucket */
-                    uint8_t,      /* opcode */
-                    uint16_t);    /* return code (from libcouchbase) */
-
-    probe versions_begin(uint32_t,        /* opaque */
-                         uint16_t,        /* vbucket */
-                         uint8_t,         /* opcode */
-                         const char*);    /* server_endpoint */
-    probe versions_progress(uint32_t,     /* opaque */
-                            uint16_t,     /* vbucket */
-                            uint8_t,      /* opcode */
-                            uint16_t,     /* return code (from libcouchbase) */
-                            const char*); /* server_endpoint */
-    probe versions_end(uint32_t,     /* opaque */
-                       uint16_t,     /* vbucket */
-                       uint8_t,      /* opcode */
-                       uint16_t);    /* return code (from libcouchbase) */
-
-    probe stats_begin(uint32_t,     /* opaque */
+    probe touch_begin(void *,       /* lcb_t */
+                      uint32_t,     /* opaque */
                       uint16_t,     /* vbucket */
                       uint8_t,      /* opcode */
-                      const char*,  /* server_endpoint */
-                      const char*,  /* arg */
-                      size_t);      /* narg */
-    probe stats_progress(uint32_t,      /* opaque */
-                         uint16_t,      /* vbucket */
-                         uint8_t,       /* opcode */
-                         uint16_t,      /* return code (from libcouchbase) */
-                         const char*,   /* server_endpoint */
-                         const char*,   /* key */
-                         size_t,        /* nkey */
-                         const char*,   /* bytes */
-                         size_t);       /* nbytes */
-    probe stats_end(uint32_t,      /* opaque */
-                    uint16_t,      /* vbucket */
-                    uint8_t,       /* opcode */
-                    uint16_t);     /* return code (from libcouchbase) */
+                      const char *, /* key */
+                      size_t,       /* nkey */
+                      uint32_t);    /* expiration */
+    probe touch_end(void *,         /* lcb_t */
+                    uint32_t,       /* opaque */
+                    uint8_t,        /* opcode */
+                    uint64_t,       /* latency, ns */
+                    uint16_t,       /* return code (from libcouchbase) */
+                    const char *,   /* key */
+                    size_t,         /* nkey */
+                    uint64_t);      /* cas */
 
-    probe verbosity_begin(uint32_t,     /* opaque */
-                          uint16_t,     /* vbucket */
-                          uint8_t,      /* opcode */
-                          const char*,  /* server_endpoint */
-                          uint32_t);    /* level */
-    probe verbosity_end(uint32_t,       /* opaque */
-                        uint16_t,       /* vbucket */
-                        uint8_t,        /* opcode */
-                        uint16_t,       /* return code (from libcouchbase) */
-                        const char*);   /* server_endpoint */
+    probe remove_begin(void *,       /* lcb_t */
+                       uint32_t,     /* opaque */
+                       uint16_t,     /* vbucket */
+                       uint8_t,      /* opcode */
+                       const char *, /* key */
+                       size_t);      /* nkey */
+    probe remove_end(void *,         /* lcb_t */
+                     uint32_t,       /* opaque */
+                     uint8_t,        /* opcode */
+                     uint64_t,       /* latency, ns */
+                     uint16_t,       /* return code (from libcouchbase) */
+                     const char *,   /* key */
+                     size_t,         /* nkey */
+                     uint64_t);      /* cas */
 
     /*
      * OBSERVE_BEGIN probe intended to be parsed in the handler.
@@ -178,34 +132,51 @@ provider libcouchbase {
      * | vbucket |   nkey  |    key     | ...
      * +---------+---------+------------+----
      */
-    probe observe_begin(uint32_t,       /* opaque */
-                        uint16_t,       /* vbucket */
-                        uint8_t,        /* opcode */
-                        const char*,    /* bytes */
-                        size_t);        /* nbytes */
-    probe observe_progress(uint32_t,    /* opaque */
-                           uint16_t,    /* vbucket */
-                           uint8_t,     /* opcode */
-                           uint16_t,    /* return code (from libcouchbase) */
-                           const char*, /* key */
-                           size_t,      /* nkey */
-                           uint64_t,    /* cas */
-                           uint8_t,     /* observe status: FOUND = 0x00, PERSISTED = 0x01, NOT_FOUND = 0x80 */
-                           uint8_t,     /* master (zero if from replica) */
-                           uint32_t,    /* ttp, time to persist */
-                           uint32_t);   /* ttr, time to replicate */
-    probe observe_end(uint32_t,     /* opaque */
-                      uint16_t,     /* vbucket */
-                      uint8_t,      /* opcode */
-                      uint16_t);    /* return code (from libcouchbase) */
+    probe observe_begin(void *,          /* lcb_t */
+                        uint32_t,        /* opaque */
+                        uint8_t,         /* opcode */
+                        const char *,    /* bytes */
+                        size_t);         /* nbytes */
+    probe observe_progress(void *,       /* lcb_t */
+                           uint32_t,     /* opaque */
+                           uint8_t,      /* opcode */
+                           uint64_t,     /* latency, ns */
+                           uint16_t,     /* return code (from libcouchbase) */
+                           const char *, /* key */
+                           size_t,       /* nkey */
+                           uint64_t,     /* cas */
+                           uint8_t,      /* observe status: FOUND = 0x00, PERSISTED = 0x01, NOT_FOUND = 0x80 */
+                           uint8_t,      /* master (zero if from replica) */
+                           uint32_t,     /* ttp, time to persist */
+                           uint32_t);    /* ttr, time to replicate */
+    probe observe_end(void *,            /* lcb_t */
+                      uint32_t,          /* opaque */
+                      uint8_t,           /* opcode */
+                      uint64_t,          /* latency, ns */
+                      uint16_t);         /* return code (from libcouchbase) */
 
-    probe http_begin(const char*,   /* url */
-                     size_t,        /* nurl */
-                     uint8_t);      /* method: GET = 0, POST = 1, PUT = 2, DELETE = 3 */
-    probe http_end(const char*,     /* url */
-                   size_t,          /* nurl */
-                   uint8_t,         /* method: GET = 0, POST = 1, PUT = 2, DELETE = 3 */
+    probe http_begin(void *,        /* lcb_t */
+                     void *,        /* pointer to request */
+                     uint16_t,      /* type */
+                     uint16_t,      /* method */
+                     const char *,  /* url */
+                     const char *,  /* host */
+                     const char *); /* port */
+    probe http_end(void *,          /* lcb */
+                   void *,          /* pointer to request */
+                   uint16_t,        /* type */
+                   uint16_t,        /* method */
+                   const char *,    /* url */
+                   const char *,    /* host */
+                   const char *,    /* port */
                    uint16_t,        /* return code (from libcouchbase) */
-                   uint16_t);       /* HTTP status code or zero */
+                   uint16_t,        /* HTTP status code or zero */
+                   uint64_t);       /* latency, ns */
 
+    probe new_config(void *,         /* lcb_t */
+                     int32_t,        /* revid */
+                     const char*,    /* bucket name */
+                     const char*,    /* bucket UUID */
+                     const void*     /* pointer to config */
+                    );
 };