libcouchbase 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0ccfc76f819e532d866eb5696c4e442341ec00
-  data.tar.gz: d35f2ff5a08bd9c7e8b6909cca6ce3b0460f0772
+  metadata.gz: d2b2adec3e51e4e60b6c916abc6ec9b3ab4fabe8
+  data.tar.gz: 2ab400fc7fa882756081614ca99db819e7c04534
 SHA512:
-  metadata.gz: cd66d502e5a684b84b46b33539cbf73fe5571a086131d08114c1974a36b836e606b2605d349ed6f5c54db842f2bd65fa1457888adc645e4f92f52c858e15a7c5
-  data.tar.gz: 65c567b06e3b65480c9d4876b5c56c54015f94c99630cf49d6a5b6626c79a4787d16783225c288539617e3437f6c4280864c58bcb1b1ce3ad992c6629d1b6542
+  metadata.gz: 01eedef8aeeedebdcd998a40542023d7fe50e0121f5848ca4635b38af977ff8f512e2f002fb092216787b831bc80c834dd15ed743b777c9ea2bfd4904a604eeb
+  data.tar.gz: 310f7f69fb77f03b50c9f6f626a9b76cf9ce9913e69471d9a4629e06eedd53af2b548e04740dc2ac1ce398371a077fd7a3eadf148e65539e2d97f30174c6a708

data/ext/libcouchbase/plugins/io/libuv/plugin-internal.h

@@ -145,4 +145,8 @@ typedef struct {
   typedef size_t lcb_uvbuf_len_t;
 #endif
 
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
 #endif

data/ext/libcouchbase/plugins/io/libuv/plugin-libuv.c

@@ -232,6 +232,7 @@ static lcb_sockdata_t *create_socket(lcb_io_opt_t iobase,
     }
 
     uv_tcp_init(io->loop, &ret->tcp.t);
+    ret->base.socket = INVALID_SOCKET;
 
     incref_iops(io);
     incref_sock(ret);
@@ -328,6 +329,7 @@ static int start_connect(lcb_io_opt_t iobase,
     my_uvreq_t *uvr;
     int ret;
     int err_is_set = 0;
+    uv_os_fd_t fd = INVALID_SOCKET;
 
     uvr = alloc_uvreq(sock, (generic_callback_t)callback);
     if (!uvr) {
@@ -363,6 +365,13 @@ static int start_connect(lcb_io_opt_t iobase,
         incref_sock(sock);
     }
 
+    /* Fetch socket descriptor for internal usage.
+     * For example to detect dead sockets. */
+    ret = uv_fileno((uv_handle_t *)&sock->tcp, &fd);
+    if (ret == 0) {
+        sock->base.socket = fd;
+    }
+
     return ret;
 }
 
@@ -610,6 +619,48 @@ static void set_last_error(my_iops_t *io, int error)
     io->base.v.v1.error = uvc_last_errno(io->loop, error);
 }
 
+static int check_closed(lcb_io_opt_t io, lcb_sockdata_t *sockbase, int flags)
+{
+    my_sockdata_t *sd = (my_sockdata_t *)sockbase;
+
+    char buf = 0;
+    int rv = 0;
+    lcb_socket_t sock = sd->base.socket;
+
+    if (sock == INVALID_SOCKET) {
+        return LCB_IO_SOCKCHECK_STATUS_UNKNOWN;
+    }
+
+GT_RETRY:
+    /* We can ignore flags for now, since both Windows and POSIX support MSG_PEEK */
+    rv = recv(sock, &buf, 1, MSG_PEEK);
+    if (rv == 1) {
+        if (flags & LCB_IO_SOCKCHECK_PEND_IS_ERROR) {
+            return LCB_IO_SOCKCHECK_STATUS_CLOSED;
+        } else {
+            return LCB_IO_SOCKCHECK_STATUS_OK;
+        }
+    } else if (rv == 0) {
+        /* Really closed! */
+        return LCB_IO_SOCKCHECK_STATUS_CLOSED;
+    } else {
+        int last_err;
+#ifdef _WIN32
+        last_err = get_wserr(sock);
+#else
+        last_err = errno;
+#endif
+
+        if (last_err == EINTR) {
+            goto GT_RETRY;
+        } else if (last_err == EWOULDBLOCK || last_err == EAGAIN) {
+            return LCB_IO_SOCKCHECK_STATUS_OK; /* Nothing to report. So we're good */
+        } else {
+            return LCB_IO_SOCKCHECK_STATUS_CLOSED;
+        }
+    }
+}
+
 static void wire_iops2(int version,
                        lcb_loop_procs *loop,
                        lcb_timer_procs *timer,
@@ -635,6 +686,7 @@ static void wire_iops2(int version,
     iocp->read2 = start_read;
     iocp->write2 = start_write2;
     iocp->cntl = cntl_socket;
+    iocp->is_closed = check_closed;
 
     /** Stuff we don't use */
     iocp->write = NULL;

data/ext/libcouchbase/tests/socktests/t_manager.cc

@@ -42,25 +42,6 @@ TEST_F(SockMgrTest, testCancellation)
 // See if a connection closed when it was idle is returned or not!
 TEST_F(SockMgrTest, testIdleClosed)
 {
-    struct lcb_cntl_iops_info_st info = { 0 };
-    lcb_error_t err = lcb_cntl(NULL,
-        LCB_CNTL_GET, LCB_CNTL_IOPS_DEFAULT_TYPES, &info);
-
-    ASSERT_EQ(LCB_SUCCESS, err);
-    switch (info.v.v0.effective) {
-        case LCB_IO_OPS_SELECT:
-        case LCB_IO_OPS_LIBEV:
-        case LCB_IO_OPS_LIBEVENT:
-        case LCB_IO_OPS_WINIOCP:
-            break;
-
-        case LCB_IO_OPS_LIBUV:
-        default:
-            fprintf(stderr, "SockMgrTest::testIdleClosed: IOPS Type=0x%x does not have a known check_closed. Skipping\n", info.v.v0.effective);
-            return;
-    }
-
-
     lcb_socket_t llfd;
     ESocket *sock1 = new ESocket();
     loop->connectPooled(sock1);

data/lib/libcouchbase/bucket.rb

@@ -571,11 +571,17 @@ module Libcouchbase
             id ||= attrs.delete(:_id)
             id = id.to_s.sub(/^_design\//, '')
 
-            result @connection.http("/_design/#{id}",
+            prom = @connection.http("/_design/#{id}",
                 method: :put,
                 body: attrs,
                 type: :view
-            ), async
+            ).then { |res|
+                # Seems to require a moment before the view is usable
+                @reactor.sleep 100
+                res
+            }
+
+            result prom, async
         end
 
         # Delete design doc with given id and optional revision.

data/lib/libcouchbase/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcouchbase
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi