libcouchbase 0.0.4 → 0.0.5

data/ext/libcouchbase/src/mcserver/negotiate.h

@@ -109,7 +109,7 @@ mc_sess_get_saslmech(mc_pSESSINFO info);
  * @return true if supported, false otherwise
  */
 int
-mc_sess_chkfeature(mc_pSESSINFO info, lcb_U16 feature);
+mc_sess_chkfeature(mc_pSESSINFO info, uint16_t feature);
 
 /**@}*/
 

data/ext/libcouchbase/src/n1ql/params.cc

@@ -105,7 +105,7 @@ lcb_n1p_setconsistent_token(lcb_N1QLPARAMS *params,
     }
 
     params->root["scan_consistency"] = "at_plus";
-    encode_mutation_token(params->root["scan_vector"][keyspace], sv);
+    encode_mutation_token(params->root["scan_vectors"][keyspace], sv);
     return LCB_SUCCESS;
 }
 

data/ext/libcouchbase/src/packetutils.h

@@ -18,10 +18,11 @@
 #ifndef LCB_PACKETUTILS_H
 #define LCB_PACKETUTILS_H
 
+#include "config.h"
+
 #include <libcouchbase/couchbase.h>
-#include "ringbuffer.h"
+#include <memcached/protocol_binary.h>
 #include "rdb/rope.h"
-#include "memcached/protocol_binary.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -142,6 +143,91 @@ lcb_pktinfo_ior_done(packet_info *info, rdb_IOROPE *ior);
 
 #ifdef __cplusplus
 }
+
+
+namespace lcb {
+
+class MemcachedRequest {
+public:
+    /**
+     * Declare the extras, key, and value size for the packet
+     * @param extlen Length of extras
+     * @param keylen Length of key
+     * @param valuelen Length of value (i.e. minus extras and key)
+     */
+    void sizes(uint8_t extlen, uint16_t keylen, uint32_t valuelen) {
+        hdr.request.bodylen = htonl(extlen + keylen + valuelen);
+        hdr.request.keylen = htons(keylen);
+        hdr.request.extlen = extlen;
+    }
+
+    void vbucket(uint16_t vb) {
+        hdr.request.vbucket = htons(vb);
+    }
+
+    void opaque(uint32_t opaque_) {
+        hdr.request.opaque = opaque_;
+    }
+
+    MemcachedRequest(uint8_t opcode) {
+        hdr.request.opcode = opcode;
+        hdr.request.magic = PROTOCOL_BINARY_REQ;
+        hdr.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
+        hdr.request.cas = 0;
+        hdr.request.vbucket = 0;
+        hdr.request.opaque = 0;
+        hdr.request.bodylen = 0;
+        hdr.request.extlen = 0;
+        hdr.request.keylen = 0;
+        hdr.request.opaque = 0;
+    }
+
+    const void *data() const { return hdr.bytes; }
+    size_t size() const { return sizeof hdr.bytes; }
+
+private:
+    protocol_binary_request_header hdr;
+};
+
+class MemcachedResponse : private packet_info {
+public:
+    bool load(rdb_IOROPE *ior, unsigned *required) {
+        return lcb_pktinfo_ior_get(this, ior, required) != 0;
+    }
+
+    template <typename T>
+    bool load(T ctx, unsigned *required) {
+        return lcb_pktinfo_ectx_get(this, ctx, required);
+    }
+
+    void release(rdb_IOROPE *ior) {
+        lcb_pktinfo_ior_done(this, ior);
+    }
+
+    template <typename T>
+    void release(T ctx) {
+        lcb_pktinfo_ectx_done(this, ctx);
+    }
+
+    uint8_t opcode() const {
+        return PACKET_OPCODE(this);
+    }
+
+    uint16_t status() const {
+        return PACKET_STATUS(this);
+    }
+
+    template <typename T>
+    const T body() const {
+        return reinterpret_cast<const T>(packet_info::payload);
+    }
+
+    size_t bodylen() const {
+        return PACKET_NBODY(this);
+    }
+};
+
+}
 #endif
 
 #endif

data/ext/libcouchbase/tests/iotests/t_misc.cc

@@ -20,6 +20,7 @@
 #include <climits>
 #include <algorithm>
 #include "internal.h" /* vbucket_* things from lcb_t */
+#include "auth-priv.h"
 #include <lcbio/iotable.h>
 #include "bucketconfig/bc_http.h"
 
@@ -711,3 +712,22 @@ TEST_F(MockUnitTest, testEmptyCtx)
     err = mctx->done(mctx, NULL);
     ASSERT_NE(LCB_SUCCESS, err);
 }
