libcouchbase 1.2.8 → 1.3.0

data/ext/libcouchbase/tools/common/options.h

@@ -24,11 +24,14 @@ namespace cbc {
     X(String, saslmech, "force-sasl-mech", 'S') \
     X(String, connstr, "spec", 'U') \
     X(String, ssl, "ssl", '\0') \
+    X(String, truststorepath, "truststorepath", '\0') \
     X(String, certpath, "certpath", '\0') \
+    X(String, keypath, "keypath", '\0') \
     X(UInt, timeout, "timeout", '\0') \
     X(Bool, timings, "timings", 'T') \
     X(Bool, verbose, "verbose", 'v') \
     X(Bool, dump, "dump", '\0') \
+    X(Bool, compress, "compress", 'y') \
     X(List, cparams, "cparam", 'D')
 
 
@@ -61,6 +64,8 @@ public:
     void addToParser(cliopts::Parser& parser);
     lcb_error_t doCtls(lcb_t instance);
     bool useTimings() { return o_timings.result(); }
+    int numTimings() { return o_timings.numSpecified(); }
+    cliopts::BoolOption& getTimings() { return o_timings; }
     void setAdminMode();
     bool shouldDump() { return o_dump.result(); }
     void writeConfig(const std::string& dest = getConfigfileName());

data/ext/libcouchbase/tools/docgen/docgen.h

@@ -69,6 +69,26 @@ public:
     virtual ~DocGeneratorBase() {}
 };
 
+static const char alphabet[] = "0123456789 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+static void random_fill(std::string& str, int level) {
+    if (level > 1) {
+        for (size_t ii = 0; ii < str.size(); ii++) {
+            str[ii] = rand() % (0x7e - 0x20) + 0x20; // printable
+            switch (str[ii]) {
+            case 0x5c: // backslash
+            case 0x22: // double quote
+                str[ii]++;
+                break;
+            }
+        }
+    } else if (level > 0) {
+        for (size_t ii = 0; ii < str.size(); ii++) {
+            str[ii] = alphabet[rand() % (sizeof(alphabet) - 1)];
+        }
+    }
+}
+
 /**
  * Generator class for raw objects. This contains a fixed buffer and will
  * simply vary in how 'long' the buffer is
@@ -104,10 +124,13 @@ public:
         return ret;
     }
 
-    RawDocGenerator(uint32_t minsz, uint32_t maxsz)
+    RawDocGenerator(uint32_t minsz, uint32_t maxsz, int rnd)
     : m_sizes(gen_graded_sizes(minsz, maxsz)) {
         // Populate the buffer to its capacity
         m_buf.insert(0, maxsz, '#');
+        if (rnd) {
+            random_fill(m_buf, rnd);
+        }
     }
 
 
@@ -202,18 +225,18 @@ public:
      * @param minsz Minimum JSON document size
      * @param maxsz Maximum JSON document size
      */
-    JsonDocGenerator(uint32_t minsz, uint32_t maxsz)
+    JsonDocGenerator(uint32_t minsz, uint32_t maxsz, int rnd)
     {
-        genDocuments(minsz, maxsz, m_docs);
+        genDocuments(minsz, maxsz, m_docs, rnd);
         for (size_t ii = 0; ii < m_docs.size(); ++ii) {
             m_bufs.push_back(m_docs[ii].m_doc);
         }
     }
 
-    static void genDocuments(uint32_t minsz, uint32_t maxsz, std::vector<std::string>& out)
+    static void genDocuments(uint32_t minsz, uint32_t maxsz, std::vector<std::string>& out, int rnd)
     {
         std::vector<Doc> docs;
-        genDocuments(minsz, maxsz, docs);
+        genDocuments(minsz, maxsz, docs, rnd);
         for (size_t ii = 0; ii < docs.size(); ++ii) {
             out.push_back(docs[ii].m_doc);
         }
@@ -234,12 +257,12 @@ private:
     }
 
     static void
-    genDocuments(uint32_t minsz, uint32_t maxsz, std::vector<Doc>& out)
+    genDocuments(uint32_t minsz, uint32_t maxsz, std::vector<Doc>& out, int rnd)
     {
         std::vector<size_t> sizes = RawDocGenerator::gen_graded_sizes(minsz, maxsz);
         for (std::vector<size_t>::iterator ii = sizes.begin();
                 ii != sizes.end(); ++ii) {
-            out.push_back(generate(*ii));
+            out.push_back(generate(*ii, rnd));
         }
     }
 
