rroonga 6.1.3-x86-mingw32 → 7.0.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c3034661073e1369b519cb516fdbde62e46a324
-  data.tar.gz: 428d44a0fab1f6523827f89142027b8be18863a5
+  metadata.gz: a2241ca788fe002cb289fa989fec7026a7220f10
+  data.tar.gz: c8a4396f122bdcc3af2daad47a7febc1415e0719
 SHA512:
-  metadata.gz: 4a4198631e30010158b30eb18fba869fa38c36f6bdde8b980b3c1f7b1cab600db8b6a46f239af37fcbf22d5401e7da901846f90b946753457be6cec6db05958c
-  data.tar.gz: 031f5e7d7173003fd0dfe40ef60b6ce66154a9f114bd5144abed3ba4a4dd09ced9f29e66269c95f42596330d02ca1724cfbfc6e617ce39a2996f09859be6622b
+  metadata.gz: 0c1ca442d3e0dd542510d184a63f9f1595fcc62089cd9476db8137041f9c1be2c93d7ee9f402ba5067b0a6dba00d924b7c69b3db1fe4a197af23a25e3f527fe7
+  data.tar.gz: 8130f575a328042b3125f31a42bbe6312b6cd0284e7686cc79af5fab9ef50ae877f9969e3c429338c4e350e2ff3f0b0fd87b89362ae51604d92e8a9cc36461b8

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- coding: utf-8; mode: ruby -*-
 #
 # Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

data/doc/text/news.md

@@ -1,5 +1,33 @@
 # NEWS
 
