rroonga 6.0.9-x86-mingw32 → 6.1.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4efbcbc567fa11c35ac52bc6687f10509b1f262a
-  data.tar.gz: 40eacb99daf7d0dbafcba026289daa7523dbad1e
+  metadata.gz: 1c79e8b3704720e6b6ff49c62561b1c7a97904c6
+  data.tar.gz: daa6a0730e425159454c54a776946630c8ceeb1c
 SHA512:
-  metadata.gz: 6d6798ee794374e8412f346b0fafaba04579a29788c0cf6a37615de32eb01208437ad23829d422b584fb6769b200416507e961ca88471aaf54631a0b694eb5e0
-  data.tar.gz: 20890e28a30436b33e5bf486235e7767a693750d5bd4c07afe46a0753da8a6db19ccd5f222e9005ec0639ff131f4f74694ffd4383932e312a976fa0177a3fa6d
+  metadata.gz: 62c4c9d8a061fc4b4c9af37bb679b18121931ca6ad562aef2df1014ca321a06b6107fe87f676368b0512fc064d7b2e08eafa08fd1708b20c934d3ae617f131fb
+  data.tar.gz: 1447fbfce9c8b9e19bb854928148c696f6b7f81d31d558b2dda532c5297201aab87540315509eb30cf7eea8ad18dae761adda552d1f1be0c9646d620e914f715

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 6.1.0: 2016-11-07 {#version-6-1-0}
+
+### Improvements
+
+  * {Groonga::Table#define_index_column}: Added `:size` option to
+    support small or medium size of index column. Specify `:small` or
+    `:medium` to customize it.
+
 ## 6.0.9: 2016-10-07 {#version-6-0-9}
 
 ### Improvements

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

@@ -883,6 +883,56 @@ rb_grn_index_column_with_position_p (VALUE self)
     return CBOOL2RVAL(flags & GRN_OBJ_WITH_POSITION);
 }
 
+/*
+ * Checks whether the index column is small or not.
+ *
+ * @overload small?
+ *   @return [Boolean] `true` if the index column is small,
+ *     `false` otherwise.
+ *
+ * @since 6.1.0
+ */
+static VALUE
+rb_grn_index_column_small_p (VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_index_column_deconstruct(SELF(self), &column, &context,
+                                    NULL, NULL,
+                                    NULL, NULL, NULL, NULL, NULL,
+                                    NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL(flags & GRN_OBJ_INDEX_SMALL);
+}
+
+/*
+ * Checks whether the index column is medium or not.
+ *
+ * @overload medium?
+ *   @return [Boolean] `true` if the index column is medium,
+ *     `false` otherwise.
+ *
+ * @since 6.1.0
+ */
+static VALUE
+rb_grn_index_column_medium_p (VALUE self)
+{
+    grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
+
+    rb_grn_index_column_deconstruct(SELF(self), &column, &context,
+                                    NULL, NULL,
+                                    NULL, NULL, NULL, NULL, NULL,
+                                    NULL, NULL);
+
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL(flags & GRN_OBJ_INDEX_MEDIUM);
+}
+
 /*
  * Opens cursor to iterate posting in the index column.
  *
@@ -1310,6 +1360,10 @@ rb_grn_init_index_column (VALUE mGrn)
                      rb_grn_index_column_with_weight_p, 0);
     rb_define_method(rb_cGrnIndexColumn, "with_position?",
                      rb_grn_index_column_with_position_p, 0);
+    rb_define_method(rb_cGrnIndexColumn, "small?",
+                     rb_grn_index_column_small_p, 0);
+    rb_define_method(rb_cGrnIndexColumn, "medium?",
+                     rb_grn_index_column_medium_p, 0);
 
     rb_define_method(rb_cGrnIndexColumn, "open_cursor",
                      rb_grn_index_column_open_cursor, -1);

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

@@ -927,6 +927,10 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected,
             rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_WEIGHT"));
         if (column_flags & GRN_OBJ_WITH_POSITION)
             rb_ary_push(inspected_flags, rb_str_new_cstr("WITH_POSITION"));
+        if (column_flags & GRN_OBJ_INDEX_SMALL)
+            rb_ary_push(inspected_flags, rb_str_new_cstr("SMALL"));
+        if (column_flags & GRN_OBJ_INDEX_MEDIUM)
+            rb_ary_push(inspected_flags, rb_str_new_cstr("MEDIUM"));
         break;
     default:
         break;

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

@@ -357,6 +357,10 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
  *     転置索引にweight情報を合わせて格納する。
  *   @option options :with_position
  *     転置索引に出現位置情報を合わせて格納する。
+ *   @option options :size (nil)
+ *     The size of index column. It must be `nil`, `:small` or
+ *     `:medium`. `nil` means full size. `:small` means small
+ *     size. `:medium` means medium size.
  *   @option options :source
  *    インデックス対象となるカラムを指定する。 +:sources+ との併用はできない。
  *   @option options :sources
@@ -376,6 +380,7 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
     VALUE rb_name, rb_value_type;
     VALUE options, rb_path, rb_persistent;
     VALUE rb_with_section, rb_with_weight, rb_with_position;
+    VALUE rb_size;
     VALUE rb_column, rb_source, rb_sources;
     VALUE columns;
 
@@ -395,6 +400,7 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
                         "with_section", &rb_with_section,
                         "with_weight", &rb_with_weight,
                         "with_position", &rb_with_position,
+                        "size", &rb_size,
                         "source", &rb_source,
                         "sources", &rb_sources,
                         NULL);
@@ -443,6 +449,18 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
     if (RVAL2CBOOL(rb_with_position))
         flags |= GRN_OBJ_WITH_POSITION;
 
+    if (NIL_P(rb_size)) {
+        /* do nothing */
+    } else if (rb_grn_equal_option(rb_size, "small")) {
+        flags |= GRN_OBJ_INDEX_SMALL;
+    } else if (rb_grn_equal_option(rb_size, "medium")) {
+        flags |= GRN_OBJ_INDEX_MEDIUM;
+    } else {
+        rb_raise(rb_eArgError,
+                 ":size must be nil, :small or :medium: <%" PRIsVALUE ">",
+                 rb_size);
+    }
+
     if (!NIL_P(rb_source) && !NIL_P(rb_sources))
         rb_raise(rb_eArgError, "should not pass both of :source and :sources.");
 

data/ext/groonga/rb-grn.h

@@ -98,8 +98,8 @@ RB_GRN_BEGIN_DECLS
 #endif
 
 #define RB_GRN_MAJOR_VERSION 6
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 9
+#define RB_GRN_MINOR_VERSION 1
+#define RB_GRN_MICRO_VERSION 0
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/lib/groonga/dumper.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -487,6 +487,11 @@ module Groonga
         options[:with_section]  = true if column.with_section?
         options[:with_weight]   = true if column.with_weight?
         options[:with_position] = true if column.with_position?
+        if column.small?
+          options[:size] = :small
+        elsif column.medium?
+          options[:size] = :medium
+        end
         arguments = [
           dump_object(target_table_name),
           sources.size == 1 ? source_names : "[#{source_names}]",
@@ -643,6 +648,8 @@ module Groonga
         flags << "WITH_SECTION" if column.with_section?
         flags << "WITH_WEIGHT" if column.with_weight?
         flags << "WITH_POSITION" if column.with_position?
+        flags << "INDEX_SMALL" if column.small?
+        flags << "INDEX_MEDIUM" if column.medium?
         parameters << "#{flags.join('|')}"
         parameters << "#{column.range.name}"
         source_names = column.sources.collect do |source|

data/lib/groonga/schema.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -1697,6 +1697,7 @@ module Groonga
           :with_section => @options[:with_section],
           :with_weight => @options[:with_weight],
           :with_position => @options[:with_position],
+          :size => @options[:size],
         }
       end
 

data/rroonga-build.rb

@@ -25,8 +25,8 @@ module RroongaBuild
 
   module LatestGroongaVersion
     MAJOR = 6
-    MINOR = 0
-    MICRO = 9
+    MINOR = 1
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-index-column.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -378,6 +378,67 @@ class IndexColumnTest < Test::Unit::TestCase
                      context["Tags.default"].with_position?,
                    ])
     end