@@ -249,7 +272,7 @@ private:
      * "Field_$incr" and values will be evenly distributed as fixed 16 byte
      * strings. (See JSON_VALUE_SIZE)
      */
-    static Doc generate(int docsize)
+    static Doc generate(int docsize, int rnd)
     {
         int counter = 0;
         char keybuf[128] = { 0 };
@@ -264,6 +287,9 @@ private:
                 valsize = 1;
             }
             std::string value(valsize, '*');
+            if (rnd) {
+                random_fill(value, rnd);
+            }
             decrSize(&docsize, valsize + 3);
             root[keybuf] = value;
             value = '"' + value;
@@ -424,10 +450,10 @@ public:
      * @param maxsz Maximum document size
      */
     PlaceholderJsonGenerator(uint32_t minsz, uint32_t maxsz,
-        const std::vector<TemplateSpec>& specs) {
+                             const std::vector<TemplateSpec>& specs, int rnd) {
 
         std::vector<std::string> jsondocs;
-        JsonDocGenerator::genDocuments(minsz, maxsz, jsondocs);
+        JsonDocGenerator::genDocuments(minsz, maxsz, jsondocs, rnd);
         initJsonPlaceholders(specs, jsondocs);
     }
 

data/ext/libcouchbase/tools/docgen/loc.h

@@ -191,9 +191,9 @@ public:
     dumpIovs(const std::vector<lcb_IOV>& vecs) {
         for (size_t ii = 0; ii < vecs.size(); ii++) {
             const lcb_IOV& iov = vecs[ii];
-            printf("IOV[%lu]. Buf=%p. Len=%lu. Content=%.*s\n",
-                ii, iov.iov_base, iov.iov_len,
-                (int)iov.iov_len, (const char*)iov.iov_base);
+            printf("IOV[%lu]. Buf=%p. Len=%lu. Content=%.*s\n", (unsigned long int)ii,
+                   (void *)iov.iov_base, (unsigned long int)iov.iov_len,
+                   (int)iov.iov_len, (const char*)iov.iov_base);
         }
     }
     static void
@@ -202,7 +202,8 @@ public:
             const Loc& loc = vecs[ii];
             std::string s = loc.to_string();
             printf("Loc[%lu]. Buf=%p. Len=%lu. Content=%s\n",
-                ii, (void *)loc.at, loc.length, s.c_str());
+                   (unsigned long int)ii, (void *)loc.at,
+                   (unsigned long int)loc.length, s.c_str());
         }
     }
 };

data/ext/libcouchbase/tools/docgen/seqgen.h

@@ -35,6 +35,8 @@ public:
         offset = start;
         uint32_t total = end - start;
         total_self = total / num_workers;
+        locked = std::vector<bool>(total_self, false);
+        lnum = 0;
         offset += total_self * cur_worker;
         rnum = 0;
         sequential = true;
@@ -44,6 +46,8 @@ public:
     /** Initialize as a random range */
     SeqGenerator(uint32_t start, uint32_t end) {
         total_self = end - start;
+        locked = std::vector<bool>(total_self, false);
+        lnum = 0;
         offset = start;
         rnum = 0;
         curr_seqno = 0;
@@ -78,6 +82,28 @@ public:
         }
     }
 
+    uint32_t checkout() {
+        uint32_t num;
+        num = next();
+        if (lnum == locked.size()) {
+            lnum = 0;
+            std::fill(locked.begin(), locked.end(), false);
+        } else {
+            while (locked[num - offset]) {
+                num = next();
+            }
+        }
+        locked[num - offset] = true;
+        lnum++;
+        return num;
+    }
+
+    void checkin(uint32_t num) {
+        if (num - offset < locked.size()) {
+            locked[num - offset] = 0;
+        }
+    }
+
     uint32_t maxItems() const {
         return total_self;
     }
@@ -85,6 +111,8 @@ public:
 private:
     bool sequential;
     std::vector<uint32_t> seqpool;
+    std::vector<bool> locked; // lock markers
+    uint32_t lnum; // number of locked keys
     uint32_t rnum; // internal iterator
     uint32_t offset; // beginning numerical offset
     uint32_t total_self; // maximum value of iterator

data/lib/libcouchbase/ext/libcouchbase/enums.rb

@@ -836,6 +836,16 @@ module Libcouchbase::Ext
     :generic_constraint_err, 82,
     :nameserver_error, 83,
     :not_authorized, 84,