+## 7.0.2: 2017-04-29 {#version-7-0-2}
+
+### Improvements
+
+  * Supported Groonga 7.0.2. Groonga 7.0.1 or older aren't supported.
+
+  * {Groonga::IndexColumn#open_cursor}: Supported opening a cursor by
+    token.
+
+  * {Groonga::IndexColumn#[]}: Supported a token.
+
+  * {Groonga::InvertedIndexCursor#closed?}: Added.
+
+  * {Groonga::TableKeySupport#key?}: Added.
+
+  * {Groonga::TableKeySupport#has_key?}: Deprecated. Use
+    {Groonga::TableKeySupport#key?} instead.
+
+  * {Groonga::DataColumn#apply_window_function}: Supported `:group_keys`.
+
+  * {Groonga::Column#weight_vector?}: Added.
+
+  * {Groonga::DataColumn#apply_expression}: Added.
+
+  * {Groonga::Column#data?}: Added.
+
+  * {Groonga::DefaultCache}: Added.
+
 ## 6.1.3: 2017-01-12 {#version-6-1-3}
 
 ### Improvements

data/ext/groonga/rb-grn-column.c

@@ -609,12 +609,11 @@ rb_grn_column_truncate (VALUE self)
 }
 
 /*
- * _column_ が {Groonga::IndexColumn} の場合は +true+ を返し、
- * そうでない場合は +false+ を返す。
+ * @overload index?
+ *   @return [Bool] `true` if the column is an index column
+ *     ({Groonga::IndexColumn}), `false` otherwise.
  *
  * @since 1.0.5
- *
- * @overload index?
  */
 static VALUE
 rb_grn_column_index_p (VALUE self)
@@ -634,64 +633,83 @@ rb_grn_column_index_p (VALUE self)
 }
 
 /*
- * _column_ がベクターカラムの場合は +true+ を返し、
- * そうでない場合は +false+ を返す。
+ * @overload vector?
+ *   @return [Bool] `true` if the column is a vector column,
+ *     `false` otherwise.
  *
  * @since 1.0.5
- *
- * @overload vector?
  */
 static VALUE
 rb_grn_column_vector_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *column;
-    grn_column_flags flags;
-    grn_column_flags column_type;
 
     rb_grn_column_deconstruct(SELF(self), &column, &context,
                              NULL, NULL,
                              NULL, NULL, NULL);
 
-    if (column->header.type != GRN_COLUMN_VAR_SIZE) {
-        return Qfalse;
-    }
+    return CBOOL2RVAL(grn_obj_is_vector_column(context, column));
+}
 
-    flags = grn_column_get_flags(context, column);
-    column_type = (flags & GRN_OBJ_COLUMN_TYPE_MASK);
-    return CBOOL2RVAL(column_type == GRN_OBJ_COLUMN_VECTOR);
+/*
+ * @overload weight_vector?
+ *   @return [Bool] `true` if the column is a weight vector column,
+ *     `false` otherwise.
+ *
+ * @since 7.0.2
+ */
+static VALUE
+rb_grn_column_weight_vector_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                             NULL, NULL,
+                             NULL, NULL, NULL);
+
+    return CBOOL2RVAL(grn_obj_is_weight_vector_column(context, column));
 }
 
 /*
- * _column_ がスカラーカラムの場合は +true+ を返し、
- * そうでない場合は +false+ を返す。
+ * @overload scalar?
+ *   @return [Bool] `true` if the column is a scalar column,
+ *     `false` otherwise.
  *
  * @since 1.0.5
- *
- * @overload scalar?
  */
 static VALUE
 rb_grn_column_scalar_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *column;
-    grn_column_flags flags;
-    grn_column_flags column_type;
 
     rb_grn_column_deconstruct(SELF(self), &column, &context,
                              NULL, NULL,
                              NULL, NULL, NULL);
 
-    switch (column->header.type) {
-    case GRN_COLUMN_FIX_SIZE:
-        return Qtrue;
-    case GRN_COLUMN_VAR_SIZE:
-        flags = grn_column_get_flags(context, column);
-        column_type = (flags & GRN_OBJ_COLUMN_TYPE_MASK);
-        return CBOOL2RVAL(column_type == GRN_OBJ_COLUMN_SCALAR);
-    default:
-        return Qfalse;
-    }
+    return CBOOL2RVAL(grn_obj_is_scalar_column(context, column));
+}
+
+/*
+ * @overload data?
+ *   @return [Bool] `true` if the column is a data column (a scalar
+ *     column or a vector column), `false` otherwise.
+ *
+ * @since 7.0.2
+ */
+static VALUE
+rb_grn_column_data_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *column;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                             NULL, NULL,
+                             NULL, NULL, NULL);
+
+    return CBOOL2RVAL(grn_obj_is_data_column(context, column));
 }
 
 /*
@@ -842,7 +860,10 @@ rb_grn_init_column (VALUE mGrn)
     /* deprecated: backward compatibility */
     rb_define_alias(rb_cGrnColumn, "index_column?", "index?");
     rb_define_method(rb_cGrnColumn, "vector?", rb_grn_column_vector_p, 0);
+    rb_define_method(rb_cGrnColumn, "weight_vector?",
+                     rb_grn_column_weight_vector_p, 0);
     rb_define_method(rb_cGrnColumn, "scalar?", rb_grn_column_scalar_p, 0);
+    rb_define_method(rb_cGrnColumn, "data?", rb_grn_column_data_p, 0);
 
     rb_define_method(rb_cGrnColumn, "with_weight?",
                      rb_grn_column_with_weight_p, 0);

data/ext/groonga/rb-grn-context.c

@@ -991,7 +991,7 @@ rb_grn_context_object_created (VALUE rb_context, VALUE rb_object)
 void
 rb_grn_init_context (VALUE mGrn)
 {
-    cGrnContext = rb_define_class_under(mGrn, "Context", rb_cObject);
+    cGrnContext = rb_define_class_under(mGrn, "Context", rb_cData);
     rb_define_alloc_func(cGrnContext, rb_grn_context_alloc);
 
     rb_cv_set(cGrnContext, "@@default", Qnil);

data/ext/groonga/rb-grn-data-column.c

@@ -70,6 +70,9 @@ VALUE rb_cGrnDataColumn;
  * @overload apply_window_function(options={}) {|record| }
  *   @param options [::Hash] The name and value pairs.
  *   @option options [::Array<String>] :sort_keys
+ *     TODO: Description.
+ *   @option options [::Array<String>] :group_keys
+ *     TODO: Description.
  *
  *   @yield [record]
  *     It yields an object that builds expression. The block must
@@ -93,6 +96,7 @@ rb_grn_data_column_apply_window_function (int argc, VALUE *argv, VALUE self)
     grn_obj *window_function_call = NULL;
     VALUE rb_options;
     VALUE rb_sort_keys;
+    VALUE rb_group_keys;
     VALUE rb_builder;
     VALUE rb_window_function_call;
 
@@ -106,6 +110,7 @@ rb_grn_data_column_apply_window_function (int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &rb_options);
     rb_grn_scan_options(rb_options,
                         "sort_keys", &rb_sort_keys,
+                        "group_keys", &rb_group_keys,
                         NULL);
 
     if (!NIL_P(rb_sort_keys)) {
@@ -126,6 +131,24 @@ rb_grn_data_column_apply_window_function (int argc, VALUE *argv, VALUE self)
                                     rb_table);
     }
 
+    if (!NIL_P(rb_group_keys)) {
+        VALUE rb_table;
+
+        if (!RVAL2CBOOL(rb_obj_is_kind_of(rb_group_keys, rb_cArray)))
+            rb_raise(rb_eArgError, ":group_keys should be an array of key: <%s>",
+                     rb_grn_inspect(rb_group_keys));
+
+        definition.n_group_keys = RARRAY_LEN(rb_group_keys);
+        definition.group_keys = ALLOCA_N(grn_table_sort_key,
+                                         definition.n_group_keys);
+        rb_table = GRNOBJECT2RVAL(Qnil, context, table, GRN_FALSE);
+        rb_grn_table_sort_keys_fill(context,
+                                    definition.group_keys,
+                                    definition.n_group_keys,
+                                    rb_group_keys,
+                                    rb_table);
+    }
+
     rb_builder = rb_grn_record_expression_builder_new(rb_table, Qnil);
     rb_window_function_call =
         rb_grn_record_expression_builder_build(rb_builder);
@@ -144,6 +167,84 @@ rb_grn_data_column_apply_window_function (int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ * Applies the expression to all records in the table of the
+ * column. Results are stored into the column.
+ *
+ * @example Compute column values from other column values.
+ *
+ *   Groonga::Schema.define do |schema|
+ *     schema.create_table("Comments") do |table|
+ *       # The column that has base data to compute "plus1" column data.
+ *       table.uint32("base")
+ *       # The column for storing computed value with "base" column data.
+ *       table.uint32("plus1")
+ *     end
+ *   end
+ *   comments = Groonga["Comments"]
+ *   plus1 = Groonga["Comments.plus1"]
+ *
+ *   3.times do |i|
+ *     comments.add(:base => i)
+ *   end
+ *
+ *   plus1.apply_expression do |record|
+ *     # Computes "base" column value plus one.
+ *     record.base + 1
+ *   end
+ *
+ *   comments.each do |comment|
+ *     p [comment.base, comment.plus1]
+ *       # -> [0, 1]
+ *       # -> [1, 2]
+ *       # -> [2, 3]
+ *   end
+ *
+ * @overload apply_expression {|record| }
+ *
+ *   @yield [record]
+ *     It yields an object that builds expression. The block must
+ *     build an expression to be applied to all records.
+ *   @yieldparam [Groonga::RecordExpressionBuilder] record
+ *     The expression builder to create an expression.
+ *   @yieldreturn [Groonga::ExpressionBuilder]
+ *     It must be an expression.
+ *
+ * @since 7.0.2
+ */
+static VALUE
+rb_grn_data_column_apply_expression (VALUE self)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    grn_obj *column;
+    grn_obj *table;
+    VALUE rb_table;
+    grn_obj *expression = NULL;
+    VALUE rb_builder;
+    VALUE rb_expression;
+
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
+                              NULL, &table,
+                              NULL, NULL, NULL);
+    rb_table = GRNOBJECT2RVAL(Qnil, context, table, GRN_FALSE);
+
+    rb_builder = rb_grn_record_expression_builder_new(rb_table, Qnil);
+    rb_expression = rb_grn_record_expression_builder_build(rb_builder);
+    rb_grn_object_deconstruct(RB_GRN_OBJECT(DATA_PTR(rb_expression)),
+                              &expression, NULL,
+                              NULL, NULL, NULL, NULL);
+
+    rc = grn_table_apply_expr(context,
+                              table,
+                              column,
+                              expression);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return self;
+}
+
 void
 rb_grn_init_data_column (VALUE mGrn)
 {
@@ -151,6 +252,8 @@ rb_grn_init_data_column (VALUE mGrn)
 
     rb_define_method(rb_cGrnDataColumn, "apply_window_function",
                      rb_grn_data_column_apply_window_function, -1);
+    rb_define_method(rb_cGrnDataColumn, "apply_expression",
+                     rb_grn_data_column_apply_expression, 0);
 
     rb_grn_init_fix_size_column(mGrn);
     rb_grn_init_variable_size_column(mGrn);

data/ext/groonga/rb-grn-default-cache.c

@@ -0,0 +1,104 @@
+/* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License version 2.1 as published by the Free Software Foundation.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "rb-grn.h"
+
+/*
+ * Document-module: Groonga::DefaultCache
+ *
+ * This module provides the default cache related features.
+ *
+ * @since 7.0.2
+ */
+
+/*
+ * @overload base_path
+ *   @return [String, nil] the default cache base path or `nil`.
+ *
+ * @since 7.0.2
+ */
+static VALUE
+rb_grn_default_cache_s_get_base_path (VALUE klass)
+{
+    const char *base_path;
+
+    base_path = grn_get_default_cache_base_path();
+    if (base_path) {
+        return rb_str_new_cstr(base_path);
+    } else {
+        return Qnil;
+    }
+}
+
+/*
+ * @overload base_path=(base_path)
+ *   @param base_path [String, nil] The new default cache base path.
+ *      If you specify `String`, the default cache will be persistent.
+ *      If you specify `nil`, the default cache will be just on memory.
+ *      You need to call {.reopen} to apply this change.
+ *   @return [String, nil] The `base_path` itself.
+ *
+ * @since 7.0.2
+ */
+static VALUE
+rb_grn_default_cache_s_set_base_path (VALUE klass, VALUE rb_base_path)
+{
+    if (NIL_P(rb_base_path)) {
+        grn_set_default_cache_base_path(NULL);
+    } else {
+        const char *base_path;
+        base_path = StringValueCStr(rb_base_path);
+        grn_set_default_cache_base_path(base_path);
+    }
+
+    return rb_base_path;
+}
+
+/*
+ * @overload reopen
+ *   Reopens the default cache.
+ *
+ *   @return [void]
+ *
+ * @since 7.0.2
+ */
+static VALUE
+rb_grn_default_cache_s_reopen (VALUE klass)
+{
+    grn_rc rc;
+
+    rc = grn_cache_default_reopen();
+    rb_grn_rc_check(rc, klass);
+
+    return Qnil;
+}
+
+void
+rb_grn_init_default_cache (VALUE mGrn)
+{
+    VALUE mGrnDefaultCache;
+
+    mGrnDefaultCache = rb_define_module_under(mGrn, "DefaultCache");
+
+    rb_define_singleton_method(mGrnDefaultCache, "base_path",
+                               rb_grn_default_cache_s_get_base_path, 0);
+    rb_define_singleton_method(mGrnDefaultCache, "base_path=",
+                               rb_grn_default_cache_s_set_base_path, 1);
+    rb_define_singleton_method(mGrnDefaultCache, "reopen",
+                               rb_grn_default_cache_s_reopen, 0);
+}