couchbase 1.3.12-x86-mingw32 → 1.3.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6726230fdefad258e78c036ac703eda02499941d
-  data.tar.gz: 9d2924510ded2ac99d6037e8b2de754354a8c337
+  metadata.gz: 1a42be3450f346c5bf0ef0613e9b8761c60484b0
+  data.tar.gz: 467db678c578fc516253e296094e47212ddf4bfe
 SHA512:
-  metadata.gz: cb18f4ea227681161bf906f2a2c63af6470594ddca7286b6c15173df5fd1882e9aff0231b2d6779ecfeeb885b1676a9b6f373e5a08532995b3b02a271dd124ed
-  data.tar.gz: 140b0a2e86f65f96a03a8758832cfc78683353a176231fe0778af53fdfa7144ad1399f38393f97ff7038d2255a03e0e8d576c10e20b00855d142c665526a436f
+  metadata.gz: 633e432942be56849abbc72eaaebad2f6611b2a3a12be14b061bd1f2ab2262321dd8aa444c40d6572e5439969b5072ebaac14e1221e3b74c2433d957375912c9
+  data.tar.gz: 2ce060317cdd88abd99bb682a2654d60663644e85ade45bbeb2d8738f09f81014992d3c32bbc0712967b2be75f789be2052994bc75e25ffab89c69f3067197ab

data/RELEASE_NOTES.markdown

@@ -3,6 +3,10 @@
 This document is a list of user visible feature changes and important
 bugfixes. Do not forget to update this doc in every important patch.
 
+## 1.3.13 (2015-05-16)
+
+* [major] RCBC-196 Improved integration with libcouchbase IO API
+
 ## 1.3.12 (2015-04-21)
 
 * [major] Experimental support of N1QL querires

data/ext/couchbase_ext/bucket.c

@@ -42,19 +42,11 @@ bootstrap_callback(lcb_t handle, lcb_error_t error)
 
     lcb_breakout(handle);
     bucket->exception = cb_check_error(error, "bootstrap error", Qnil);
-    if (bucket->async && !bucket->connected) {
-        (void)trigger_on_connect_callback(bucket->self);
-    }
-}
-
-    static void
-configuration_callback(lcb_t handle, lcb_configuration_t config)
-{
-    struct cb_bucket_st *bucket = (struct cb_bucket_st *)lcb_get_cookie(handle);
-
-    if (config == LCB_CONFIGURATION_NEW) {
+    if (!bucket->connected) {
         bucket->connected = 1;
-        (void)trigger_on_connect_callback(bucket->self);
+        if (bucket->async) {
+            (void)trigger_on_connect_callback(bucket->self);
+        }
     }
 }
 
@@ -362,19 +354,19 @@ do_connect(struct cb_bucket_st *bucket)
 #endif
         } else if (bucket->engine == cb_sym_libev) {
             ciops.v.v0.type = LCB_IO_OPS_LIBEV;
+#ifdef BUILD_EVENTMACHINE_PLUGIN
         } else if (bucket->engine == cb_sym_eventmachine) {
-            ciops.version = 1;
-            ciops.v.v1.sofile = NULL;
-            ciops.v.v1.symbol = "cb_create_ruby_em_io_opts";
-            ciops.v.v1.cookie = bucket;
+            ciops.version = 2;
+            ciops.v.v2.create = cb_create_ruby_em_io_opts;
+            ciops.v.v2.cookie = bucket;
+#endif
         } else {
 #ifdef _WIN32
             ciops.v.v0.type = LCB_IO_OPS_DEFAULT;
 #else
-            ciops.version = 1;
-            ciops.v.v1.sofile = NULL;
-            ciops.v.v1.symbol = "cb_create_ruby_mt_io_opts";
-            ciops.v.v1.cookie = NULL;
+            ciops.version = 2;
+            ciops.v.v2.create = cb_create_ruby_mt_io_opts;
+            ciops.v.v2.cookie = NULL;
 #endif
         }
         err = lcb_create_io_ops(&bucket->io, &ciops);
