libcouchbase 0.0.9 → 0.1.0

data/ext/libcouchbase/tests/iotests/mock-environment.h

@@ -71,7 +71,8 @@ class MockCommand
     X(GET_MCPORTS) \
     X(SET_CCCP) \
     X(REGEN_VBCOORDS) \
-    X(RESET_QUERYSTATE)
+    X(RESET_QUERYSTATE) \
+    X(OPFAIL)
 
 public:
     enum Code {

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

@@ -141,14 +141,13 @@ TEST_F(ConfmonTest, testCycle)
     Provider *cccp = mon->get_provider(CLCONFIG_CCCP);
     Provider *http = mon->get_provider(CLCONFIG_HTTP);
 
-    hostlist_t hl = hostlist_create();
-    hostlist_add_stringz(hl, cropts.v.v2.mchosts, 11210);
+    lcb::Hostlist hl;
+    hl.add(cropts.v.v2.mchosts, 11210);
     cccp->enable(instance);
-    cccp->configure_nodes(*hl);
+    cccp->configure_nodes(hl);
 
     http->enable();
     http->configure_nodes(*instance->ht_nodes);
-    hostlist_destroy(hl);
 
     mon->prepare();
     mon->start();

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

@@ -0,0 +1,97 @@
+#include "config.h"
+#include "iotests.h"
+#include "internal.h"
+#include <map>
+
+class ErrmapUnitTest : public MockUnitTest {
+protected:
+    virtual void createErrmapConnection(HandleWrap& hw, lcb_t& instance) {
+        MockEnvironment::getInstance()->createConnection(hw, instance);
+        ASSERT_EQ(LCB_SUCCESS, lcb_cntl_string(instance, "enable_errmap", "true"));
+        ASSERT_EQ(LCB_SUCCESS, lcb_connect(instance));
+        lcb_wait(instance);
+        ASSERT_EQ(LCB_SUCCESS, lcb_get_bootstrap_status(instance));
+    }
+};
+
+struct ResultCookie {
+    lcb_error_t rc;
+    bool called;
+
+    void reset() {
+        rc = LCB_SUCCESS;
+        called = false;
+    }
+    ResultCookie() : rc(LCB_SUCCESS), called(false) {
+    }
+};
+
+extern "C" {
+static void opcb(lcb_t,int,const lcb_RESPBASE* rb) {
+    ResultCookie *cookie = reinterpret_cast<ResultCookie*>(rb->cookie);
+    cookie->called = true;
+    cookie->rc = rb->rc;
+}
+}
+
+TEST_F(ErrmapUnitTest, hasRecognizedErrors) {
+    SKIP_UNLESS_MOCK();
+    HandleWrap hw;
+    lcb_t instance;
+
+    createErrmapConnection(hw, instance);
+
+    // Test the actual error map..
+    using namespace lcb;
+    const errmap::ErrorMap& em = *instance->settings->errmap;
+    const errmap::Error& err = em.getError(PROTOCOL_BINARY_RESPONSE_KEY_ENOENT);
+    ASSERT_TRUE(err.isValid());
+    ASSERT_TRUE(err.hasAttribute(errmap::CONSTRAINT_FAILURE));
+}
+
+TEST_F(ErrmapUnitTest, closesOnUnrecognizedError) {
+    // For now, EINTERNAL is an error code we don't know!
+    SKIP_UNLESS_MOCK();
+    HandleWrap hw;
+    lcb_t instance;
+    createErrmapConnection(hw, instance);
+
+    const char *key = "key";
+    lcb_CMDSTORE scmd = { 0 };
+    LCB_CMD_SET_KEY(&scmd, key, strlen(key));
+    LCB_CMD_SET_VALUE(&scmd, "val", 3);
+
+    ResultCookie cookie;
+    lcb_install_callback3(instance, LCB_CALLBACK_STORE, opcb);
+    ASSERT_EQ(LCB_SUCCESS, lcb_store3(instance, &cookie, &scmd));
+    lcb_wait(instance);
+    ASSERT_EQ(LCB_SUCCESS, cookie.rc);
+
+    MockCommand cmd(MockCommand::OPFAIL);
+
+    // Determine the server
+    int srvix = instance->map_key(key);
+
+    cmd.set("server", srvix);
+    cmd.set("code", PROTOCOL_BINARY_RESPONSE_EINTERNAL); // Invalidate the connection!
+    cmd.set("count", 1);
+    doMockTxn(cmd);
+
+    cookie.reset();
+    ASSERT_EQ(LCB_SUCCESS, lcb_store3(instance, &cookie, &scmd));
+    lcb_wait(instance);
+
+    ASSERT_TRUE(cookie.called);
+    ASSERT_NE(LCB_SUCCESS, cookie.rc);
+
+    cookie.reset();
+    ASSERT_EQ(LCB_SUCCESS, lcb_store3(instance, &cookie, &scmd));
+    lcb_wait(instance);
+    ASSERT_TRUE(cookie.called);
+
+    // Note, we can't determine what the actual error here is. It would be nice
+    // if we were able to reconnect and retry the other commands, but right now
+    // detecting a failed connection is better than having no detection at all:
+    //
+    // ASSERT_EQ(LCB_SUCCESS, cookie.rc);
+}

data/lib/libcouchbase/bucket.rb

@@ -24,7 +24,7 @@ module Libcouchbase
 
             # This obtains the connections reactor
             @reactor = reactor
-            @quiet = true
+            @quiet = false
 
             # clean up the connection once this object is garbage collected
             ObjectSpace.define_finalizer( self, self.class.finalize(@connection) )
@@ -157,7 +157,11 @@ module Libcouchbase
                 }), async)
             end
         end
