rroonga 4.0.1-x64-mingw32 → 4.0.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a068d90d41ec57ab0cb38b864e7163ab3fe65161
-  data.tar.gz: 18694f7544a7873f9191bc73fe1c672d053cd3b3
+  metadata.gz: a13a797e407dc64d6d380182ca8659088892ebab
+  data.tar.gz: 79387f7bbe3eb28ac1631d1b46d83e982ec35941
 SHA512:
-  metadata.gz: 7801e348e37dae2a884237d7f96e227a81f881698eb9843fc34d39d841d42aadd59f54d7fda8b85dd86e39132e610cf84ecd7daed456e1e5c7e71217deeec398
-  data.tar.gz: b054229f504c78d13d0eeb751a32115b080e40fafb9ea19e2f62cbbe93ee0af787c91ebd7070d65a605db3cb0f86b7ca68698228876fac6547e39b747053f93c
+  metadata.gz: 39d2f8d9c2d2f5f9b0476200126cc040ead5d160d42457f8a3e4b845cda1751d56c4dbc4cf477be525700604f222758377b46e274b2ca326272c6eba2e9c1055
+  data.tar.gz: 137511a3cf633122dbbba48e79b222bdb4a4e0307fac23700f548d03f6338abaaf9c1d9fbd98aa63954258ea1b8e539ebba222f7e3ecf7111a79b2926dd4d779

data/doc/text/news.textile

@@ -1,5 +1,30 @@
 h1. NEWS
 