+
+    class SizeTest < self
+      def test_small
+        Groonga::Schema.define do |schema|
+          schema.create_table("Tags",
+                              :type => :patricia_trie,
+                              :key_type => "ShortText") do |table|
+            table.index("Articles.tags",
+                        :name => "small",
+                        :size => :small)
+            table.index("Articles.tags",
+                        :name => "default")
+          end
+        end
+
+        assert_equal([
+                       true,
+                       false,
+                     ],
+                     [
+                       context["Tags.small"].small?,
+                       context["Tags.default"].small?,
+                     ])
+      end
+
+      def test_medium
+        Groonga::Schema.define do |schema|
+          schema.create_table("Tags",
+                              :type => :patricia_trie,
+                              :key_type => "ShortText") do |table|
+            table.index("Articles.tags",
+                        :name => "medium",
+                        :size => :medium)
+            table.index("Articles.tags",
+                        :name => "default")
+          end
+        end
+
+        assert_equal([
+                       true,
+                       false,
+                     ],
+                     [
+                       context["Tags.medium"].medium?,
+                       context["Tags.default"].medium?,
+                     ])
+      end
+
+      def test_invalid
+        Groonga::Schema.create_table("Tags",
+                                     :type => :patricia_trie,
+                                     :key_type => "ShortText")
+        message = ":size must be nil, :small or :medium: <invalid>"
+        assert_raise(ArgumentError.new(message)) do
+          tags = context["Tags"]
+          tags.define_index_column("small",
+                                   context["Articles"],
+                                   :size => "invalid")
+        end
+      end
+    end
   end
 
   class SourceTest < self
