libcouchbase 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 430532d85eb75b3478daa697098512f585b7cd54
-  data.tar.gz: 89c63ea2b2de27e46d47e8d5007f4b8229332a34
+  metadata.gz: 6d524a31db2216cde317e1ccf74030b5fbd1ca60
+  data.tar.gz: 194c1907de0856d710203559b769cf6982cf7924
 SHA512:
-  metadata.gz: 3e1fc5f17546cdb22d93c5ca76da96562c5fb2b866d997065ac4c7d50cf1574c53280268b1266ce6573bdb0d552b8678514fd0d0a7efa04c2c34e9a332e9a619
-  data.tar.gz: 9ded77701bbd289afc6986d0bbe15064999430e821b9df41bbee56c397f21186b36a874e79797e0cf260202317fa12a4118ac2ff8067d5fd0afa2cc262cae8a7
+  metadata.gz: fd3fdf3e6f2c7e9f69d948368c2c5132b99633bcdad8c3f8357ad4128b88834f35024a80f14f57e61f00aef4efc6cde98f6ca0761b7d11ed28f303beaf387a3b
+  data.tar.gz: 4c4c5d0ae0af7c8e489af2bf9617124e7ee8ca39251294e2b2e78200116ebdb7b07c952c36b01a74646ab52fc20c9d01d6ae6e6ccc29fe32244aaf93c527ea2e

data/ext/libcouchbase/cmake/dtrace-instr-link.pl

@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Digest::MD5 qw(md5_hex);
 
-my $HDR = "** $0:";
+my $HDR = "** $0 ($$):";
 $\="\n";
 
 my $DT_SRC = shift @ARGV;
@@ -16,23 +16,36 @@ if (!scalar @O_FILES) {
     exec($CMD,@ARGV);
 }
 
+# Copy .o files to a temporary location before DTrace messes with them
+chomp(my $tmpdir = `mktemp -d -t $$`);
+if (system("tar cf - @O_FILES | tar xf - -C $tmpdir") != 0) {
+    system("rm -r $tmpdir");
+    exit(1);
+}
+
 my $ss = join('_', @O_FILES);
 my $hexstr = md5_hex($ss);
 
-my $INSTRUMENTED = "generated/probes_${hexstr}.o";
+# From now, we work with files in the temporary location, update @ARGV
+map { $_ =~ s,.+\.o$,$tmpdir/$&, } @ARGV;
+
+my $INSTRUMENTED = "generated/probes_${hexstr}_$$.o";
 # Run DTrace instrumentation. Assuming running from build directory:
 my @args = (
     'dtrace', '-C', '-G',
     '-s', $DT_SRC,
     '-o', $INSTRUMENTED,
-    @O_FILES);
+    grep { $_ =~ /\.o$/ } @ARGV);
 
 print "$HDR: Creating instrumented DTrace object: @args";
 if (system(@args) != 0) {
+    system("rm -r $tmpdir");
     exit(1);
 }
 
 unshift @ARGV, $CMD;
 push @ARGV, $INSTRUMENTED;
 print "$HDR: Linking with instrumented DTrace object: @ARGV";
-exit(system(@ARGV));
+my $rc = system(@ARGV);
+system("rm -r $tmpdir");
+exit($rc);

data/ext/libcouchbase/contrib/cliopts/cliopts.c

@@ -723,7 +723,9 @@ cliopts_parse_options(cliopts_entry *entries,
             }
 
             print_help(&ctx, settings);
-            exit(0);
+            if (!settings->help_noexit) {
+                exit(0);
+            }
 
         } else if (curmode == MODE_RESTARGS) {
             ii++;
@@ -776,3 +778,85 @@ cliopts_parse_options(cliopts_entry *entries,
     }
     return ret;
 }
