couchbase 1.3.11-x86-mingw32 → 1.3.12-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182ecd1edc65b9bd5007c80daa0dd1bbab38969e
-  data.tar.gz: 16295845db3d153ec1a580d60b6e3d866325c66a
+  metadata.gz: 6726230fdefad258e78c036ac703eda02499941d
+  data.tar.gz: 9d2924510ded2ac99d6037e8b2de754354a8c337
 SHA512:
-  metadata.gz: d1104e29918a9fd5be85926805c8d300a4c596828183c86694ff18605859e5367cecd18c60916392227631d50d5aeffcac4249bc4faa216faf2c88ec78c9fe32
-  data.tar.gz: aa87f7d5a5650672fbb632d2360c0437d6f0b3a7a4e365086a82d0d35371c682f60877174a39f04d6cbf65e6b4505b4c8d7e9b71694dc0a8822b40b023883010
+  metadata.gz: cb18f4ea227681161bf906f2a2c63af6470594ddca7286b6c15173df5fd1882e9aff0231b2d6779ecfeeb885b1676a9b6f373e5a08532995b3b02a271dd124ed
+  data.tar.gz: 140b0a2e86f65f96a03a8758832cfc78683353a176231fe0778af53fdfa7144ad1399f38393f97ff7038d2255a03e0e8d576c10e20b00855d142c665526a436f

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.12 (2015-04-21)
+
+* [major] Experimental support of N1QL querires
+
 ## 1.3.11 (2015-01-08)
 
 * [minor] Update crossbuild system to use cmake for libcouchbase

data/ext/couchbase_ext/couchbase_ext.c

@@ -32,6 +32,7 @@ VALUE cb_mDocument;
 VALUE cb_mPlain;
 VALUE cb_mMarshal;
 VALUE cb_mURI;
+VALUE cb_mMultiJson;
 VALUE em_m;
 
 /* Symbols */
@@ -102,6 +103,8 @@ ID cb_sym_put;
 ID cb_sym_quiet;
 ID cb_sym_replace;
 ID cb_sym_replica;
+ID cb_sym_rows;
+ID cb_sym_meta;
 ID cb_sym_select;
 ID cb_sym_send_threshold;
 ID cb_sym_set;
@@ -132,6 +135,7 @@ ID cb_id_iv_error;
 ID cb_id_iv_flags;
 ID cb_id_iv_from_master;
 ID cb_id_iv_headers;
+ID cb_id_iv_meta;
 ID cb_id_iv_inner_exception;
 ID cb_id_iv_key;
 ID cb_id_iv_node;
@@ -159,6 +163,7 @@ ID cb_id_verify_observe_options;
 VALUE cb_eBaseError;
 VALUE cb_eValueFormatError;
 VALUE cb_eHTTPError;
+VALUE cb_eQuery;
 
                                    /* LCB_SUCCESS = 0x00         */
                                    /* LCB_AUTH_CONTINUE = 0x01   */
@@ -231,6 +236,7 @@ Init_couchbase_ext(void)
     /* just a holder for EventMachine module */
     em_m = 0;
 
+    cb_mMultiJson = rb_const_get(rb_cObject, rb_intern("MultiJson"));
     cb_mURI = rb_const_get(rb_cObject, rb_intern("URI"));
     cb_mCouchbase = rb_define_module("Couchbase");
     /* Document-method: libcouchbase_version
@@ -578,6 +584,15 @@ Init_couchbase_ext(void)
      */
     cb_eHTTPError = rb_define_class_under(cb_mError, "HTTP", cb_eBaseError);
     cb_id_iv_body = rb_intern("@body");
+
+    /* Document-class: Couchbase::Error::Query
+     * Query error with status code
+     *
+     * @since 1.2.0
+     */
+    cb_eQuery = rb_define_class_under(cb_mError, "Query", cb_eBaseError);
+    cb_id_iv_meta = rb_intern("@meta");
+
     /* Document-method: error
      *
      * The underlying libcouchbase library could return one of the following
@@ -1233,6 +1248,94 @@ Init_couchbase_ext(void)
     rb_define_method(cb_cBucket, "default_observe_timeout", cb_bucket_default_observe_timeout_get, 0);
     rb_define_method(cb_cBucket, "default_observe_timeout=", cb_bucket_default_observe_timeout_set, 1);
 
+    /* Document-method: query
+     *
+     * @since 1.3.12
+     *
+     * Perform N1QL query to the cluster. This API is experimental and
+     * subject to change in future. Read more info at http://query.couchbase.com
+     *
+     * @example Simple N1QL query
+     *   connection.query('select "hello world"')
+     *   #=>
+     *      {
+     *          :rows => [
+     *              [0] {
+     *                  "$1" => "hello world"
+     *              }
+     *          ],
+     *          :meta => {
+     *              "requestID" => "f0345617-f809-4b75-8340-acaa412b9f3d",
+     *              "signature" => {
+     *                  "$1" => "string"
+     *              },
+     *              "results" => [],
+     *              "status" => "success",
+     *              "metrics" => {
+     *                  "elapsedTime" => "1.582327ms",
+     *                  "executionTime" => "1.470542ms",
+     *                  "resultCount" => 1,
+     *                  "resultSize" => 43
+     *              }
+     *          }
+     *      }
+     *
+     * @example create primary index
+     *   connection.query('create primary index on `travel-sample` using view')
+     *   #=>
+     *      {
+     *          :rows => [],
+     *          :meta => {
+     *              "requestID" => "597882ef-3c2b-4ac9-8f08-275fece46645",
+     *              "signature" => nil,
+     *                "results" => [],
+     *                 "status" => "success",
+     *                "metrics" => {
+     *                    "elapsedTime" => "1.550941465s",
+     *                  "executionTime" => "1.550856413s",
+     *                    "resultCount" => 0,
+     *                     "resultSize" => 0
+     *              }
+     *          }
+     *      }
+     *
+     * @example select first airline
+     *  connection.query('select * from `travel-sample` where type = "airline" limit 1')
+     *  #=> {
+     *      :rows => [
+     *          [0] {
+     *              "travel-sample" => {
+     *                  "callsign" => "Orbit",
+     *                   "country" => "United States",
+     *                      "iata" => nil,
+     *                      "icao" => "OBT",
+     *                        "id" => 16932,
+     *                      "name" => "Orbit Airlines",
+     *                      "type" => "airline"
+     *              }
+     *          }
+     *      ],
+     *      :meta => {
+     *          "requestID" => "f999550c-70b0-43f6-b76d-8cde03288847",
+     *          "signature" => {
+     *              "*" => "*"
+     *          },
+     *            "results" => [],
+     *             "status" => "success",
+     *            "metrics" => {
+     *                "elapsedTime" => "501.048085ms",
+     *              "executionTime" => "500.991849ms",
+     *                "resultCount" => 1,
+     *                 "resultSize" => 303
+     *          }
+     *      }
+     *    }
+     * @param [String] query string which contains the N1QL query
+     *
+     * @return [Hash] result object with :rows and :meta keys
+     */
+    rb_define_method(cb_cBucket, "query", cb_bucket_query, -1);
+
     cb_cCouchRequest = rb_define_class_under(cb_cBucket, "CouchRequest", rb_cObject);
     rb_define_alloc_func(cb_cCouchRequest, cb_http_request_alloc);
 
@@ -1350,6 +1453,8 @@ Init_couchbase_ext(void)
     cb_sym_quiet = ID2SYM(rb_intern("quiet"));
     cb_sym_replace = ID2SYM(rb_intern("replace"));
     cb_sym_replica = ID2SYM(rb_intern("replica"));
+    cb_sym_rows = ID2SYM(rb_intern("rows"));
+    cb_sym_meta = ID2SYM(rb_intern("meta"));
     cb_sym_select = ID2SYM(rb_intern("select"));
     cb_sym_send_threshold = ID2SYM(rb_intern("send_threshold"));
     cb_sym_set = ID2SYM(rb_intern("set"));

data/ext/couchbase_ext/couchbase_ext.h

@@ -53,6 +53,7 @@ extern hrtime_t gethrtime(void);
 #endif
 
 #include <libcouchbase/couchbase.h>
+#include <libcouchbase/n1ql.h>
 
 #ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
@@ -194,6 +195,7 @@ extern VALUE cb_mDocument;
 extern VALUE cb_mPlain;
 extern VALUE cb_mMarshal;
 extern VALUE cb_mURI;