@@ -684,4 +745,66 @@ class IndexColumnTest < Test::Unit::TestCase
       end
     end
   end
+
+  class InspectTest < self
+    def setup
+      super
+      setup_source
+    end
+
+    def setup_source
+      Groonga::Schema.define do |schema|
+        schema.create_table("Articles") do |article|
+          article.text(:content)
+          article.short_text(:tag)
+        end
+      end
+    end
+
+    def test_small_size
+      Groonga::Schema.define do |schema|
+        schema.create_table("Tags",
+                            :type => :hash,
+                            :key_type => "ShortText") do |tags|
+          tags.index("Articles.tag", :size => :small)
+        end
+      end
+
+      index = context["Tags.Articles_tag"]
+      source_column_names = index.sources.collect(&:local_name).join(",")
+      assert_equal("\#<Groonga::IndexColumn " +
+                   "id: <#{index.id}>, " +
+                   "name: <#{index.name}>, " +
+                   "path: <#{index.path}>, " +
+                   "domain: <#{index.domain.name}>, " +
+                   "range: <#{index.range.name}>, " +
+                   "flags: <SMALL>, " +
+                   "sources: <#{source_column_names}>" +
+                   ">",
+                   index.inspect)
+    end
+
+    def test_medium_size
+      Groonga::Schema.define do |schema|
+        schema.create_table("Tags",
+                            :type => :hash,
+                            :key_type => "ShortText") do |tags|
+          tags.index("Articles.tag", :size => :medium)
+        end
+      end
+
+      index = context["Tags.Articles_tag"]
+      source_column_names = index.sources.collect(&:local_name).join(",")
+      assert_equal("\#<Groonga::IndexColumn " +
+                   "id: <#{index.id}>, " +
+                   "name: <#{index.name}>, " +
+                   "path: <#{index.path}>, " +
+                   "domain: <#{index.domain.name}>, " +
+                   "range: <#{index.range.name}>, " +
+                   "flags: <MEDIUM>, " +
+                   "sources: <#{source_column_names}>" +
+                   ">",
+                   index.inspect)
+    end
+  end
 end