+
+TEST_F(MockUnitTest, testMultiCreds)
+{
+    using lcb::Authenticator;
+
+    HandleWrap hw;
+    lcb_t instance;
+    createConnection(hw, instance);
+
+    lcb_BUCKETCRED cred;
+    cred[0] = "protected";
+    cred[1] = "secret";
+    lcb_error_t rc = lcb_cntl(instance, LCB_CNTL_SET, LCB_CNTL_BUCKET_CRED, cred);
+    ASSERT_EQ(LCB_SUCCESS, rc);
+    Authenticator& auth = *instance->settings->auth;
+    lcb::Authenticator::Map::const_iterator res = auth.buckets().find("protected");
+    ASSERT_NE(auth.buckets().end(), res);
+    ASSERT_EQ("secret", res->second);
+}

data/ext/libcouchbase/tools/cbc-handlers.h

@@ -223,11 +223,11 @@ public:
         o_expiry.abbrev('e').description("Expiration time for key");
     }
 protected:
-    cliopts::UIntOption o_initial;
-    cliopts::IntOption o_delta;
+    cliopts::ULongLongOption o_initial;
+    cliopts::ULongLongOption o_delta;
     cliopts::UIntOption o_expiry;
     void run();
-    virtual int64_t getDelta() = 0;
+    virtual bool shouldInvert() const = 0;
     void addOptions() {
         Handler::addOptions();
         parser.addOption(o_initial);
@@ -243,7 +243,7 @@ public:
         o_delta.description("Amount to increment by");
     }
 protected:
-    int64_t getDelta() { return o_delta.result(); }
+    bool shouldInvert() const { return false; }
 };
 
 class DecrHandler : public ArithmeticHandler {
@@ -253,7 +253,7 @@ public:
         o_delta.description("Amount to decrement by");
     }
 protected:
-    int64_t getDelta() { return o_delta.result() * -1; }
+    bool shouldInvert() const { return true; }
 };
 
 class ViewsHandler : public Handler {

data/ext/libcouchbase/tools/cbc.cc

@@ -1,3 +1,4 @@
+#define NOMINMAX
 #include "common/my_inttypes.h"
 #include <map>
 #include <sstream>
@@ -7,6 +8,7 @@
 #include <libcouchbase/vbucket.h>
 #include <libcouchbase/views.h>
 #include <libcouchbase/n1ql.h>
+#include <limits>
 #include <stddef.h>
 #include "common/options.h"
 #include "common/histogram.h"
@@ -907,7 +909,14 @@ ArithmeticHandler::run()
             cmd.create = 1;
             cmd.initial = o_initial.result();
         }