@@ -424,7 +416,6 @@ do_connect(struct cb_bucket_st *bucket)
     (void)lcb_set_http_data_callback(bucket->handle, cb_http_data_callback);
     (void)lcb_set_observe_callback(bucket->handle, cb_observe_callback);
     (void)lcb_set_unlock_callback(bucket->handle, cb_unlock_callback);
-    (void)lcb_set_configuration_callback(bucket->handle, configuration_callback);
 
     lcb_cntl(bucket->handle, (bucket->timeout > 0) ? LCB_CNTL_SET : LCB_CNTL_GET,
              LCB_CNTL_OP_TIMEOUT, &bucket->timeout);

data/ext/couchbase_ext/couchbase_ext.h

@@ -27,7 +27,7 @@
 #endif
 
 #include "couchbase_config.h"
-#ifdef HAVE_RB_FIBER_YIELD
+#if defined(HAVE_RB_FIBER_YIELD) && !defined(_WIN32)
 #define BUILD_EVENTMACHINE_PLUGIN
 #endif
 #ifdef HAVE_STDINT_H
@@ -644,6 +644,10 @@ int cb_io_connect(struct lcb_io_opt_st *iops, lcb_socket_t sock, const struct so
 /* plugin init functions */
 LIBCOUCHBASE_API
 lcb_error_t cb_create_ruby_mt_io_opts(int version, lcb_io_opt_t *io, void *arg);
+#ifdef BUILD_EVENTMACHINE_PLUGIN
+LIBCOUCHBASE_API
+lcb_error_t cb_create_ruby_em_io_opts(int version, lcb_io_opt_t *io, void *arg);
+#endif
 
 /* shortcut functions */
     static inline VALUE

data/ext/couchbase_ext/eventmachine_plugin.c

@@ -17,7 +17,6 @@
 
 #include "couchbase_ext.h"
 
-#ifndef _WIN32
 #ifdef BUILD_EVENTMACHINE_PLUGIN
 
 VALUE cb_mEm;
@@ -406,11 +405,36 @@ lcb_destroy_io_opts(struct lcb_io_opt_st *iops)
     rb_em_loop_destroy((rb_em_loop*)iops->v.v0.cookie);
 }
 
+    static void
+iops_getprocs(int version,
+              lcb_loop_procs *loop_procs, lcb_timer_procs *timer_procs,
+              lcb_bsd_procs *bsd_procs, lcb_ev_procs *ev_procs,
+              lcb_completion_procs *completion_procs, lcb_iomodel_t *iomodel)
+{
+    /* Call the parent function */
+    lcb_iops_wire_bsd_impl2(bsd_procs, version);
+
+    /* Now apply our new I/O functionality */
+    ev_procs->create = lcb_io_create_event;
+    ev_procs->destroy = lcb_io_destroy_event;
+    ev_procs->watch = lcb_io_update_event;
+    ev_procs->cancel = lcb_io_delete_event;
+
+    timer_procs->create = lcb_io_create_timer;
+    timer_procs->destroy = lcb_io_destroy_timer;
+    timer_procs->schedule = lcb_io_update_timer;
+    timer_procs->cancel = lcb_io_delete_timer;
+
+    loop_procs->start = lcb_io_run_event_loop;
+    loop_procs->stop = lcb_io_stop_event_loop;
+    (void) completion_procs;
+    (void) iomodel;
+}
+
     LIBCOUCHBASE_API lcb_error_t
 cb_create_ruby_em_io_opts(int version, lcb_io_opt_t *io, void *arg)
 {
-    lcb_bsd_procs procs;
-    struct lcb_io_opt_st *ret;
+    lcb_io_opt_t ret;
     rb_em_loop *loop;
     struct cb_bucket_st *bucket = arg;
 
@@ -422,43 +446,21 @@ cb_create_ruby_em_io_opts(int version, lcb_io_opt_t *io, void *arg)
 
     ret = calloc(1, sizeof(*ret));
     if (ret == NULL) {
+        return LCB_CLIENT_ENOMEM;
+    }
+    loop = rb_em_loop_create(bucket);
+    if (loop == NULL) {
         free(ret);
         return LCB_CLIENT_ENOMEM;
     }
 
-    ret->version = 0;
     ret->dlhandle = NULL;
     ret->destructor = lcb_destroy_io_opts;
-    /* consider that struct isn't allocated by the library,
-     * `need_cleanup' flag might be set in lcb_create() */
-    ret->v.v0.need_cleanup = 0;
-    lcb_iops_wire_bsd_impl2(&procs, 0);
-    ret->v.v0.recv = procs.recv;
-    ret->v.v0.recvv = procs.recvv;
-    ret->v.v0.send = procs.send;
-    ret->v.v0.sendv = procs.sendv;
-    ret->v.v0.socket = procs.socket0;
-    ret->v.v0.connect = procs.connect0;
-    ret->v.v0.close = procs.close;
-    ret->v.v0.delete_event = lcb_io_delete_event;
-    ret->v.v0.destroy_event = lcb_io_destroy_event;
-    ret->v.v0.create_event = lcb_io_create_event;
-    ret->v.v0.update_event = lcb_io_update_event;
-
-    ret->v.v0.delete_timer = lcb_io_delete_timer;
-    ret->v.v0.destroy_timer = lcb_io_destroy_timer;
-    ret->v.v0.create_timer = lcb_io_create_timer;
-    ret->v.v0.update_timer = lcb_io_update_timer;
-
-    ret->v.v0.run_event_loop = lcb_io_run_event_loop;
-    ret->v.v0.stop_event_loop = lcb_io_stop_event_loop;
-
-    loop = rb_em_loop_create(bucket);
-    ret->v.v0.cookie = loop;
-
+    ret->version = 2;
+    ret->v.v2.get_procs = iops_getprocs;
+    LCB_IOPS_BASEFLD(ret, cookie) = loop;
     *io = ret;
     return LCB_SUCCESS;
 }
 
 #endif