+extern VALUE cb_mMultiJson;
 extern VALUE em_m;
 
 /* Symbols */
@@ -264,6 +266,8 @@ extern ID cb_sym_put;
 extern ID cb_sym_quiet;
 extern ID cb_sym_replace;
 extern ID cb_sym_replica;
+extern ID cb_sym_rows;
+extern ID cb_sym_meta;
 extern ID cb_sym_select;
 extern ID cb_sym_send_threshold;
 extern ID cb_sym_set;
@@ -294,6 +298,7 @@ extern ID cb_id_iv_error;
 extern ID cb_id_iv_flags;
 extern ID cb_id_iv_from_master;
 extern ID cb_id_iv_headers;
+extern ID cb_id_iv_meta;
 extern ID cb_id_iv_inner_exception;
 extern ID cb_id_iv_key;
 extern ID cb_id_iv_node;
@@ -321,6 +326,7 @@ extern ID cb_id_verify_observe_options;
 extern VALUE cb_eBaseError;
 extern VALUE cb_eValueFormatError;
 extern VALUE cb_eHTTPError;
+extern VALUE cb_eQuery;
                                        /* LCB_SUCCESS = 0x00         */
                                        /* LCB_AUTH_CONTINUE = 0x01   */
 extern VALUE cb_eAuthError;               /* LCB_AUTH_ERROR = 0x02      */
@@ -418,6 +424,7 @@ VALUE cb_bucket_get(int argc, VALUE *argv, VALUE self);
 VALUE cb_bucket_incr(int argc, VALUE *argv, VALUE self);
 VALUE cb_bucket_decr(int argc, VALUE *argv, VALUE self);
 VALUE cb_bucket_unlock(int argc, VALUE *argv, VALUE self);
+VALUE cb_bucket_query(int argc, VALUE *argv, VALUE self);
 VALUE cb_bucket_run(int argc, VALUE *argv, VALUE self);
 VALUE cb_bucket_stop(VALUE self);
 VALUE cb_bucket_version(int argc, VALUE *argv, VALUE self);

data/ext/couchbase_ext/n1ql.c