-        cmd.delta = getDelta();
+        uint64_t delta = o_delta.result();
+        if (delta > std::numeric_limits<int64_t>::max()) {
+            throw BadArg("Delta too big");
+        }
+        cmd.delta = static_cast<int64_t>(delta);
+        if (shouldInvert()) {
+            cmd.delta *= -1;
+        }
         cmd.exptime = o_expiry.result();
         lcb_error_t err = lcb_counter3(instance, NULL, &cmd);
         if (err != LCB_SUCCESS) {

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

@@ -107,7 +107,7 @@ public:
     RawDocGenerator(uint32_t minsz, uint32_t maxsz)
     : m_sizes(gen_graded_sizes(minsz, maxsz)) {
         // Populate the buffer to its capacity
-        m_buf.insert(0, '#', maxsz);
+        m_buf.insert(0, maxsz, '#');
     }
 
 

data/lib/libcouchbase/bucket.rb

@@ -12,12 +12,13 @@ module Libcouchbase
         # http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
         def self.finalize(connection)
             proc {
+                connection.reactor.unref
                 connection.destroy
-                @connection.reactor.unref
             }
         end
 
         def initialize(**options)
+            @connection_options = options
             @connection = Connection.new(**options)
             connect
 
@@ -778,10 +779,21 @@ module Libcouchbase
 
             connecting.synchronize {
                 Thread.new do
-                    @connection.reactor.run do
-                        @connection.reactor.ref
+                    @connection.reactor.run do |reactor|
+                        reactor.ref
+
+                        attempt = 0
                         begin
                             co @connection.connect
+                        rescue Libcouchbase::Error::ConnectError => e
+                            attempt += 1
+                            if attempt < 3
+                                reactor.sleep 100
+                                # Requires a new connection object or the retry will always fail
+                                @connection = Connection.new(**@connection_options)
+                                retry
+                            end
+                            error = e
                         rescue => e
                             error = e
                         end
@@ -804,10 +816,21 @@ module Libcouchbase
             error = nil
 
             Thread.new do
-                @connection.reactor.run do
-                    @connection.reactor.ref
+                @connection.reactor.run do |reactor|
+                    reactor.ref
+
+                    attempt = 0
                     begin
                         co @connection.connect
+                    rescue Libcouchbase::Error::ConnectError => e
+                        attempt += 1
+                        if attempt < 3
+                            reactor.sleep 100
+                            # Requires a new connection object or the retry will always fail
+                            @connection = Connection.new(**@connection_options)
+                            retry
+                        end
+                        error = e
                     rescue => e
                         error = e
                     end

data/lib/libcouchbase/connection.rb

@@ -753,7 +753,13 @@ module Libcouchbase
                     view.received(row_data)
                 end
             else
-                view.error Error.lookup(row_data[:rc]).new
+                error_klass = Error.lookup(row_data[:rc])
+                if error_klass == Error::HttpError
+                    http_resp = row_data[:htresp]
+                    view.error error_klass.new(http_resp[:body].read_string(http_resp[:nbody]))
+                else
+                    view.error error_klass.new
+                end
             end
         end
 
@@ -783,7 +789,13 @@ module Libcouchbase
                     view.received(value)
                 end
             else
-                view.error Error.lookup(row_data[:rc]).new
+                error_klass = Error.lookup(row_data[:rc])
+                if error_klass == Error::HttpError
+                    http_resp = row_data[:htresp]
+                    view.error error_klass.new(http_resp[:body].read_string(http_resp[:nbody]))
+                else
+                    view.error error_klass.new
+                end
             end
         end
     end

data/lib/libcouchbase/version.rb

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

data/spec/bucket_spec.rb

@@ -11,6 +11,12 @@ describe Libcouchbase::Bucket do
         @log = []
     end
 
+    after :each do
+        @bucket = nil
+        @reactor = nil
+        @log = nil
+    end
+
     describe 'reactor loop' do
         it "should set a value" do
             @reactor.run { |reactor|

data/spec/connection_spec.rb

@@ -10,6 +10,11 @@ describe Libcouchbase::Connection do
         @reactor = ::Libuv::Reactor.default
     end
 
+    after :each do
+        @reactor = nil
+        @log = nil
+    end
+
     it "should connect and disconnect from the default bucket" do
         @reactor.run { |reactor|
             connection = Libcouchbase::Connection.new

data/spec/fts_spec.rb

@@ -11,6 +11,12 @@ describe Libcouchbase::QueryFullText, full_text_search: true do
         @log = []
     end
 
+    after :each do
+        @bucket = nil
+        @reactor = nil
+        @log = nil
+    end
+
     describe 'perform native queries' do
         it "should iterate a full text search with results" do
             results = @bucket.full_text_search(:default, 'Toshiba')

data/spec/n1ql_spec.rb

@@ -10,6 +10,11 @@ describe Libcouchbase::N1QL, n1ql_query: true do
         @log = []
     end
 
+    after :each do
+        @bucket = nil
+        @log = nil
+    end
+
     it "should build a basic query" do
         @n1ql.select('*').from(:default).where('port == 10001')
         expect(@n1ql.to_s).to eq("SELECT *\nFROM default\nWHERE port == 10001\n")

data/spec/view_spec.rb

@@ -11,6 +11,12 @@ describe Libcouchbase::QueryView do
         @log = []
     end
 
+    after :each do
+        @bucket = nil
+        @reactor = nil
+        @log = nil
+    end
+
     describe 'perform native queries' do
         it "should iterate a view" do
             view = @bucket.view('zone', 'all')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -407,8 +407,6 @@ files:
 - ext/libcouchbase/src/getconfig.c
 - ext/libcouchbase/src/gethrtime.c
 - ext/libcouchbase/src/handler.c
-- ext/libcouchbase/src/hashset.c
-- ext/libcouchbase/src/hashset.h
 - ext/libcouchbase/src/hashtable.c
 - ext/libcouchbase/src/hdr_timings.c
 - ext/libcouchbase/src/hostlist.cc
@@ -456,7 +454,7 @@ files:
 - ext/libcouchbase/src/mc/mcreq.h
 - ext/libcouchbase/src/mcserver/mcserver.c
 - ext/libcouchbase/src/mcserver/mcserver.h
-- ext/libcouchbase/src/mcserver/negotiate.c
+- ext/libcouchbase/src/mcserver/negotiate.cc
 - ext/libcouchbase/src/mcserver/negotiate.h
 - ext/libcouchbase/src/n1ql/ixmgmt.cc
 - ext/libcouchbase/src/n1ql/n1ql-internal.h
@@ -535,7 +533,6 @@ files:
 - ext/libcouchbase/tests/basic/t_connstr.cc
 - ext/libcouchbase/tests/basic/t_creds.cc
 - ext/libcouchbase/tests/basic/t_ctlcodes.cc
-- ext/libcouchbase/tests/basic/t_hashset.cc
 - ext/libcouchbase/tests/basic/t_host.cc
 - ext/libcouchbase/tests/basic/t_jsparse.cc
 - ext/libcouchbase/tests/basic/t_jsparse.h

data/ext/libcouchbase/src/hashset.c

@@ -1,164 +0,0 @@
-/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- *     Copyright 2012 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 "internal.h"
-
-static const unsigned int prime_1 = 73;
-static const unsigned int prime_2 = 5009;
-
-hashset_t hashset_create()
-{
-    hashset_t set = calloc(1, sizeof(struct hashset_st));
-
-    if (set == NULL) {
-        return NULL;
-    }
-    set->nbits = 3;
-    set->capacity = (lcb_size_t)(1 << set->nbits);
-    set->mask = set->capacity - 1;
-    set->items = calloc(set->capacity, sizeof(lcb_size_t));
-    if (set->items == NULL) {
-        hashset_destroy(set);
-        return NULL;
-    }
-    set->nitems = 0;
-    return set;
-}
-
-lcb_size_t hashset_num_items(hashset_t set)
-{
-    return set->nitems;
-}
-
-void hashset_destroy(hashset_t set)
-{
-    if (set) {
-        free(set->items);
-    }
-    free(set);
-}
-
-static int hashset_add_member(hashset_t set, void *item)
-{
-    lcb_size_t value = (lcb_size_t)item;
-    lcb_size_t ii;
-
-    if (value == 0 || value == 1) {
-        return -1;
-    }
-
-    ii = set->mask & (prime_1 * value);
-
-    while (set->items[ii] != 0 && set->items[ii] != 1) {
-        if (set->items[ii] == value) {
-            return 0;
-        } else {
-            /* search free slot */
-            ii = set->mask & (ii + prime_2);
-        }
-    }
-    set->nitems++;
-    set->items[ii] = value;
-    return 1;
-}
-
-static void maybe_rehash(hashset_t set)
-{
-    lcb_size_t *old_items;
-    lcb_size_t old_capacity, ii;
-
-
-    if ((float)set->nitems >= (lcb_size_t)((double)set->capacity * 0.85)) {
-        old_items = set->items;
-        old_capacity = set->capacity;
-        set->nbits++;
-        set->capacity = (lcb_size_t)(1 << set->nbits);
-        set->mask = set->capacity - 1;
-        set->items = calloc(set->capacity, sizeof(lcb_size_t));
-        set->nitems = 0;
-        lcb_assert(set->items);
-        for (ii = 0; ii < old_capacity; ii++) {
-            hashset_add_member(set, (void *)old_items[ii]);
-        }
-        free(old_items);
-    }
-}
-
-int hashset_add(hashset_t set, void *item)
-{
-    int rv = hashset_add_member(set, item);
-    maybe_rehash(set);
-    return rv;
-}
-
-int hashset_remove(hashset_t set, void *item)
-{
-    lcb_size_t value = (lcb_size_t)item;
-    lcb_size_t ii = set->mask & (prime_1 * value);
-
-    while (set->items[ii] != 0) {
-        if (set->items[ii] == value) {
-            set->items[ii] = 1;
-            set->nitems--;
-            return 1;
-        } else {
-            ii = set->mask & (ii + prime_2);
-        }
-    }
-    return 0;
-}
-
-int hashset_is_member(hashset_t set, void *item)
-{
-    lcb_size_t value = (lcb_size_t)item;
-    lcb_size_t ii = set->mask & (prime_1 * value);
-
-    while (set->items[ii] != 0) {
-        if (set->items[ii] == value) {
-            return 1;
-        } else {
-            ii = set->mask & (ii + prime_2);
-        }
-    }
-    return 0;
-}
-
-void **hashset_get_items(hashset_t set, void **itemlist)
-{
-    lcb_size_t ii, oix;
-
-    if (!set->nitems) {
-        return NULL;
-    }
-
-    if (!itemlist) {
-        itemlist = malloc(set->nitems * sizeof(void *));
-        if (!itemlist) {
-            return NULL;
-        }
-    }
-
-    for (ii = 0, oix = 0; ii < set->capacity; ii++) {
-
-        if (set->items[ii] > 1) {
-            itemlist[oix] = (void *)set->items[ii];
-            oix++;
-        }
-    }
-
-    return itemlist;
-}