-        alias_method :[], :get
+
+        # Quietly obtain an object stored in Couchbase by given key. 
+        def [](key)
+            get(key, quiet: true)
+        end
 
         # Add the item to the database, but fail if the object exists already
         #
@@ -495,7 +499,7 @@ module Libcouchbase
         #   res = c.set("foo", "bar")       #=> #<struct Libcouchbase::Response callback=:callback_set, key="foo", cas=1975457268957184, value="bar", metadata={:format=>:document, :flags=>0}>
         #   c.delete("foo", cas: 123456)    #=> will raise Libcouchbase::Error::KeyExists
         #   c.delete("foo", cas: res.cas)   #=> true
-        def delete(key, async: false, quiet: @quiet, **opts)
+        def delete(key, async: false, quiet: true, **opts)
             promise = @connection.remove(key, **opts).then { true }
             if quiet
                 promise = promise.catch { |error|
@@ -654,7 +658,7 @@ module Libcouchbase
         # @param [String, Symbol] key
         #
         # @param [Hash] options the options for "swap" part
-        # @option options [Fixnum] :retry (0) maximum number of times to autmatically retry upon update collision
+        # @option options [Integer] :retry (0) maximum number of times to autmatically retry upon update collision
         #
         # @yieldparam [Object] value existing value
         # @yieldreturn [Object] new value.
@@ -727,7 +731,7 @@ module Libcouchbase
                 @connection.reactor.next_tick do
                     begin
                         response = co(promise)
-                    rescue => e
+                    rescue Exception => e
                         error = e
                     end
 
@@ -738,7 +742,7 @@ module Libcouchbase
 
                 Fiber.yield
 
-                raise error if error
+                update_backtrace(error) if error
                 response
             else
                 request = Mutex.new
@@ -750,7 +754,7 @@ module Libcouchbase
                     @connection.reactor.next_tick do
                         begin
                             response = co(promise)
-                        rescue => e
+                        rescue Exception => e
                             error = e
                         end
 
@@ -762,7 +766,7 @@ module Libcouchbase
                     result.wait(request)
                 }
 
-                raise error if error
+                update_backtrace(error) if error
                 response
             end
         end
@@ -801,7 +805,7 @@ module Libcouchbase
                                 retry
                             end
                             error = e