@@ -0,0 +1,117 @@
+/*
+ *   Copyright 2015 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 "couchbase_ext.h"
+
+static void n1ql_callback(lcb_t handle, int type, const lcb_RESPN1QL *resp)
+{
+    struct cb_context_st *ctx = (struct cb_context_st *)resp->cookie;
+    VALUE res = ctx->rv;
+    if (resp->rflags & LCB_RESP_F_FINAL) {
+        if (resp->rc != LCB_SUCCESS) {
+            char buf[512];
+            char *p = buf, *end = buf + 512;
+            VALUE meta = Qnil;
+
+            p += snprintf(buf, 512, "failed to perform query, rc = 0x%02x", resp->rc);
+            if (resp->htresp) {
+                p += snprintf(p, end - p, ". Inner HTTP requeest failed (rc = 0x%02x, http_status = %d)",
+                         resp->htresp->rc, resp->htresp->htstatus);
+            }
+            if (resp->row) {
+                VALUE errors;
+                meta = rb_funcall(cb_mMultiJson, cb_id_load, 1, STR_NEW(resp->row, resp->nrow));
+                errors = rb_hash_lookup2(meta, STR_NEW_CSTR("errors"), Qnil);
+                if (errors != Qnil) {
+                    int i, len;
+                    p += snprintf(p, end - p, ": ");
+                    len = RARRAY_LEN(errors);
+                    for (i = 0; i < len; i++) {
+                        VALUE error = rb_ary_entry(errors, i);
+                        int code = FIX2INT(rb_hash_lookup2(error, STR_NEW_CSTR("code"), INT2FIX(0)));
+                        char *msg = RSTRING_PTR(rb_hash_lookup2(error, STR_NEW_CSTR("msg"), STR_NEW_CSTR("")));
+                        p += snprintf(p, end - p, "%s (%d)", msg, code);
+                        if (len > 1 && i < len - 1) {
+                            p += snprintf(p, end - p, ",");
+                        }
+                    }
+                }
+            }
+            ctx->exception = rb_exc_new2(cb_eQuery, buf);
+            rb_ivar_set(ctx->exception, cb_id_iv_error, INT2FIX(resp->rc));
+            rb_ivar_set(ctx->exception, cb_id_iv_status, INT2FIX(resp->htresp->htstatus));
+            rb_ivar_set(ctx->exception, cb_id_iv_meta, meta);
+        }
+        if (resp->row) {
+            rb_hash_aset(res, cb_sym_meta, rb_funcall(cb_mMultiJson, cb_id_load, 1, STR_NEW(resp->row, resp->nrow)));
+        }
+    } else {
+        /* TODO: protect from exceptions from MultiJson */
+        VALUE rows = rb_hash_aref(res, cb_sym_rows);
+        rb_ary_push(rows, rb_funcall(cb_mMultiJson, cb_id_load, 1, STR_NEW(resp->row, resp->nrow)));
+    }
+    (void)handle;
+    (void)type;
+}
+
+    VALUE
+cb_bucket_query(int argc, VALUE *argv, VALUE self)
+{
+    struct cb_bucket_st *bucket = DATA_PTR(self);
+    struct cb_context_st *ctx;
+    lcb_N1QLPARAMS *params = lcb_n1p_new();
+    lcb_CMDN1QL cmd = { 0 };
+    lcb_error_t rc;
+    VALUE qstr, proc, opts, args;
+    VALUE exc, rv;
+
+    rb_scan_args(argc, argv, "1*&", &qstr, &args, &proc);
+
+    rc = lcb_n1p_setquery(params, RSTRING_PTR(qstr), RSTRING_LEN(qstr), LCB_N1P_QUERY_STATEMENT);
+    if (rc != LCB_SUCCESS) {
+        rb_raise(cb_eQuery, "cannot set query for N1QL command: %s", lcb_strerror(bucket->handle, rc));
+    }
+
+    rc = lcb_n1p_mkcmd(params, &cmd);
+    if (rc != LCB_SUCCESS) {
+        rb_raise(cb_eQuery, "cannot construct N1QL command: %s", lcb_strerror(bucket->handle, rc));
+    }
+
+    ctx = cb_context_alloc_common(bucket, proc, 1);
+    ctx->rv = rb_hash_new();
+    rb_hash_aset(ctx->rv, cb_sym_rows, rb_ary_new());
+    rb_hash_aset(ctx->rv, cb_sym_meta, Qnil);
+    cmd.callback = n1ql_callback;
+    rc = lcb_n1ql_query(bucket->handle, (void *)ctx, &cmd);
+    if (rc != LCB_SUCCESS) {
+        rb_raise(cb_eQuery, "cannot excute N1QL command: %s\n", lcb_strerror(bucket->handle, rc));
+    }
+    lcb_n1p_free(params);
+    lcb_wait(bucket->handle);
+
+    exc = ctx->exception;
+    rv = ctx->rv;
+    cb_context_free(ctx);
+    if (exc != Qnil) {
+        rb_exc_raise(exc);
+    }
+    exc = bucket->exception;
+    if (exc != Qnil) {
+        bucket->exception = Qnil;
+        rb_exc_raise(exc);
+    }
+    return rv;
+}

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = '1.3.11'
+  VERSION = '1.3.12'
 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.5')
+    recipe = MiniPortile.new('libcouchbase', '2.4.9')
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push('--disable-cxx',

data/test/test_store.rb

@@ -213,4 +213,12 @@ class TestStore < MiniTest::Test
     assert_equal ["bar", "foo"], connection.get(uniq_id(:a), uniq_id(:z))
     assert res.is_a?(Hash)
   end
+
+  def test_append_format
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    assert_equal :document, connection.default_format
+    connection.set(uniq_id, 'bar', :format => :plain)
+    connection.append(uniq_id, 'baz', :format => :plain)
+    assert_equal 'barbaz', connection.get(uniq_id)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.12
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -244,6 +244,7 @@ files:
 - ext/couchbase_ext/gethrtime.c
 - ext/couchbase_ext/http.c
 - ext/couchbase_ext/multithread_plugin.c
+- ext/couchbase_ext/n1ql.c
 - ext/couchbase_ext/observe.c
 - ext/couchbase_ext/result.c
 - ext/couchbase_ext/stats.c