+
+CLIOPTS_API
+int cliopts_split_args(char *args, int *argc, char ***argv)
+{
+    char *p = args;
+    char *current = NULL;
+    int skip = 0;
+
+    *argc = 0;
+    *argv = NULL;
+
+#define ch(x) (*(x + skip))
+
+    while (1) {
+
+        while (ch(p) && isspace(ch(p))) {
+            p++;
+        }
+        if (*p) {
+            int insq = 0;
+            int done = 0;
+
+            if (current == NULL) {
+                current = p;
+            }
+            while (!done) {
+                if (insq) {
+                    if (ch(p) == '\\' && ch(p + 1) == '\'') {
+                        skip++;
+                    } else if (ch(p) == '\'') {
+                        if (ch(p + 1) && !isspace(ch(p + 1))) {
+                            // do not consider single quote inside word as terminating
+                        } else {
+                            *p = '\0';
+                            p++;
+                            done = 1;
+                        }
+                    } else if (!*p) {
+                        cliopt_debug("unterminated single quote");
+                        goto err;
+                    }
+                } else {
+                    switch (ch(p)) {
+                    case '\'':
+                        if (current == p) {
+                            current++;
+                            insq = 1;
+                        }
+                        break;
+                    case ' ':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                        *p = '\0';
+                        p++;
+                    case '\0':
+                        done = 1;
+                        break;
+                    }
+                }
+                if (skip) {
+                    *p = ch(p);
+                }
+                if (*p && !done) {
+                    p++;
+                }
+            }
+            *argv = realloc(*argv, (*argc + 1) * sizeof(char *));
+            (*argv)[*argc] = current;
+            (*argc)++;
+            current = NULL;
+        } else {
+            return 0;
+        }
+    }
+
+err:
+    free(*argv);
+    *argc = 0;
+    *argv = NULL;
+    return 1;
+}

data/ext/libcouchbase/contrib/cliopts/cliopts.h

@@ -98,6 +98,8 @@ struct cliopts_extra_settings {
     int error_nohelp;
     /** Don't interpret --help or -? as help flags */
     int help_noflag;
+    /** Don't exit on --help or -? */
+    int help_noexit;
     /** Program name (defaults to argv[0]) */
     const char *progname;
     /** Usage string (defaults to "[OPTIONS..]") */
@@ -161,6 +163,14 @@ cliopts_parse_options(cliopts_entry *entries,
                       char **argv,
                       int *lastidx,
                       struct cliopts_extra_settings *settings);
+
+/**
+ * Split string for arguments, handling single quotes for grouping
+ */
+CLIOPTS_API
+int
+cliopts_split_args(char *args, int *argc, char ***argv);
+
 #ifdef __cplusplus
 }
 
@@ -260,6 +270,22 @@ public:
         doCopy(other);
     }
 
+    ~TOption() {
+        freeInnerVal();
+    }
+
+    /**
+     * Reset result to the default value for the option
+     * @return the option object, for method chaining.
+     */
+    inline Ttype& reset() {
+        freeInnerVal();
+        innerVal = createDefault();
+        priv = Tpriv();
+        found = 0;
+        return *this;
+    }
+
     /**
      * Set the default value for the option
      * @param val the default value
@@ -323,6 +349,17 @@ protected:
     /** Called from within copy constructor */
     inline void doCopy(TOption&) {}
 
+    inline void freeInnerVal() {
+        switch (ktype) {
+            case CLIOPTS_ARGT_LIST:
+                cliopts_list_clear((cliopts_list *)&innerVal);
+                break;
+            default:
+                /* nothing to do */
+                break;
+        }
+    }
+
     /** Create the default value for the option */
     static inline Taccum createDefault() { return Taccum(); }
 };
@@ -431,6 +468,14 @@ public:
 
     void addOption(Option& opt) { options.push_back(&opt); }
 