+h2(#4-0-2). 4.0.2: 2014-05-29
+
+h3. Improvements
+
+* Removed needless @--key_type@ option in dump.
+  [Reported by Genki Takiuchi]
+* Added sources information to {Groonga::IndexColumn#inspect}.
+* Enabled @with_section@ flag for multiple column index by default.
+  See {Groonga::Schema::TableDefinition#index}.
+* Enabled @with_position@ flag for index of a table that has a default
+  tokenizer by default. You need to specify @:with_position => false@
+  explicitly to disable @with_position@ flag for @TokenDelimit@.
+  @TokenDelimit@ is a tokenizer that doesn't need @with_position@ flag.
+  See {Groonga::Schema.create_table}.
+
+h3. Fixes
+
+* [GitHub#16] Fixed a memory leak of {Groonga::Table#column}.
+  [Reported by rutice]
+
+h3. Thanks
+
+* rutice
+* Genki Takiuchi
+
 h2(#4-0-1). 4.0.1: 2014-04-04
 
 h3. Improvements

data/ext/groonga/extconf.rb

@@ -103,6 +103,8 @@ def extract_zip(filename, destrination_dir)
   end
 
   Archive::Zip.extract(filename, destrination_dir)
+rescue LoadError
+  system("unzip", filename, "-d", destrination_dir)
 end
 
 def extract_groonga_win32_binary(major, minor, micro)

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

@@ -102,6 +102,94 @@ rb_grn_index_column_deconstruct (RbGrnIndexColumn *rb_grn_index_column,
         *string_query = rb_grn_index_column->string_query;
 }
 
+static VALUE
+rb_grn_index_column_inspect_content (VALUE self, VALUE inspected)
+{
+    grn_ctx *context = NULL;
+    grn_obj *index_column;
+    grn_obj source_ids;
+    unsigned int i, n_ids;
+
+    rb_grn_index_column_deconstruct(SELF(self), &index_column, &context,
+                                    NULL, NULL,
+                                    NULL, NULL, NULL,
+                                    NULL, NULL,
+                                    NULL, NULL);
+    if (!context)
+        return inspected;
+    if (!index_column)
+        return inspected;
+
+    GRN_UINT32_INIT(&source_ids, GRN_OBJ_VECTOR);
+
+    grn_obj_get_info(context, index_column, GRN_INFO_SOURCE, &source_ids);
+    n_ids = GRN_BULK_VSIZE(&source_ids) / sizeof(grn_id);
+
+    rb_str_cat2(inspected, ", ");
+    rb_str_cat2(inspected, "sources: ");
+
+    rb_str_cat2(inspected, "<");
+    for (i = 0; i < n_ids; i++) {
+        grn_id source_id;
+        grn_obj *source;
+
+        if (i > 0) {
+            rb_str_cat2(inspected, ",");
+        }
+
+        source_id = GRN_UINT32_VALUE_AT(&source_ids, i);
+        source = grn_ctx_at(context, source_id);
+        if (source) {
+            char source_name[GRN_TABLE_MAX_KEY_SIZE];
+            unsigned int source_name_size;
+
+            switch (source->header.type) {
+            case GRN_TABLE_HASH_KEY:
+            case GRN_TABLE_PAT_KEY:
+            case GRN_TABLE_DAT_KEY:
+            case GRN_TABLE_NO_KEY:
+                rb_str_cat2(inspected, GRN_COLUMN_NAME_KEY);
+                break;
+            default:
+                source_name_size =
+                    grn_column_name(context, source,
+                                    source_name, GRN_TABLE_MAX_KEY_SIZE);
+                rb_str_cat(inspected, source_name, source_name_size);
+                break;
+            }
+
+            grn_obj_unlink(context, source);
+        } else {
+            rb_str_catf(inspected, "(nil:%u)", source_id);
+        }
+    }
+    rb_str_cat2(inspected, ">");
+
+    grn_obj_unlink(context, &source_ids);
+
+    return inspected;
+}
+
+/*
+ * Inspects the index column.
+ *
+ * @overload inspect
+ *   @return [String] the inspected string.
+ */
+static VALUE
+rb_grn_index_column_inspect (VALUE self)
+{
+    VALUE inspected;
+
+    inspected = rb_str_new2("");
+    rb_grn_object_inspect_header(self, inspected);
+    rb_grn_object_inspect_content(self, inspected);
+    rb_grn_index_column_inspect_content(self, inspected);
+    rb_grn_object_inspect_footer(self, inspected);
+
+    return inspected;
+}
+
 /*
  * Adds a record that has @value@ content to inverted index for fast
  * fulltext serach. Normally, this method is not used
@@ -873,6 +961,9 @@ rb_grn_init_index_column (VALUE mGrn)
     rb_cGrnIndexColumn =
         rb_define_class_under(mGrn, "IndexColumn", rb_cGrnColumn);
 
+    rb_define_method(rb_cGrnIndexColumn, "inspect",
+                     rb_grn_index_column_inspect, 0);
+
     rb_define_method(rb_cGrnIndexColumn, "add",
                      rb_grn_index_column_add, -1);
     rb_define_method(rb_cGrnIndexColumn, "delete",

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

@@ -666,22 +666,16 @@ VALUE
 rb_grn_object_inspect_object_content_name (VALUE inspected,
                                            grn_ctx *context, grn_obj *object)
 {
+    char name[GRN_TABLE_MAX_KEY_SIZE];
     int name_size;
 
-    name_size = grn_obj_name(context, object, NULL, 0);
+    name_size = grn_obj_name(context, object, name, GRN_TABLE_MAX_KEY_SIZE);
     if (name_size == 0) {
         rb_str_cat2(inspected, "(anonymous)");
     } else {
-        grn_obj name;
-
-        GRN_OBJ_INIT(&name, GRN_BULK, 0, GRN_ID_NIL);
-        grn_bulk_space(context, &name, name_size);
-        grn_obj_name(context, object, GRN_BULK_HEAD(&name), name_size);
-        GRN_TEXT_PUTC(context, &name, '\0');
         rb_str_cat2(inspected, "<");
-        rb_str_cat2(inspected, GRN_BULK_HEAD(&name));
+        rb_str_cat(inspected, name, name_size);
         rb_str_cat2(inspected, ">");
-        grn_obj_unlink(context, &name);
     }
 
     return inspected;

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2014  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
@@ -77,7 +77,6 @@ rb_grn_table_bind (RbGrnTable *rb_grn_table,
     rb_grn_object = RB_GRN_OBJECT(rb_grn_table);
     rb_grn_table->value = grn_obj_open(context, GRN_BULK, 0,
                                        rb_grn_object->range_id);
-    rb_grn_table->columns = Qnil;
     rb_grn_table->columns = rb_ary_new();
 }
 
@@ -336,27 +335,6 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
     return rb_column;
 }
 
-static grn_bool
-n_gram_tokenizer_p(grn_ctx *context, grn_obj *tokenizer)
-{
-    char tokenizer_name[GRN_TABLE_MAX_KEY_SIZE];
-    int name_size;
-
-    name_size = grn_obj_name(context, tokenizer,
-                             tokenizer_name, sizeof(tokenizer_name) - 1);
-    if (name_size == 0)
-        return GRN_FALSE;
-
-    tokenizer_name[name_size] = '\0';
-
-#define HAVE_PREFIX_P(prefix) \
-    (strncmp(tokenizer_name, prefix, strlen(prefix)) == 0)
-    return (HAVE_PREFIX_P("TokenUnigram") ||
-            HAVE_PREFIX_P("TokenBigram") ||
-            HAVE_PREFIX_P("TokenTrigram"));
-#undef HAVE_PREFIX_P
-}
-
 /*
  * テーブルに名前が _name_ で型が _value_type_ のインデックスカ
  * ラムを定義し、新しく定義されたカラムを返す。
@@ -455,7 +433,7 @@ rb_grn_table_define_index_column (int argc, VALUE *argv, VALUE self)
         tokenizer = grn_obj_get_info(context, table,
                                      GRN_INFO_DEFAULT_TOKENIZER,
                                      NULL);
-        if (tokenizer && n_gram_tokenizer_p(context, tokenizer)) {
+        if (tokenizer) {
             rb_with_position = Qtrue;
         }
     }
@@ -639,6 +617,8 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
         grn_id *column_id;
         grn_obj *column;
         VALUE rb_column;
+        grn_user_data *user_data;
+        grn_bool need_to_set_name = GRN_FALSE;
 
         grn_table_cursor_get_key(context, cursor, &key);
         column_id = key;
@@ -650,7 +630,21 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
             rb_exc_raise(exception);
         }
 
+        user_data = grn_obj_user_data(context, column);
+        if (user_data && !user_data->ptr) {
+            need_to_set_name = GRN_TRUE;
+        }
         rb_column = GRNOBJECT2RVAL(Qnil, context, column, GRN_FALSE);
+        if (need_to_set_name) {
+            char name[GRN_TABLE_MAX_KEY_SIZE];
+            int name_size = 0;
+            RbGrnNamedObject *rb_grn_named_object;
+            name_size = grn_column_name(context, column,
+                                        name, GRN_TABLE_MAX_KEY_SIZE);
+            rb_grn_named_object = RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column));
+            rb_grn_named_object_set_name(rb_grn_named_object, name, name_size);
+        }
+
         rb_ary_push(rb_columns, rb_column);
     }
     rc = grn_table_cursor_close(context, cursor);

data/ext/groonga/rb-grn.h

@@ -84,7 +84,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 4
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 1
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/lib/groonga/dumper.rb

@@ -565,7 +565,7 @@ module Groonga
         end
         parameters << "#{flags.join('|')}"
         if table.domain
-          parameters << "--key_type #{table.domain.name}"
+          parameters << table.domain.name
         end
         if table.range
           parameters << "--value_type #{table.range.name}"

data/lib/groonga/patricia-trie.rb

@@ -41,7 +41,10 @@ module Groonga
     #   other_text_handler = Proc.new do |string|
     #     h(string)
     #   end
-    #   words.tag_keys(text) do |record, word|
+    #   options = {
+    #     :other_text_handler => other_text_handler,
+    #   }
+    #   words.tag_keys(text, options) do |record, word|
     #     "<span class=\"keyword\">#{h(word)}(#{h(record.key)})</span>\n"
     #   end
     #   # =>

data/lib/groonga/schema.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -962,8 +962,10 @@ module Groonga
       #   - :with_position :=
       #     +true+ を指定すると転置索引に出現位置情報を合わせて
       #     格納する。未指定または +nil+ を指定した場合、テーブル
-      #     がN-gram系のトークナイザーを利用している場合は
-      #     自動的に有効になる。 =:
+      #     がトークナイザー利用している場合は自動的に有効になる。
+      #     +TokenDelimit+ など全文検索用ではないトークナイザーを
+      #     使う場合は明示的に +false+ を指定することで使用リソース
+      #     を少なくできる。=:
       def index(target_table_or_target_column_full_name, *args)
         key, target_table, target_columns, options =
           parse_index_argument(target_table_or_target_column_full_name, *args)
@@ -1305,6 +1307,7 @@ module Groonga
       def parse_index_argument(target_table_or_target_column_full_name, *args)
         options = nil
         options = args.pop if args.last.is_a?(::Hash)
+        options ||= {}
         if args.empty?
           target_column_full_name = target_table_or_target_column_full_name
           if target_column_full_name.is_a?(Groonga::Column)
@@ -1321,7 +1324,10 @@ module Groonga
           target_columns = args
           key = [target_table_name, target_columns]
         end
-        [key, target_table, target_columns, options || {}]
+        if target_columns.size > 1 and options[:with_section].nil?
+          options[:with_section] = true
+        end
+        [key, target_table, target_columns, options]
       end
 
       def same_table?(table, options)

data/rroonga-build.rb

@@ -27,7 +27,7 @@ module RroongaBuild
   module LatestGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 1
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-context.rb

@@ -132,7 +132,7 @@ class ContextTest < Test::Unit::TestCase
   class RestoreTest < self
     def test_simple
       commands = <<EOD
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 column_create Items title COLUMN_SCALAR Text
 EOD
       restore(commands)
@@ -143,44 +143,44 @@ EOD
     def test_continuation_lines
       dumped_commands = <<-EOD
 table_create Items TABLE_HASH_KEY\\
- --key_type ShortText
+ ShortText
 EOD
       restore(dumped_commands)
 
       assert_equal(<<-EOC, dump)
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 EOC
     end
 
     def test_empty_line
       restore(<<-EOC)
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 
 column_create Items title COLUMN_SCALAR Text
 
 EOC
 
       assert_equal(<<-EOC, dump)
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 column_create Items title COLUMN_SCALAR Text
 EOC
     end
 
     def test_comment
       restore(<<-EOC)
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 # column_create Items url COLUMN_SCALAR ShortText
 column_create Items title COLUMN_SCALAR Text
 EOC
 
       assert_equal(<<-EOC, dump)
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 column_create Items title COLUMN_SCALAR Text
 EOC
     end
 
     def test_block
-      table_create = "table_create Items TABLE_HASH_KEY --key_type ShortText"
+      table_create = "table_create Items TABLE_HASH_KEY ShortText"
       column_create = "column_create Items title COLUMN_SCALAR Text"
       commands = <<-COMMANDS
 #{table_create}

data/test/test-database-dumper.rb

@@ -50,7 +50,7 @@ class DatabaseDumperTest < Test::Unit::TestCase
       end
 
       schema.change_table("Tags") do |table|
-        table.index("Posts.tag_text")
+        table.index("Posts.tag_text", :with_position => false)
       end
     end
   end
@@ -88,10 +88,10 @@ column_create Posts rank COLUMN_SCALAR Int32
 column_create Posts tag_text COLUMN_SCALAR ShortText
 column_create Posts title COLUMN_SCALAR Text
 
-table_create Tags TABLE_HASH_KEY --key_type ShortText --default_tokenizer TokenDelimit
+table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer TokenDelimit
 column_create Tags name COLUMN_SCALAR Text
 
-table_create Users TABLE_HASH_KEY --key_type ShortText
+table_create Users TABLE_HASH_KEY ShortText
 column_create Users name COLUMN_SCALAR Text
     SCHEMA
   end
@@ -298,7 +298,7 @@ load --table Users
                             :type => :hash,
                             :key_type => :short_text,
                             :default_tokenizer => :delimit) do |table|
-          table.index("Posts.tag_text")
+          table.index("Posts.tag_text", :with_position => false)
         end
       end
     end
@@ -315,7 +315,7 @@ table_create Posts TABLE_NO_KEY
 column_create Posts tag_text COLUMN_SCALAR ShortText
 column_create Posts title COLUMN_SCALAR Text
 
-table_create Tags TABLE_HASH_KEY --key_type ShortText --default_tokenizer TokenDelimit
+table_create Tags TABLE_HASH_KEY ShortText --default_tokenizer TokenDelimit
 
 load --table Posts
 [
@@ -346,7 +346,7 @@ COMMAND
 
     def test_have_records
       assert_equal(<<-DUMP, dump)
-table_create Users TABLE_PAT_KEY --key_type ShortText
+table_create Users TABLE_PAT_KEY ShortText
 
 load --table Users
 [