data/test/test-schema-dumper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -86,7 +86,7 @@ class SchemaDumperTest < Test::Unit::TestCase
     end
   end
 
-  def define_index_schema
+  def define_index_schema(options={})
     context.register_plugin("token_filters/stop_word")
     Groonga::Schema.define do |schema|
       schema.create_table("Items",
@@ -101,8 +101,8 @@ class SchemaDumperTest < Test::Unit::TestCase
                           :default_tokenizer => "TokenBigram",
                           :token_filters => ["TokenFilterStopWord"],
                           :normalizer => "NormalizerAuto") do |table|
-        table.index("Items", "_key")
-        table.index("Items", "title")
+        table.index("Items", "_key", options[:key_index_options] || {})
+        table.index("Items", "title", options[:title_index_options] || {})
       end
     end
   end
@@ -236,6 +236,58 @@ end
       SCHEMA
     end
 
+    def test_small_index
+      define_index_schema(:title_index_options => {:size => :small})
+      assert_equal(<<-SCHEMA, dump)
+create_table("Items",
+             :type => :hash,
+             :key_type => "ShortText",
+             :force => true) do |table|
+  table.short_text("title")
+end
+
+create_table("Terms",
+             :type => :patricia_trie,
+             :key_type => "ShortText",
+             :default_tokenizer => "TokenBigram",
+             :token_filters => ["TokenFilterStopWord"],
+             :normalizer => "NormalizerAuto",
+             :force => true) do |table|
+end
+
+change_table("Terms") do |table|
+  table.index("Items", "_key", :name => "Items__key", :with_position => true)
+  table.index("Items", "title", :name => "Items_title", :with_position => true, :size => :small)
+end
+      SCHEMA
+    end
+
+    def test_medium_index
+      define_index_schema(:title_index_options => {:size => :medium})
+      assert_equal(<<-SCHEMA, dump)
+create_table("Items",
+             :type => :hash,
+             :key_type => "ShortText",
+             :force => true) do |table|
+  table.short_text("title")
+end
+
+create_table("Terms",
+             :type => :patricia_trie,
+             :key_type => "ShortText",
+             :default_tokenizer => "TokenBigram",
+             :token_filters => ["TokenFilterStopWord"],
+             :normalizer => "NormalizerAuto",
+             :force => true) do |table|
+end
+
+change_table("Terms") do |table|
+  table.index("Items", "_key", :name => "Items__key", :with_position => true)
+  table.index("Items", "title", :name => "Items_title", :with_position => true, :size => :medium)
+end
+      SCHEMA
+    end
+
     def test_weight_vector
       define_weight_vector_schema
       assert_equal(<<-SCHEMA, dump)
@@ -317,6 +369,32 @@ column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title
       SCHEMA
     end
 
+    def test_small_index
+      define_index_schema(:title_index_options => {:size => :small})
+      assert_equal(<<-SCHEMA, dump)
+table_create Items TABLE_HASH_KEY ShortText
+column_create Items title COLUMN_SCALAR ShortText
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --token_filters TokenFilterStopWord --normalizer NormalizerAuto
+
+column_create Terms Items__key COLUMN_INDEX|WITH_POSITION Items _key
+column_create Terms Items_title COLUMN_INDEX|WITH_POSITION|INDEX_SMALL Items title
+      SCHEMA
+    end
+
+    def test_medium_index
+      define_index_schema(:title_index_options => {:size => :medium})
+      assert_equal(<<-SCHEMA, dump)
+table_create Items TABLE_HASH_KEY ShortText
+column_create Items title COLUMN_SCALAR ShortText
+
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --token_filters TokenFilterStopWord --normalizer NormalizerAuto
+
+column_create Terms Items__key COLUMN_INDEX|WITH_POSITION Items _key
+column_create Terms Items_title COLUMN_INDEX|WITH_POSITION|INDEX_MEDIUM Items title
+      SCHEMA
+    end
+
     def test_weight_vector
       define_weight_vector_schema
       assert_equal(<<-SCHEMA, dump)