-                        rescue => e
+                        rescue Exception => e
                             error = e
                         end
 
@@ -814,7 +818,7 @@ module Libcouchbase
                 result.wait(connecting)
             }
 
-            raise error if error
+            update_backtrace(error) if error
         end
 
         # Assume this is being run in em-synchrony
@@ -838,7 +842,7 @@ module Libcouchbase
                             retry
                         end
                         error = e
-                    rescue => e
+                    rescue Exception => e
                         error = e
                     end
 
@@ -850,7 +854,18 @@ module Libcouchbase
 
             Fiber.yield
 
-            raise error if error
+            update_backtrace(error) if error
+        end
+
+        def update_backtrace(error)
+            backtrace = caller
+            backtrace.shift(2)
+            if error.respond_to?(:backtrace) && error.backtrace
+                backtrace << '---- continuation ----'
+                backtrace.concat(error.backtrace)
+            end
+            error.set_backtrace(backtrace)
+            raise error
         end
     end
 end

data/lib/libcouchbase/callbacks.rb

@@ -47,7 +47,7 @@ module Libcouchbase
 
         def self.included(base)
             base.instance_variable_set(:@callback_funcs, {})
-            base.instance_variable_set(:@callback_lookup, ::Concurrent::Map.new)
+            base.instance_variable_set(:@callback_lookup, ::Concurrent::Hash.new)
             base.instance_variable_set(:@callback_lock, ::Mutex.new)
             base.extend(ClassMethods)
         end

data/lib/libcouchbase/connection.rb

@@ -3,6 +3,15 @@
 require 'json'
 
 
+at_exit do
+    ObjectSpace.each_object(::Libcouchbase::Connection).each do |connection|
+        connection.destroy.finally do
+            connection.reactor.stop
+        end
+    end
+end
+
+
 module Libcouchbase
     Response = Struct.new(:callback, :key, :cas, :value, :metadata)
     HttpResponse = Struct.new(:callback, :status, :headers, :body, :request)
@@ -176,12 +185,16 @@ module Libcouchbase
             # Ensure it is thread safe
             @reactor.schedule {
                 if @handle
-                    resp = Ext.get_server_list(@handle)
-                    if resp.null?
-                        defer.reject(RuntimeError.new('not connected'))
-                    else
-                        defer.resolve(resp.get_array_of_string(0))
+                    nodes = Ext.get_num_nodes(@handle)
+                    list = []
+                    count = 0
+                    
+                    while count <= nodes
+                        list << Ext.get_node(@handle, :node_data, count)
+                        count += 1
                     end
+
+                    defer.resolve(list.uniq)
                 else
                     defer.reject(RuntimeError.new('not connected'))
                 end

data/lib/libcouchbase/version.rb

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

data/spec/connection_spec.rb

@@ -157,7 +157,7 @@ describe Libcouchbase::Connection do
             end
         }
 
-        expect(@log).to eq(['127.0.0.1:8091'])
+        expect(@log).to eq(['127.0.0.1:11210'])
     end
 
     it "should support counter operations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -404,6 +404,8 @@ files:
 - ext/libcouchbase/src/ctx-log-inl.h
 - ext/libcouchbase/src/dns-srv.cc
 - ext/libcouchbase/src/dump.cc
+- ext/libcouchbase/src/errmap.cc
+- ext/libcouchbase/src/errmap.h
 - ext/libcouchbase/src/getconfig.cc
 - ext/libcouchbase/src/gethrtime.c
 - ext/libcouchbase/src/handler.cc
@@ -566,6 +568,7 @@ files:
 - ext/libcouchbase/tests/iotests/t_configcache.cc
 - ext/libcouchbase/tests/iotests/t_confmon.cc
 - ext/libcouchbase/tests/iotests/t_durability.cc
+- ext/libcouchbase/tests/iotests/t_errmap.cc
 - ext/libcouchbase/tests/iotests/t_forward.cc
 - ext/libcouchbase/tests/iotests/t_get.cc
 - ext/libcouchbase/tests/iotests/t_http.cc