+    /**
+     * Resets internal state.
+     */
+    void reset() {
+        options.clear();
+        restargs.clear();
+    }
+
     /**
      * Parses the options from the commandline
      * @param argc number of arguments

data/ext/libcouchbase/example/subdoc/subdoc-multi.cc

@@ -5,6 +5,7 @@
 #include <libcouchbase/api3.h>
 #include <assert.h>
 #include <string.h>
+#include <cstdlib>
 #include <string>
 #include <vector>
 
@@ -47,6 +48,16 @@ int main(int argc, char **argv) {
     } else {
         crst.v.v3.connstr = DEFAULT_CONNSTR;
     }
+    if (argc > 2) {
+        crst.v.v3.username = argv[2];
+    } else {
+        crst.v.v3.username = "Administrator";
+    }
+    if (argc > 3) {
+        crst.v.v3.passwd = argv[3];
+    } else {
+        crst.v.v3.passwd = "password";
+    }
 
     lcb_t instance;
     lcb_error_t rc = lcb_create(&instance, &crst);

data/ext/libcouchbase/example/subdoc/subdoc-simple.cc

@@ -57,6 +57,16 @@ int main(int argc, char **argv)
     } else {
         crst.v.v3.connstr = DEFAULT_CONNSTR;
     }
+    if (argc > 2) {
+        crst.v.v3.username = argv[2];
+    } else {
+        crst.v.v3.username = "Administrator";
+    }
+    if (argc > 3) {
+        crst.v.v3.passwd = argv[3];
+    } else {
+        crst.v.v3.passwd = "password";
+    }
 
     lcb_t instance;
     lcb_error_t rc = lcb_create(&instance, &crst);

data/ext/libcouchbase/example/subdoc/subdoc-xattrs.c

@@ -0,0 +1,287 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 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.
+ *   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 <unistd.h>
+#include <stdlib.h>
+
+#include <libcouchbase/couchbase.h>
+#include <libcouchbase/n1ql.h>
+#include <assert.h>
+#include <string.h>
+
+static void generic_callback(lcb_t instance, int type, const lcb_RESPBASE *rb)
+{
+    if (rb->rc != LCB_SUCCESS && rb->rc != LCB_SUBDOC_MULTI_FAILURE) {
+        printf("Failure: 0x%x, %s\n", rb->rc, lcb_strerror(instance, rb->rc));
+        return;
+    }
+
+    switch (type) {
+        case LCB_CALLBACK_SDLOOKUP: {
+            lcb_SDENTRY ent;
+            size_t iter = 0;
+            size_t index = 0;
+            const lcb_RESPSUBDOC *resp = (const lcb_RESPSUBDOC *)rb;
+
+            while (lcb_sdresult_next(resp, &ent, &iter)) {
+                if (index == 0 && ent.status != LCB_SUCCESS) {
+                    // attribute does not exist, skip response
+                    return;
+                }
+                if (index == 1) {
+                    printf(" * %.*s: %.*s%%\n", (int)resp->nkey, resp->key, (int)ent.nvalue, ent.value);
+                }
+                index++;
+            }
+            break;
+        }
+        case LCB_CALLBACK_SDMUTATE: {
+            lcb_SDENTRY ent;
+            size_t iter = 0;
+            size_t oix = 0;
+            const lcb_RESPSUBDOC *resp = (const lcb_RESPSUBDOC *)rb;
+            while (lcb_sdresult_next(resp, &ent, &iter)) {
+                size_t index = oix++;
+                if (type == LCB_CALLBACK_SDMUTATE) {
+                    index = ent.index;
+                }
+                printf("[%lu]: 0x%x. %.*s\n", index, ent.status, (int)ent.nvalue, ent.value);
+            }
+            break;
+        }
+    }
+}
+
+static void n1qlrow_callback(lcb_t instance, int type, const lcb_RESPN1QL *resp)
+{
+    if (resp->rc != LCB_SUCCESS) {
+        printf("Failure: 0x%x, %s\n", resp->rc, lcb_strerror(instance, resp->rc));
+        printf("HTTP status: %d\n", (int)resp->htresp->htstatus);
+        {
+            const char *const *hdr = resp->htresp->headers;
+            for (; hdr && *hdr; hdr++) {
+                printf("%s", *hdr);
+                if (hdr + 1) {
+                    printf(" = %s", *(++hdr));
+                }
+                printf("\n");
+            }
+        }
+        printf("%.*s\n", (int)resp->nrow, resp->row);
+        return;
+    }
+
+    char *start = "{\"docID\":\"";
+    char *stop = "\"";
+
+    char *key = strnstr(resp->row, start, resp->nrow);
+    if (key == NULL || key != resp->row) {
+        return;
+    }
+    key += strlen(start);
+    char *z = strnstr(key, stop, resp->nrow - (resp->row - key));
+    if (z == NULL) {
+        return;
+    }
+    *z = '\0';
+
+    lcb_sched_enter(instance);
+    {
+        lcb_error_t rc;
+        lcb_CMDSUBDOC cmd = {};
+        lcb_SDSPEC specs[2] = {};
+        char *path = "discounts.jsmith123";
+
+        LCB_CMD_SET_KEY(&cmd, key, strlen(key));
+
+        specs[0].sdcmd = LCB_SDCMD_EXISTS;
+        specs[0].options = LCB_SDSPEC_F_XATTRPATH;
+        LCB_SDSPEC_SET_PATH(&specs[0], path, strlen(path));
+
+        specs[1].sdcmd = LCB_SDCMD_GET;
+        specs[1].options = LCB_SDSPEC_F_XATTRPATH;
+        LCB_SDSPEC_SET_PATH(&specs[1], path, strlen(path));
+
+        cmd.specs = specs;
+        cmd.nspecs = 2;
+        rc = lcb_subdoc3(instance, NULL, &cmd);
+        assert(rc == LCB_SUCCESS);
+    }
+    lcb_sched_leave(instance);
+}
+
+// #define DEFAULT_CONNSTR "couchbase://localhost/travel-sample"
+#define DEFAULT_CONNSTR "couchbase://192.168.1.194/travel-sample"
+
+static lcb_t connect_as(char *username, char *password)
+{
+    struct lcb_create_st crst = {.version = 3};
+
+    crst.v.v3.connstr = DEFAULT_CONNSTR;
+    crst.v.v3.username = username;
+    crst.v.v3.passwd = password;
+
+    lcb_t instance;
+    lcb_error_t rc;
+
+    rc = lcb_create(&instance, &crst);
+    assert(rc == LCB_SUCCESS);
+    rc = lcb_connect(instance);
+    assert(rc == LCB_SUCCESS);
+    lcb_wait(instance);
+    rc = lcb_get_bootstrap_status(instance);
+    assert(rc == LCB_SUCCESS);
+
+    lcb_install_callback3(instance, LCB_CALLBACK_DEFAULT, generic_callback);
+
+    return instance;
+}
+
+int main()
+{
+    lcb_error_t rc;
+    lcb_t instance;
+
+    instance = connect_as("Administrator", "password");
+
+    // Add key-value pairs to hotel_10138, representing traveller-Ids and associated discount percentages
+    {
+        lcb_CMDSUBDOC cmd = {};
+        lcb_SDSPEC specs[4] = {};
+        char *key = "hotel_10138";
+
+        LCB_CMD_SET_KEY(&cmd, key, strlen(key));
+        {
+            char *path = "discounts.jsmith123";
+            char *val = "20";
+
+            specs[0].sdcmd = LCB_SDCMD_DICT_UPSERT;
+            specs[0].options = LCB_SDSPEC_F_MKINTERMEDIATES | LCB_SDSPEC_F_XATTRPATH;
+            LCB_SDSPEC_SET_PATH(&specs[0], path, strlen(path));
+            LCB_CMD_SET_VALUE(&specs[0], val, strlen(val));
+        }
+        {
+            char *path = "discounts.pjones356";
+            char *val = "30";
+
+            specs[1].sdcmd = LCB_SDCMD_DICT_UPSERT;
+            specs[1].options = LCB_SDSPEC_F_MKINTERMEDIATES | LCB_SDSPEC_F_XATTRPATH;
+            LCB_SDSPEC_SET_PATH(&specs[1], path, strlen(path));
+            LCB_CMD_SET_VALUE(&specs[1], val, strlen(val));
+        }
+        // The following lines, "insert" and "remove", simply demonstrate insertion and
+        // removal of the same path and value
+        {
+            char *path = "discounts.jbrown789";
+            char *val = "25";
+
+            specs[2].sdcmd = LCB_SDCMD_DICT_ADD;
+            specs[2].options = LCB_SDSPEC_F_MKINTERMEDIATES | LCB_SDSPEC_F_XATTRPATH;
+            LCB_SDSPEC_SET_PATH(&specs[2], path, strlen(path));
+            LCB_CMD_SET_VALUE(&specs[2], val, strlen(val));
+        }
+        {
+            char *path = "discounts.jbrown789";
+
+            specs[3].sdcmd = LCB_SDCMD_REMOVE;
+            specs[3].options = LCB_SDSPEC_F_XATTRPATH;
+            LCB_SDSPEC_SET_PATH(&specs[3], path, strlen(path));
+        }
+
+        cmd.specs = specs;
+        cmd.nspecs = 4;
+        rc = lcb_subdoc3(instance, NULL, &cmd);
+        assert(rc == LCB_SUCCESS);
+    }
+
+    // Add key - value pairs to hotel_10142, again representing traveller - Ids and associated discount percentages
+    {
+        lcb_CMDSUBDOC cmd = {};
+        lcb_SDSPEC specs[2] = {};
+        char *key = "hotel_10142";
+
+        LCB_CMD_SET_KEY(&cmd, key, strlen(key));
+        {
+            char *path = "discounts.jsmith123";
+            char *val = "15";
+
+            specs[0].sdcmd = LCB_SDCMD_DICT_UPSERT;
+            specs[0].options = LCB_SDSPEC_F_MKINTERMEDIATES | LCB_SDSPEC_F_XATTRPATH;
+            LCB_SDSPEC_SET_PATH(&specs[0], path, strlen(path));
+            LCB_CMD_SET_VALUE(&specs[0], val, strlen(val));
+        }
+        {
+            char *path = "discounts.pjones356";
+            char *val = "10";
+
+            specs[1].sdcmd = LCB_SDCMD_DICT_UPSERT;
+            specs[1].options = LCB_SDSPEC_F_MKINTERMEDIATES | LCB_SDSPEC_F_XATTRPATH;
+            LCB_SDSPEC_SET_PATH(&specs[1], path, strlen(path));
+            LCB_CMD_SET_VALUE(&specs[1], val, strlen(val));
+        }
+
+        cmd.specs = specs;
+        cmd.nspecs = 2;
+        rc = lcb_subdoc3(instance, NULL, &cmd);
+        assert(rc == LCB_SUCCESS);
+    }
+
+    lcb_wait(instance);
+
+    // Create a user and assign roles. This user will search for their available discounts.
+    {
+        lcb_CMDHTTP cmd = {};
+        char *path = "/settings/rbac/users/local/jsmith123";
+        char *payload = "password=jsmith123pwd&name=John+Smith"
+                        "&roles=data_reader[travel-sample],query_select[travel-sample],data_writer[travel-sample]";
+
+        cmd.type = LCB_HTTP_TYPE_MANAGEMENT;
+        cmd.method = LCB_HTTP_METHOD_PUT;
+        LCB_CMD_SET_KEY(&cmd, path, strlen(path));
+        cmd.body = payload;
+        cmd.nbody = strlen(payload);
+        cmd.content_type = "application/x-www-form-urlencoded";
+
+        lcb_http3(instance, NULL, &cmd);
+        lcb_wait(instance);
+    }
+
+    lcb_destroy(instance);
+
+    // reconnect using new user
+    instance = connect_as("jsmith123", "jsmith123pwd");
+
+    // Perform a N1QL Query to return document IDs from the bucket. These IDs will be
+    // used to reference each document in turn, and check for extended attributes
+    // corresponding to discounts.
+    {
+        lcb_CMDN1QL cmd = {};
+        lcb_N1QLPARAMS *params = lcb_n1p_new();
+        char *query = "SELECT id, meta(`travel-sample`).id AS docID FROM `travel-sample`";
+
+        lcb_n1p_setstmtz(params, query);
+        rc = lcb_n1p_mkcmd(params, &cmd);
+        assert(rc == LCB_SUCCESS);
+        cmd.callback = n1qlrow_callback;
+
+        printf("User \"jsmith123\" has discounts in the hotels below:\n");
+        lcb_n1ql_query(instance, NULL, &cmd);
+        lcb_wait(instance);
+    }
+
+    lcb_destroy(instance);
+}