-#endif

data/ext/couchbase_ext/multithread_plugin.c

@@ -580,8 +580,8 @@ loop_run_select(VALUE argp)
     hrtime_t now, next_time;
 
     next_time = timers_minimum(&loop->timers);
+    now = gethrtime();
     if (next_time) {
-        now = gethrtime();
         if (next_time <= now) {
             timeout.tv_sec = 0;
             timeout.tv_usec = 0;
@@ -621,11 +621,6 @@ loop_run_select(VALUE argp)
     if (result < 0) {
         rb_sys_fail("rb_thread_fd_select");
     }
-    /* fix current time so that socket callbacks will not cause timers timeouts */
-    if (next_time) {
-        now = gethrtime();
-    }
-
     if (result > 0) {
         uint32_t i;
         for(i = 0; i < loop->events.count && result; i++) {
@@ -772,8 +767,8 @@ loop_run_poll(VALUE argp)
 
 retry:
     next_time = timers_minimum(&loop->timers);
+    now = gethrtime();
     if (next_time) {
-        now = gethrtime();
         args->ts = next_time <= now ? 0 : next_time - now;
     } else {
         args->ts = HRTIME_INFINITY;
@@ -825,10 +820,6 @@ retry:
         return Qnil;
     }
 
-    if (next_time) {
-        now = gethrtime();
-    }
-
     if (args->result > 0) {
         uint32_t cnt = args->result;
         uint32_t fd_n = 0, ev_n = 0;
@@ -1036,11 +1027,36 @@ lcb_destroy_io_opts(struct lcb_io_opt_st *iops)
     free(iops);
 }
 
+    static void
+iops_getprocs(int version,
+              lcb_loop_procs *loop_procs, lcb_timer_procs *timer_procs,
+              lcb_bsd_procs *bsd_procs, lcb_ev_procs *ev_procs,
+              lcb_completion_procs *completion_procs, lcb_iomodel_t *iomodel)
+{
+    /* Call the parent function */
+    lcb_iops_wire_bsd_impl2(bsd_procs, version);
+
+    /* Now apply our new I/O functionality */
+    ev_procs->create = lcb_io_create_event;
+    ev_procs->destroy = lcb_io_destroy_event;
+    ev_procs->watch = lcb_io_update_event;
+    ev_procs->cancel = lcb_io_delete_event;
+
+    timer_procs->create = lcb_io_create_timer;
+    timer_procs->destroy = lcb_io_destroy_timer;
+    timer_procs->schedule = lcb_io_update_timer;
+    timer_procs->cancel = lcb_io_delete_timer;
+
+    loop_procs->start = lcb_io_run_event_loop;
+    loop_procs->stop = lcb_io_stop_event_loop;
+    (void) completion_procs;
+    (void) iomodel;
+}
+
     LIBCOUCHBASE_API lcb_error_t
 cb_create_ruby_mt_io_opts(int version, lcb_io_opt_t *io, void *arg)
 {
-    lcb_bsd_procs procs;
-    struct lcb_io_opt_st *ret;
+    lcb_io_opt_t ret;
     rb_mt_loop *loop;
     (void)arg;
     if (version != 0) {
@@ -1048,44 +1064,20 @@ cb_create_ruby_mt_io_opts(int version, lcb_io_opt_t *io, void *arg)
     }
     ret = calloc(1, sizeof(*ret));
     if (ret == NULL) {
-        free(ret);
         return LCB_CLIENT_ENOMEM;
     }
-
-    ret->version = 0;
-    ret->dlhandle = NULL;
-    ret->destructor = lcb_destroy_io_opts;
-    /* consider that struct isn't allocated by the library,
-     * `need_cleanup' flag might be set in lcb_create() */
-    ret->v.v0.need_cleanup = 0;
-    lcb_iops_wire_bsd_impl2(&procs, 0);
-    ret->v.v0.recv = procs.recv;
-    ret->v.v0.recvv = procs.recvv;
-    ret->v.v0.send = procs.send;
-    ret->v.v0.sendv = procs.sendv;
-    ret->v.v0.socket = procs.socket0;
-    ret->v.v0.connect = procs.connect0;
-    ret->v.v0.close = procs.close;
-
-    ret->v.v0.delete_event = lcb_io_delete_event;
-    ret->v.v0.destroy_event = lcb_io_destroy_event;
-    ret->v.v0.create_event = lcb_io_create_event;
-    ret->v.v0.update_event = lcb_io_update_event;
-
-    ret->v.v0.delete_timer = lcb_io_delete_timer;
-    ret->v.v0.destroy_timer = lcb_io_destroy_timer;
-    ret->v.v0.create_timer = lcb_io_create_timer;
-    ret->v.v0.update_timer = lcb_io_update_timer;
-
-    ret->v.v0.run_event_loop = lcb_io_run_event_loop;
-    ret->v.v0.stop_event_loop = lcb_io_stop_event_loop;
-
     loop = loop_create();
     if (loop == NULL) {
         free(ret);
         return LCB_CLIENT_ENOMEM;
     }
-    ret->v.v0.cookie = loop;
+
+    ret->dlhandle = NULL;
+    ret->destructor = lcb_destroy_io_opts;
+    LCB_IOPS_BASEFLD(ret, cookie) = loop;
+    ret->version = 2;
+    ret->v.v2.get_procs = iops_getprocs;
+
     *io = ret;
     return LCB_SUCCESS;
 }

data/ext/couchbase_ext/n1ql.c

@@ -75,7 +75,7 @@ cb_bucket_query(int argc, VALUE *argv, VALUE self)
     lcb_N1QLPARAMS *params = lcb_n1p_new();
     lcb_CMDN1QL cmd = { 0 };
     lcb_error_t rc;
-    VALUE qstr, proc, opts, args;
+    VALUE qstr, proc, args;
     VALUE exc, rv;
 
     rb_scan_args(argc, argv, "1*&", &qstr, &args, &proc);

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = '1.3.12'
+  VERSION = '1.3.13'
 end

data/tasks/compile.rake

@@ -137,7 +137,7 @@ task 'package:windows' => ['package', 'lib/couchbase_ext.rb'] do
     ENV['TARGET'] = platform.name
     rm_rf('tmp/ ports/')
     mkdir_p('ports')
-    recipe = MiniPortile.new('libcouchbase', '2.4.9')
+    recipe = MiniPortile.new('libcouchbase', '2.5.0')
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push('--disable-cxx',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji