rroonga 3.1.1-x86-mingw32 → 3.1.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4a5861e59e4308b2ec942f27bd9647330f4788
-  data.tar.gz: af9a6f75bbb91d40730617af4931dbaf5bf76fbf
+  metadata.gz: 1a3b4a2e6ad798be521e7b33fe7b214f5a783675
+  data.tar.gz: ba178733fbdc374db16f015e88cef71d79f51ab1
 SHA512:
-  metadata.gz: b5670c65060cafd6f04b3d9a13a0db65938c11083ac6b1094a71aa675d705f692d4c6c0b48ee598b7bec6f43dc5385ae3603a6541ad8097845fe6d51d6eedd8e
-  data.tar.gz: c2c26e2e48bb8c591588aa4c0b653ca2c1c6c44ef0ba1d41dc4b3870e5a3a4a885e87254339aaf5fd3486c51bd03db8018cb5711d1e15764e17e7d8747810ffa
+  metadata.gz: 928b547c85106872332eac02588ce0423f5e832059bb3eb4cb2ec9d4afc62722997e8dabcc224c55af358051a287b1683752cb680421b4adea4253c40f427c38
+  data.tar.gz: 4831c654e3d3c92709ab23628c8ba90cbd5d60ab84b360cbc354d01c17cd5ec6b6b4a6210b4ec3d1d71cf846826eb63bea5fa29884cdc7e750cf41e6cb4f62ad

data/Rakefile

@@ -26,13 +26,6 @@ require "bundler/gem_helper"
 require "rake/extensiontask"
 require "packnga"
 
-if YAML.const_defined?(:ENGINE)
-  begin
-    YAML::ENGINE.yamler = "psych"
-  rescue LoadError
-  end
-end
-
 base_dir = File.join(File.dirname(__FILE__))
 
 groonga_ext_dir = File.join(base_dir, "ext", "groonga")
@@ -105,38 +98,7 @@ relative_binary_dir = File.join("vendor", "local")
 vendor_dir = File.join(base_dir, relative_vendor_dir)
 binary_dir = File.join(base_dir, relative_binary_dir)
 
-groonga_win32_i386_p = ENV["GROONGA64"] != "yes"
-
-namespace :win32 do
-  namespace :groonga do
-    task :download do
-      require "open-uri"
-      require "./rroonga-build"
-      groonga_version = RroongaBuild::LatestGroongaVersion::VERSION.join(".")
-      base_name = "groonga-#{groonga_version}-"
-      if groonga_win32_i386_p
-        base_name << "x86"
-      else
-        base_name << "x64"
-      end
-      base_name << ".zip"
-      base_url = "http://packages.groonga.org/windows/groonga/"
-      Dir.chdir(base_dir) do
-        unless File.exist?(base_name)
-          open("#{base_url}#{base_name}", "rb") do |zip|
-            File.open(base_name, "wb") do |output|
-              output.print(zip.read)
-            end
-          end
-        end
-        sh("unzip", base_name)
-        rm_rf(relative_binary_dir)
-        mkdir_p(File.dirname(relative_binary_dir))
-        mv(File.basename(base_name, ".*"), relative_binary_dir)
-      end
-    end
-  end
-end
+groonga_win32_i386_p = ENV["RROONGA_USE_GROONGA_X64"].nil?
 
 Rake::ExtensionTask.new("groonga", spec) do |ext|
   if groonga_win32_i386_p

data/bin/grndump

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-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
@@ -26,6 +26,7 @@ options = OpenStruct.new
 options.tables = []
 options.exclude_tables = []
 options.dump_schema = true
+options.dump_indexes = true
 options.dump_tables = true
 options.order_by = "id"
 option_parser = OptionParser.new do |parser|
@@ -37,6 +38,11 @@ option_parser = OptionParser.new do |parser|
     options.dump_schema = boolean
   end
 
+  parser.on("--no-dump-indexes",
+            "don't dump indexes.") do |boolean|
+    options.dump_indexes = boolean
+  end
+
   parser.on("--no-dump-tables",
             "don't dump tables.") do |boolean|
     options.dump_tables = boolean
@@ -88,6 +94,7 @@ dumper_options = {
   :output => $stdout,
   :error_output => $stderr,
   :dump_schema => options.dump_schema,
+  :dump_indexes => options.dump_indexes,
   :dump_tables => options.dump_tables,
   :tables => options.tables,
   :exclude_tables => options.exclude_tables,

data/doc/text/news.textile

@@ -1,5 +1,25 @@
 h1. NEWS
 
+h2(#3-1-2). 3.1.2: 2014-01-29
+
+h3. Improvements
+
+* Supported Groonga 3.1.2. Groonga 3.1.1 or older are not supported.
+* Added {Groonga::Table#support_value?}.
+* Added {Groonga::Record#support_value?}.
+* Added @_value@ value to {Groonga::Record#attributes} result.
+  [groonga-dev,02046] [Suggested by ongaeshi]
+* Added column values to {Groonga::Record#inspect} result.
+  [groonga-dev,02048] [Suggested by ongaeshi]
+* grndump: Added @--dump-indexes@ option that controls schema for
+  indexes output. It is useful to dump only schema for indexes.
+* Added {Groonga.lock_timeout}.
+* Added {Groonga.lock_timeout=}.
+
+h3. Thanks
+
+* ongaeshi
+
 h2(#3-1-1). 3.1.1: 2013-12-29
 
 h3. Improvements
@@ -9,7 +29,7 @@ h3. Improvements
   all table information.
 * [groonga-database-inspect]: Added @--no-columns@ option for hiding
   all column information.
-* [doc] Updated English mailing list to use groonga-users-en.
+* [doc] Updated English mailing list to use Groonga-talk.
   [GitHub#14] [Patch by Masafumi Yokoyama]
 * {Groonga::Expression#append_operation} supports operator name.
 * {Groonga::Expression#append_constant} supports operator name.

data/ext/groonga/extconf.rb

@@ -22,12 +22,7 @@ require "fileutils"
 require "shellwords"
 require "open-uri"
 
-begin
-  require "pkg-config"
-rescue LoadError
-  require "rubygems"
-  require "pkg-config"
-end
+require "pkg-config"
 
 base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
 $LOAD_PATH.unshift(base_dir.to_s)

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

@@ -2282,6 +2282,24 @@ rb_grn_table_support_key_p (VALUE self)
     return Qfalse;
 }
 
+/*
+ * @overload support_value?
+ *
+ *   @return @true@ if the table is created with value type, @false@
+ *   otherwise.
+ */
+static VALUE
+rb_grn_table_support_value_p (VALUE self)
+{
+    grn_id range_id;
+
+    rb_grn_table_deconstruct(SELF(self), NULL, NULL,
+                             NULL, NULL,
+                             NULL, &range_id, NULL,
+                             NULL);
+    return CBOOL2RVAL(range_id != GRN_ID_NIL);
+}
+
 /*
  * グループ化したとき、テーブルにグループに含まれるレコード
  * 数を格納できる場合は +true+ 、格納できない場合は +false+ を返
@@ -2503,6 +2521,8 @@ rb_grn_init_table (VALUE mGrn)
 
     rb_define_method(rb_cGrnTable, "support_key?",
                      rb_grn_table_support_key_p, 0);
+    rb_define_method(rb_cGrnTable, "support_value?",
+                     rb_grn_table_support_value_p, 0);
     rb_define_method(rb_cGrnTable, "support_sub_records?",
                      rb_grn_table_support_sub_records_p, 0);
     rb_define_method(rb_cGrnTable, "have_n_sub_records_space?",

data/ext/groonga/rb-grn.h

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

data/ext/groonga/rb-groonga.c

@@ -107,6 +107,47 @@ rb_grn_init_version (VALUE mGrn)
     rb_define_const(mGrn, "BINDINGS_VERSION", bindings_version);
 }
 
+/*
+ * Returns the current lock timeout.
+ *
+ * See
+ * http://groonga.org/docs/reference/api/global_configurations.html
+ * about lock timeout.
+ *
+ * @overload lock_timeout
+ *    @return [Integer] The current lock timeout.
+ */
+static VALUE
+rb_grn_s_get_lock_timeout (VALUE klass)
+{
+    return INT2NUM(grn_get_lock_timeout());
+}
+
+/*
+ * Sets the current lock timeout.
+ *
+ * @overload lock_timeout=(timeout)
+ *    @param [Integer] timeout The new lock timeout.
+ *
+ * @see {#lock_timeout}
+ * @since 3.1.2
+ */
+static VALUE
+rb_grn_s_set_lock_timeout (VALUE klass, VALUE timeout)
+{
+    grn_set_lock_timeout(NUM2INT(timeout));
+    return Qnil;
+}
+
+static void
+rb_grn_init_lock_timeout (VALUE mGrn)
+{
+    rb_define_singleton_method(mGrn, "lock_timeout",
+                               rb_grn_s_get_lock_timeout, 0);
+    rb_define_singleton_method(mGrn, "lock_timeout=",
+                               rb_grn_s_set_lock_timeout, 1);
+}
+
 void
 Init_groonga (void)
 {
@@ -120,6 +161,7 @@ Init_groonga (void)
     rb_set_end_proc(finish_groonga, Qnil);
 
     rb_grn_init_version(mGrn);
+    rb_grn_init_lock_timeout(mGrn);
 
     rb_grn_init_utils(mGrn);
     rb_grn_init_encoding(mGrn);

data/lib/groonga/dumper.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-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
@@ -55,11 +55,15 @@ module Groonga
         options[:database] = options[:context].database
       end
       options[:dump_schema] = true if options[:dump_schema].nil?
+      options[:dump_indexes] = true if options[:dump_indexes].nil?
       options[:dump_tables] = true if options[:dump_tables].nil?
 
+      if options[:dump_schema] or options[:dump_indexes]
+        schema_dumper = SchemaDumper.new(options.merge(:syntax => :command))
+      end
+
       if options[:dump_schema]
         dump_plugins(options)
-        schema_dumper = SchemaDumper.new(options.merge(:syntax => :command))
         schema_dumper.dump_tables
         if schema_dumper.have_reference_columns?
           options[:output].write("\n")
@@ -67,7 +71,7 @@ module Groonga
         end
       end
       dump_tables(options) if options[:dump_tables]
-      if options[:dump_schema] and schema_dumper.have_index_columns?
+      if options[:dump_indexes] and schema_dumper.have_index_columns?
         options[:output].write("\n")
         schema_dumper.dump_index_columns
       end

data/lib/groonga/record.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
@@ -117,6 +117,12 @@ module Groonga
       @table.support_key?
     end
 
+    # @return @true@ if the table that the record belongs to is
+    # created with value type, @false@ otherwise.
+    def support_value?
+      @table.support_value?
+    end
+
     # 名前が _name_ のカラムがレコードの所属するテーブルで定義され
     # ているなら +true+ を返す。
     def have_column?(name)
@@ -344,6 +350,11 @@ module Groonga
       @added = added
     end
 
+    # @private
+    def inspect
+      super.gsub(/>\z/, ", attributes: #{attributes.inspect}>")
+    end
+
     private
     def normalize_column_name(name)
       name.to_s
@@ -429,6 +440,7 @@ module Groonga
 
         add_id(attributes, record)
         add_key(attributes, record)
+        add_value(attributes, record)
         add_score(attributes, record)
         add_n_sub_records(attributes, record)
         add_columns(attributes, record)
@@ -482,6 +494,12 @@ module Groonga
         end
       end
 
+      def add_value(attributes, record)
+        if record.support_value?
+          attributes["_value"] = build_value(record.value)
+        end
+      end
+
       def add_score(attributes, record)
         if record.support_score?
           attributes["_score"] = record.score

data/rroonga-build.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# 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
@@ -18,16 +18,16 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 3
-    MINOR = 0
-    MICRO = 8
+    MINOR = 1
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2013, 9, 29)
+    RELEASED_DATE = Time.utc(2014, 1, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 3
     MINOR = 1
-    MICRO = 1
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-array.rb

@@ -22,6 +22,19 @@ class ArrayTest < Test::Unit::TestCase
     assert_not_predicate(Groonga::Array.create(:name => "Users"), :support_key?)
   end
 
+  class SupportValueTest < self
+    def test_have_value_type
+      assert_predicate(Groonga::Array.create(:name => "Users",
+                                             :value_type => "Int32"),
+                       :support_value?)
+    end
+
+    def test_no_value_type
+      assert_not_predicate(Groonga::Array.create(:name => "Users"),
+                           :support_value?)
+    end
+  end
+
   def test_inspect_size
     path = @tables_dir + "named.groonga"
     contain_table = Groonga::Array.create(:name => "name", :path => path.to_s)
@@ -108,7 +121,7 @@ class ArrayTest < Test::Unit::TestCase
       users.add(:name => "user #{i}" * 1000,
                 :address => "address #{i}" * 1000)
     end
-    assert_equal(7, users.defrag)
+    assert_equal(3, users.defrag)
   end
 
   def test_rename

data/test/test-database-dumper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-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
@@ -69,17 +69,17 @@ class DatabaseDumperTest < Test::Unit::TestCase
   end
 
   def dumped_schema
-    <<-EOS
+    <<-SCHEMA
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
 #{dumped_schema_index_columns}
-EOS
+    SCHEMA
   end
 
   def dumped_schema_tables
-    <<-EOS.chomp
+    <<-SCHEMA.chomp
 table_create Posts TABLE_NO_KEY
 column_create Posts created_at COLUMN_SCALAR Time
 column_create Posts n_goods COLUMN_SCALAR UInt32
@@ -93,22 +93,22 @@ column_create Tags name COLUMN_SCALAR Text
 
 table_create Users TABLE_HASH_KEY --key_type ShortText
 column_create Users name COLUMN_SCALAR Text
-EOS
+    SCHEMA
   end
 
   def dumped_schema_reference_columns
-    <<-EOS.chomp
+    <<-SCHEMA.chomp
 column_create Posts author COLUMN_SCALAR Users
 column_create Posts tags COLUMN_VECTOR Tags
-EOS
+    SCHEMA
   end
 
   def dumped_schema_index_columns
-    <<-EOS.chomp
+    <<-SCHEMA.chomp
 column_create Tags Posts_tag_text COLUMN_INDEX Posts tag_text
 
 column_create Users Posts_author COLUMN_INDEX Posts author
-EOS
+    SCHEMA
   end
 
   class EmptyTest < self
@@ -130,117 +130,115 @@ EOS
                 :title => "Why search engine find?")
     end
 
-    def test_default
-      assert_equal(<<-EOS, dump)
-#{dumped_schema_tables}
-
-#{dumped_schema_reference_columns}
-
+    def dumped_table_posts
+      <<-TABLE.chomp
 load --table Posts
 [
 ["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
 [1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
 ]
+      TABLE
+    end
 
+    def dumped_table_tags
+      <<-TABLE.chomp
 load --table Tags
 [
 ["_key","name"],
 ["search",""],
 ["mori",""]
 ]
+      TABLE
+    end
 
+    def dumped_table_users
+      <<-TABLE.chomp
 load --table Users
 [
 ["_key","name"],
 ["mori",""]
 ]
+      TABLE
+    end
+
+    def dumped_tables
+      <<-TABLES.chomp
+#{dumped_table_posts}
+
+#{dumped_table_tags}
+
+#{dumped_table_users}
+      TABLES
+    end
+
+    def test_default
+      assert_equal(<<-DUMP, dump)
+#{dumped_schema_tables}
+
+#{dumped_schema_reference_columns}
+
+#{dumped_tables}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_limit_tables
-      assert_equal(<<-EOS, dump(:tables => ["Posts"]))
+      assert_equal(<<-DUMP, dump(:tables => ["Posts"]))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Posts
-[
-["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
-[1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
-]
+#{dumped_table_posts}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_limit_tables_with_regexp
-      assert_equal(<<-EOS, dump(:tables => [/Posts?/]))
+      assert_equal(<<-DUMP, dump(:tables => [/Posts?/]))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Posts
-[
-["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
-[1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
-]
+#{dumped_table_posts}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_exclude_tables
       dump_options = {
         :exclude_tables => ["Posts"],
       }
-      assert_equal(<<-EOS, dump(dump_options))
+      assert_equal(<<-DUMP, dump(dump_options))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Tags
-[
-["_key","name"],
-["search",""],
-["mori",""]
-]
+#{dumped_table_tags}
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
+#{dumped_table_users}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_exclude_tables_with_regexp
       dump_options = {
         :exclude_tables => [/Posts?/],
       }
-      assert_equal(<<-EOS, dump(dump_options))
+      assert_equal(<<-DUMP, dump(dump_options))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Tags
-[
-["_key","name"],
-["search",""],
-["mori",""]
-]
+#{dumped_table_tags}
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
+#{dumped_table_users}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_tables_combination
@@ -248,42 +246,29 @@ EOS
         :exclude_tables => ["Posts"],
         :tables => ["Posts", "Users"],
       }
-      assert_equal(<<-EOS, dump(dump_options))
+      assert_equal(<<-DUMP, dump(dump_options))
 #{dumped_schema_tables}
 
 #{dumped_schema_reference_columns}
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
+#{dumped_table_users}
 
 #{dumped_schema_index_columns}
-EOS
+      DUMP
     end
 
     def test_no_schema
-      assert_equal(<<-EOS, dump(:dump_schema => false))
-load --table Posts
-[
-["_id","author","created_at","n_goods","published","rank","tag_text","tags","title"],
-[1,"mori",1268034720.0,4,true,10,"search mori",["search","mori"],"Why search engine find?"]
-]
+      assert_equal(<<-DUMP, dump(:dump_schema => false))
+#{dumped_tables}
 
-load --table Tags
-[
-["_key","name"],
-["search",""],
-["mori",""]
-]
+#{dumped_schema_index_columns}
+      DUMP
+    end
 
-load --table Users
-[
-["_key","name"],
-["mori",""]
-]
-EOS
+    def test_no_schema_no_indexes
+      assert_equal(<<-DUMP, dump(:dump_schema => false, :dump_indexes => false))
+#{dumped_tables}
+      DUMP
     end
 
     def test_no_tables
@@ -360,7 +345,7 @@ COMMAND
     end
 
     def test_have_records
-      assert_equal(<<-EOS, dump)
+      assert_equal(<<-DUMP, dump)
 table_create Users TABLE_PAT_KEY --key_type ShortText
 
 load --table Users
@@ -369,7 +354,7 @@ load --table Users
 [\"mori\"],
 [\"s-yata\"]
 ]
-EOS
+      DUMP
     end
   end
 end