rroonga 7.0.2 → 7.1.1

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

@@ -1,7 +1,7 @@
-/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-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
@@ -126,6 +126,25 @@ rb_grn_convert_to_array (VALUE object)
     return rb_convert_type(object, RUBY_T_ARRAY, "Array", "to_ary");
 }
 
+VALUE
+rb_grn_convert_to_path (VALUE object)
+{
+    VALUE path;
+
+    path = rb_grn_check_convert_to_string(object);
+    if (NIL_P(path)) {
+        ID to_path;
+        CONST_ID(to_path, "to_path");
+        path = rb_check_funcall(object, to_path, 0, 0);
+        if (path == Qundef) {
+            path = object;
+        }
+        path = rb_grn_convert_to_string(path);
+    }
+
+    return path;
+}
+
 VALUE
 rb_grn_check_convert_to_string (VALUE object)
 {

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2017  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2015-2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -98,8 +98,8 @@ RB_GRN_BEGIN_DECLS
 #endif
 
 #define RB_GRN_MAJOR_VERSION 7
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MINOR_VERSION 1
+#define RB_GRN_MICRO_VERSION 1
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
@@ -248,6 +248,18 @@ struct _RbGrnPlugin
     grn_id id;
 };
 
+typedef struct _RbGrnColumnCache RbGrnColumnCache;
+struct _RbGrnColumnCache
+{
+    VALUE self;
+    grn_ctx *context;
+    VALUE rb_column;
+    grn_column_cache *column_cache;
+    grn_obj buffer;
+    grn_obj *range;
+    grn_obj *table;
+};
+
 RB_GRN_VAR grn_bool rb_grn_exited;
 
 RB_GRN_VAR VALUE rb_eGrnError;
@@ -306,6 +318,7 @@ RB_GRN_VAR VALUE rb_cGrnIndex;
 RB_GRN_VAR VALUE rb_mGrnRequestCanceler;
 RB_GRN_VAR VALUE rb_mGrnRequestTimer;
 RB_GRN_VAR VALUE rb_cGrnRequestTimerID;
+RB_GRN_VAR VALUE rb_cGrnColumnCache;
 
 void           rb_grn_init_utils                    (VALUE mGrn);
 void           rb_grn_init_exception                (VALUE mGrn);
@@ -369,6 +382,7 @@ void           rb_grn_init_request_timer_id         (VALUE mGrn);
 void           rb_grn_init_id                       (VALUE mGrn);
 void           rb_grn_init_name                     (VALUE mGrn);
 void           rb_grn_init_default_cache            (VALUE mGrn);
+void           rb_grn_init_column_cache             (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 void           rb_grn_rc_check                      (grn_rc rc,
@@ -404,6 +418,7 @@ grn_bool       rb_grn_equal_string                  (const char *string1,
                                                      const char *string2);
 VALUE          rb_grn_convert_to_string             (VALUE object);
 VALUE          rb_grn_convert_to_array              (VALUE object);
+VALUE          rb_grn_convert_to_path               (VALUE object);
 VALUE          rb_grn_check_convert_to_string       (VALUE object);
 VALUE          rb_grn_check_convert_to_array        (VALUE object);
 VALUE          rb_grn_check_convert_to_hash         (VALUE object);

data/ext/groonga/rb-groonga.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2018  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
@@ -257,4 +257,5 @@ Init_groonga (void)
     rb_grn_init_id(mGrn);
     rb_grn_init_name(mGrn);
     rb_grn_init_default_cache(mGrn);
+    rb_grn_init_column_cache(mGrn);
 }

data/lib/groonga.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2018  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
@@ -32,6 +30,13 @@ if local_groonga_bin_dir.exist?
   end
 
   prepend_path.call("PATH", File::PATH_SEPARATOR)
+
+  begin
+    require "ruby_installer/runtime"
+  rescue LoadError
+  else
+    RubyInstaller::Runtime.add_dll_directory(local_groonga_bin_dir.to_s)
+  end
 end
 
 require "groonga/geo-point"
@@ -91,9 +96,7 @@ module Groonga
 end
 
 require "groonga/context"
-require "groonga/statistic-measurer"
 require "groonga/database"
-require "groonga/table"
 require "groonga/column"
 require "groonga/patricia-trie"
 require "groonga/index-column"

data/lib/groonga/column.rb

@@ -17,11 +17,6 @@
 
 module Groonga
   class Column
-    def disk_usage
-      measurer = StatisticMeasurer.new
-      measurer.measure_disk_usage(path)
-    end
-
     # @param [Groonga::Operator] operator (Groonga::Operator::MATCH)
     # @return [Array<Groonga::IndexColumn>] Indexes on `column` which can
     #    execute `operator`.

data/lib/groonga/database.rb

@@ -44,16 +44,6 @@ module Groonga
       paths
     end
 
-    def disk_usage
-      return 0 if path.nil?
-
-      usage = 0
-      measurer = StatisticMeasurer.new
-      usage += measurer.measure_disk_usage(path)
-      usage += measurer.measure_disk_usage("%s.%07X" % [path, 0])
-      usage
-    end
-
     def dump_index(output_directory)
       each do |object|
         next unless object.is_a?(Groonga::IndexColumn)

data/lib/groonga/index-column.rb

@@ -24,16 +24,6 @@ module Groonga
       dumper = IndexColumnDumper.new(self, output_directory)
       dumper.dump
     end
-
-    def disk_usage
-      return 0 if path.nil?
-
-      usage = super
-      chunk_path = "#{path}.c"
-      measurer = StatisticMeasurer.new
-      usage += measurer.measure_disk_usage(chunk_path)
-      usage
-    end
   end
 
   class IndexColumnDumper

data/lib/groonga/query-logger.rb

@@ -41,7 +41,7 @@ module Groonga
       class << self
         # TODO: Document me.
         def parse(input, base_flags=nil)
-          base_flags |= Flags::NONE
+          base_flags ||= Flags::NONE
           case input
           when nil
             base_flags

data/rroonga-build.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2015-2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -17,16 +17,16 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 7
-    MINOR = 0
-    MICRO = 2
+    MINOR = 1
+    MICRO = 1
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2017, 4, 29)
+    RELEASED_DATE = Time.utc(2018, 1, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 7
-    MINOR = 0
-    MICRO = 2
+    MINOR = 1
+    MICRO = 1
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -89,7 +89,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rake-compiler", [">= 0.9.5"])
-  s.add_development_dependency("rake-compiler-dock", [">= 0.6.0"])
+  s.add_development_dependency("rake-compiler-dock", [">= 0.6.2"])
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
   s.add_development_dependency("packnga", [">= 1.0.0"])

data/test/groonga-test-utils.rb

@@ -68,12 +68,10 @@ module GroongaTestUtils
     @dump_log = false
 
     @log_path = @tmp_dir + "groonga.log"
-    logger = Groonga::FileLogger.new(@log_path.to_s)
-    Groonga::Logger.register(logger)
+    Groonga::Logger.path = @log_path.to_s
 
     @query_log_path = @tmp_dir + "groonga-query.log"
-    query_logger = Groonga::FileQueryLogger.new(@query_log_path.to_s)
-    Groonga::QueryLogger.register(query_logger, :all => true)
+    Groonga::QueryLogger.path = @query_log_path.to_s
   end
 
   def setup_tables_directory
@@ -130,11 +128,10 @@ module GroongaTestUtils
 
   def teardown_log_path
     return unless @dump_log
-    log_path = Groonga::Logger.log_path
-    if File.exist?(log_path)
-      header = "--- log: #{log_path} ---"
+    if @log_path.exist?(log_path)
+      header = "--- log: #{@log_path} ---"
       puts(header)
-      puts(File.read(log_path))
+      puts(@log_path.read)
       puts("-" * header.length)
     end
     if @query_log_path.exist?

data/test/test-array.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2018  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
@@ -157,134 +157,4 @@ class ArrayTest < Test::Unit::TestCase
     user_ids = users.each.collect(&:id)
     assert_equal([1, 2, 3], user_ids)
   end
-
-  class TestPushPull < self
-    def setup
-      @queue = Groonga::Array.create(:name => "Queue")
-      @queue.define_column("content", "ShortText")
-    end
-
-    def teardown
-      @queue = nil
-    end
-
-    def test_block?
-      Tempfile.open("output") do |output|
-        Tempfile.open("blocked_pull.rb") do |pull_rb|
-          pull_rb.puts(pull_rb_source(":block? => true"))
-          pull_rb.close
-
-          pid = spawn({}, RbConfig.ruby, pull_rb.path, :out => output.path)
-          sleep(0.5)
-          @queue.push do |record|
-            record.content = "The first record"
-          end
-          Process.waitpid(pid)
-          assert_equal(<<-EXPECTED_OUTPUT, output.read)
-start
-1, The first record
-done
-EXPECTED_OUTPUT
-        end
-      end
-    end
-
-    def test_not_block?
-      Tempfile.open("output") do |output|
-        Tempfile.open("not_blocked_pull.rb") do |pull_rb|
-          pull_rb.puts(pull_rb_source(":block? => false"))
-          pull_rb.close
-
-          pid = spawn({}, RbConfig.ruby, pull_rb.path, :out => output.path)
-          Process.waitpid(pid)
-          assert_equal(<<-EXPECTED_OUTPUT, output.read)
-start
-done
-EXPECTED_OUTPUT
-
-          @queue.push do |record|
-            record.content = "The first record"
-          end
-          pid = spawn({}, RbConfig.ruby, pull_rb.path, :out => output.path)
-          Process.waitpid(pid)
-          output.rewind
-          assert_equal(<<-EXPECTED_OUTPUT, output.read)
-start
-1, The first record
-done
-EXPECTED_OUTPUT
-        end
-      end
-    end
-
-    def test_unblock
-      IO.pipe do |read_io, write_io|
-        Tempfile.open("not_blocked_pull.rb") do |pull_rb|
-          pull_rb.puts(pull_rb_source(":block? => true"))
-          pull_rb.close
-
-          pid = spawn({}, RbConfig.ruby, pull_rb.path, :out => write_io)
-          assert_equal("start", read_io.gets.chomp)
-          Process.kill(:TERM, pid)
-          @queue.unblock
-          assert_equal("SIGTERM", read_io.gets.chomp)
-          wait_finished(pid)
-          write_io.close
-          assert_equal("done", read_io.read.chomp)
-        end
-      end
-    end
-
-    private
-    def pull_rb_source(options)
-      base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-      <<-CODE
-$stdout.sync = true
-
-base_dir = #{base_dir.dump}
-
-groonga_command_dir = File.join(base_dir, "..", "groonga-command")
-if File.exist?(groonga_command_dir)
-  $LOAD_PATH.unshift(File.join(groonga_command_dir, "lib"))
-end
-
-groonga_client_dir = File.join(base_dir, "..", "groonga-client")
-if File.exist?(groonga_client_dir)
-  $LOAD_PATH.unshift(File.join(groonga_client_dir, "lib"))
-end
-
-ext_dir = File.join(base_dir, "ext", "groonga")
-lib_dir = File.join(base_dir, "lib")
-
-$LOAD_PATH.unshift(ext_dir)
-$LOAD_PATH.unshift(lib_dir)
-
-require "groonga"
-
-trap(:TERM) do
-  puts("SIGTERM")
-end
-
-puts("start")
-Groonga::Context.default.open_database(#{@database_path.to_s.dump}) do
-  queue = Groonga["Queue"]
-  queue.pull(#{options}) do |record|
-    puts([record.id, record.content].join(", "))
-  end
-end
-puts("done")
-CODE
-    end
-
-    def wait_finished(pid)
-      n_retries = 3
-      n_retries.times do |i|
-        @queue.unblock
-        finished_pid = Process.waitpid(pid, Process::WNOHANG)
-        return if finished_pid
-        sleep((2 ** i) * 0.1)
-      end
-      Process.waitpid(pid)
-    end
-  end
 end

data/test/test-column-cache.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2018  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
+
+class ColumnCacheTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    setup_database
+
+    setup_users_table
+  end
+
+  def setup_users_table
+    Groonga::Schema.define do |schema|
+      schema.create_table("Users", :type => :hash) do |table|
+        table.integer32("age")
+      end
+    end
+
+    @users = context["Users"]
+    @users.add("alice", :age => 9)
+    @users.add("bob",   :age => 19)
+    @users.add("chris", :age => 29)
+
+    @age = @users.column("age")
+  end
+
+  def test_array_reference
+    Groonga::ColumnCache.open(@age) do |column_cache|
+      assert_equal(@users.collect(&:age),
+                   @users.collect {|user| column_cache[user]})
+    end
+  end
+end