+    :subdoc_invalid_combo, 85,
+    :subdoc_multi_path_failure, 86,
+    :subdoc_success_deleted, 87,
+    :subdoc_xattr_invalid_flag_combo, 88,
+    :subdoc_xattr_invalid_key_combo, 89,
+    :subdoc_xattr_unknown_macro, 90,
+    :subdoc_xattr_unknown_vattr, 91,
+    :subdoc_xattr_cant_modify_vattr, 92,
+    :subdoc_multi_path_failure_deleted, 93,
+    :subdoc_invalid_xattr_order, 94,
     :max_error, 4096
   ]
 

data/lib/libcouchbase/n1ql.rb

@@ -2,7 +2,12 @@
 
 module Libcouchbase
     class N1QL
-        Ordering = [:select, :insert_into, :delete_from, :update, :from, :use_keys, :unnest, :join, :where, :group_by, :order_by, :limit, :offset]
+        Ordering = [
+            :build_index, :create_index, :drop_index, :create_primary_index,
+            :drop_primary_index, :grant, :on, :to, :infer, :select, :insert_into,
+            :delete_from, :update, :from, :with, :use_keys, :unnest, :join, :where,
+            :group_by, :order_by, :limit, :offset, :upsert_into, :merge_into
+        ]
 
         def initialize(bucket, explain: false, **options)
             @bucket = bucket

data/lib/libcouchbase/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module Libcouchbase
-    VERSION = '1.2.8'
+    VERSION = '1.3.0'
 end

data/spec/connection_spec.rb

@@ -111,8 +111,8 @@ describe Libcouchbase::Connection do
         @reactor.run { |reactor|
             connection = Libcouchbase::Connection.new
             connection.connect.then do
-                expect(co(connection.configure(:operation_timeout, 1500000))).to be(connection)
-                expect { co(connection.configure(:bob, 1500000)) }.to raise_error(Libcouchbase::Error)
+                expect(connection.configure(:operation_timeout, 1500000).value).to be(connection)
+                expect { connection.configure(:bob, 1500000).value }.to raise_error(Libcouchbase::Error)
                 @log << :success
                 connection.destroy
             end
@@ -125,8 +125,8 @@ describe Libcouchbase::Connection do
         @reactor.run { |reactor|
             begin
                 connection = Libcouchbase::Connection.new
-                co connection.connect
-                @log = co(connection.get_server_list)
+                connection.connect.value
+                @log = connection.get_server_list.value
             ensure
                 connection.destroy
             end
@@ -163,9 +163,9 @@ describe Libcouchbase::Connection do
                     connection.touch('testtouch', expire_in: 1).then(proc {
                         @log << 'set'
                         sleep 2
-                        connection.get('testtouch').catch(proc {|err|
+                        connection.get('testtouch').catch do |err|
                             @log << err.is_a?(Libcouchbase::Error::KeyNotFound)
-                        })
+                        end
                     })
                 }, proc { |error|
                     @log << error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -161,7 +161,6 @@ files:
 - ext/libcouchbase/cmake/Modules/FindCouchbaseLibev.cmake
 - ext/libcouchbase/cmake/Modules/FindCouchbaseLibevent.cmake
 - ext/libcouchbase/cmake/Modules/FindCouchbaseLibuv.cmake
-- ext/libcouchbase/cmake/Modules/FindCouchbaseSnappy.cmake
 - ext/libcouchbase/cmake/Modules/GenerateConfigDotH.cmake
 - ext/libcouchbase/cmake/Modules/GetLibcouchbaseFlags.cmake
 - ext/libcouchbase/cmake/Modules/GetPlatformCCInfo.cmake
@@ -170,6 +169,7 @@ files:
 - ext/libcouchbase/cmake/configure
 - ext/libcouchbase/cmake/defs.mk.in
 - ext/libcouchbase/cmake/dtrace-instr-link.pl
+- ext/libcouchbase/cmake/libcouchbase.stp.in
 - ext/libcouchbase/cmake/source_files.cmake
 - ext/libcouchbase/contrib/cJSON/cJSON.c
 - ext/libcouchbase/contrib/cJSON/cJSON.h
@@ -184,6 +184,8 @@ files:
 - ext/libcouchbase/contrib/cbsasl/src/cram-md5/md5.h
 - ext/libcouchbase/contrib/cbsasl/src/hash.c
 - ext/libcouchbase/contrib/cbsasl/src/hash.h
+- ext/libcouchbase/contrib/cbsasl/src/scram-sha/scram_utils.c
+- ext/libcouchbase/contrib/cbsasl/src/scram-sha/scram_utils.h
 - ext/libcouchbase/contrib/cbsasl/src/util.h
 - ext/libcouchbase/contrib/cliopts/CMakeLists.txt
 - ext/libcouchbase/contrib/cliopts/cliopts.c
@@ -282,10 +284,14 @@ files:
 - ext/libcouchbase/doc/man/cbc-connstr.1
 - ext/libcouchbase/doc/man/cbc-cp.1
 - ext/libcouchbase/doc/man/cbc-create.1
+- ext/libcouchbase/doc/man/cbc-decr.1
 - ext/libcouchbase/doc/man/cbc-dsn.1
 - ext/libcouchbase/doc/man/cbc-flush.1
 - ext/libcouchbase/doc/man/cbc-hash.1
+- ext/libcouchbase/doc/man/cbc-incr.1
 - ext/libcouchbase/doc/man/cbc-lock.1
+- ext/libcouchbase/doc/man/cbc-mcflush.1
+- ext/libcouchbase/doc/man/cbc-n1ql.1
 - ext/libcouchbase/doc/man/cbc-n1qlback.1
 - ext/libcouchbase/doc/man/cbc-observe.1
 - ext/libcouchbase/doc/man/cbc-pillowfight.1
@@ -301,11 +307,20 @@ files:
 - ext/libcouchbase/doc/man/cbc-verbosity.1
 - ext/libcouchbase/doc/man/cbc-version.1
 - ext/libcouchbase/doc/man/cbc-view.1
+- ext/libcouchbase/doc/man/cbc-watch.1
 - ext/libcouchbase/doc/man/cbc.1
 - ext/libcouchbase/doc/man/cbcrc.4
 - ext/libcouchbase/doc/style.css
 - ext/libcouchbase/example/CMakeLists.txt
 - ext/libcouchbase/example/README.markdown
+- ext/libcouchbase/example/crypto/.gitignore
+- ext/libcouchbase/example/crypto/Makefile
+- ext/libcouchbase/example/crypto/common_provider.c
+- ext/libcouchbase/example/crypto/common_provider.h
+- ext/libcouchbase/example/crypto/openssl_symmetric_decrypt.c
+- ext/libcouchbase/example/crypto/openssl_symmetric_encrypt.c
+- ext/libcouchbase/example/crypto/openssl_symmetric_provider.c
+- ext/libcouchbase/example/crypto/openssl_symmetric_provider.h
 - ext/libcouchbase/example/db/db.c
 - ext/libcouchbase/example/db/vb.c
 - ext/libcouchbase/example/instancepool/main.cc
@@ -320,6 +335,12 @@ files:
 - ext/libcouchbase/example/subdoc/subdoc-simple.cc
 - ext/libcouchbase/example/subdoc/subdoc-xattrs.c
 - ext/libcouchbase/example/tick/tick.c
+- ext/libcouchbase/example/tracing/.gitignore
+- ext/libcouchbase/example/tracing/Makefile
+- ext/libcouchbase/example/tracing/cJSON.c
+- ext/libcouchbase/example/tracing/cJSON.h
+- ext/libcouchbase/example/tracing/tracing.c
+- ext/libcouchbase/example/tracing/views.c
 - ext/libcouchbase/example/users/README
 - ext/libcouchbase/example/users/users.c
 - ext/libcouchbase/example/views/views-example.cc
@@ -333,12 +354,14 @@ files:
 - ext/libcouchbase/include/libcouchbase/cntl.h
 - ext/libcouchbase/include/libcouchbase/configuration.h.in
 - ext/libcouchbase/include/libcouchbase/couchbase.h
+- ext/libcouchbase/include/libcouchbase/crypto.h
 - ext/libcouchbase/include/libcouchbase/deprecated.h
 - ext/libcouchbase/include/libcouchbase/error.h
 - ext/libcouchbase/include/libcouchbase/http.h
 - ext/libcouchbase/include/libcouchbase/iops.h
 - ext/libcouchbase/include/libcouchbase/ixmgmt.h
 - ext/libcouchbase/include/libcouchbase/kvbuf.h
+- ext/libcouchbase/include/libcouchbase/metrics.h
 - ext/libcouchbase/include/libcouchbase/n1ql.h
 - ext/libcouchbase/include/libcouchbase/pktfwd.h
 - ext/libcouchbase/include/libcouchbase/plugins/io/bsdio-inl.c
@@ -346,6 +369,7 @@ files:
 - ext/libcouchbase/include/libcouchbase/plugins/io/wsaerr.h
 - ext/libcouchbase/include/libcouchbase/subdoc.h
 - ext/libcouchbase/include/libcouchbase/sysdefs.h
+- ext/libcouchbase/include/libcouchbase/tracing.h
 - ext/libcouchbase/include/libcouchbase/vbucket.h
 - ext/libcouchbase/include/libcouchbase/views.h
 - ext/libcouchbase/include/libcouchbase/visibility.h
@@ -411,6 +435,7 @@ files:
 - ext/libcouchbase/src/config_static.h
 - ext/libcouchbase/src/connspec.cc
 - ext/libcouchbase/src/connspec.h
+- ext/libcouchbase/src/crypto.cc
 - ext/libcouchbase/src/ctx-log-inl.h
 - ext/libcouchbase/src/dns-srv.cc
 - ext/libcouchbase/src/dump.cc
@@ -456,7 +481,7 @@ files:
 - ext/libcouchbase/src/list.h
 - ext/libcouchbase/src/logging.c
 - ext/libcouchbase/src/logging.h
-- ext/libcouchbase/src/mc/compress.c
+- ext/libcouchbase/src/mc/compress.cc
 - ext/libcouchbase/src/mc/compress.h
 - ext/libcouchbase/src/mc/forward.c
 - ext/libcouchbase/src/mc/forward.h
@@ -470,6 +495,7 @@ files:
 - ext/libcouchbase/src/mcserver/negotiate.cc
 - ext/libcouchbase/src/mcserver/negotiate.h
 - ext/libcouchbase/src/mctx-helper.h
+- ext/libcouchbase/src/metrics.cc
 - ext/libcouchbase/src/n1ql/ixmgmt.cc
 - ext/libcouchbase/src/n1ql/n1ql-internal.h
 - ext/libcouchbase/src/n1ql/n1ql.cc
@@ -509,6 +535,8 @@ files:
 - ext/libcouchbase/src/retryq.h
 - ext/libcouchbase/src/ringbuffer.c
 - ext/libcouchbase/src/ringbuffer.h
+- ext/libcouchbase/src/rnd.cc
+- ext/libcouchbase/src/rnd.h
 - ext/libcouchbase/src/settings.c
 - ext/libcouchbase/src/settings.h
 - ext/libcouchbase/src/sllist-inl.h
@@ -522,6 +550,10 @@ files:
 - ext/libcouchbase/src/strcodecs/strcodecs.h
 - ext/libcouchbase/src/timings.c
 - ext/libcouchbase/src/trace.h
+- ext/libcouchbase/src/tracing/span.cc
+- ext/libcouchbase/src/tracing/threshold_logging_tracer.cc
+- ext/libcouchbase/src/tracing/tracer.cc
+- ext/libcouchbase/src/tracing/tracing-internal.h
 - ext/libcouchbase/src/utilities.c
 - ext/libcouchbase/src/vbucket/CMakeLists.txt
 - ext/libcouchbase/src/vbucket/aliases.h
@@ -554,6 +586,7 @@ files:
 - ext/libcouchbase/tests/basic/t_netbuf.cc
 - ext/libcouchbase/tests/basic/t_packet.cc
 - ext/libcouchbase/tests/basic/t_ringbuffer.cc
+- ext/libcouchbase/tests/basic/t_scram.cc
 - ext/libcouchbase/tests/basic/t_slist.cc
 - ext/libcouchbase/tests/basic/t_strerror.cc
 - ext/libcouchbase/tests/basic/t_urlencode.cc
@@ -595,6 +628,7 @@ files:
 - ext/libcouchbase/tests/iotests/t_sched.cc
 - ext/libcouchbase/tests/iotests/t_serverops.cc
 - ext/libcouchbase/tests/iotests/t_smoke.cc
+- ext/libcouchbase/tests/iotests/t_snappy.cc
 - ext/libcouchbase/tests/iotests/t_subdoc.cc
 - ext/libcouchbase/tests/iotests/t_syncmode.cc
 - ext/libcouchbase/tests/iotests/t_views.cc
@@ -650,7 +684,6 @@ files:
 - ext/libcouchbase/tools/cbc.cc
 - ext/libcouchbase/tools/common/histogram.cc
 - ext/libcouchbase/tools/common/histogram.h
-- ext/libcouchbase/tools/common/my_inttypes.h
 - ext/libcouchbase/tools/common/options.cc
 - ext/libcouchbase/tools/common/options.h
 - ext/libcouchbase/tools/docgen/docgen.h