rroonga 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503d0a50ec18bb2f348918e9604d3d741789b742
-  data.tar.gz: e22349e0fc515632567417b2ac6a1da1d026a0ff
+  metadata.gz: 0e374f62d1dc60540f41658d346241ed699fb853
+  data.tar.gz: a41b8257c7716190ea709d516fd34e4229c36c38
 SHA512:
-  metadata.gz: a50ee57fe8bad9362b36745e062026045e019784a87fc23c45f157ed4d1c618b890939b112f484315ee8f24379604a2f77f9ac38569cd92e5a3167c2c9ff34c2
-  data.tar.gz: 5038e0c3e321b54d00e8675727cbde1dd6a2590f1a30d9b82f86c725e54cbc98b991a014a10fdd9b8b8b6f425a83bf98e3863c8a73f5ebd1c0218e4844df6a09
+  metadata.gz: 325d4a719363ba06a78c9e8109926b6312d2f677650f85b242d889c7b2145963323e4c5c347e691c75f0c917bbb32c74513401eae7fc0220050efa0dcaa50515
+  data.tar.gz: aecc0398616ba0b886db0eae9bba0599af1d414f2a70be4c79139a2402aaedae9966b600033559c7509328324637e5ab4642af44e8bab86a6155963caa424123

data/.yardopts

@@ -1,5 +1,5 @@
 --output-dir doc/reference/en
---markup textile
+--markup markdown
 lib/**/*.rb
 ext/**/*.c
 -

data/benchmark/common.rb

@@ -1,7 +1,7 @@
-require 'benchmark'
-require 'tempfile'
+require "benchmark"
+require "tempfile"
 
-def memory_usage()
+def memory_usage
   status = `cat /proc/#{$$}/status`
   lines = status.split("\n")
   lines.each do |line|
@@ -10,7 +10,7 @@ def memory_usage()
       return line.to_i / 1024.0
     end
   end
-  return -1;
+  return -1
 end
 
 @items = []

data/benchmark/create-wikipedia-database.rb

@@ -1,10 +1,10 @@
 # Wikipedia data: http://download.wikimedia.org/jawiki/latest/jawiki-latest-pages-articles.xml.bz2
 
-require 'time'
-require 'fileutils'
-require 'groonga'
+require "time"
+require "fileutils"
+require "groonga"
 
-require 'nokogiri'
+require "nokogiri"
 
 class WikipediaExtractor
   def initialize(listener)
@@ -200,7 +200,7 @@ class GroongaLoader
   def load_links(title, content)
     links = content.scan(/\[\[.*?\]\]/)
     links = links.collect do |link|
-      link.sub(/\A\[\[/, '').sub(/\]\]\z/, '').sub(/\|[^\|]+\z/, '')
+      link.sub(/\A\[\[/, "").sub(/\]\]\z/, "").sub(/\|[^\|]+\z/, "")
     end
     @documents.add(title, :links => links)
   end

data/benchmark/read-write-many-small-items.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # This benchmark is based on Tokyo Cabinet's benchmark at
 # http://alpha.mixi.co.jp/blog/?p=791
@@ -52,7 +52,7 @@ begin
   $LOAD_PATH.unshift(File.join(base_dir, "ext", "groonga"))
   $LOAD_PATH.unshift(File.join(base_dir, "lib"))
 
-  require 'groonga'
+  require "groonga"
   tmp_dir = "/tmp/groonga"
   FileUtils.rm_rf(tmp_dir)
   FileUtils.mkdir(tmp_dir)
@@ -93,7 +93,7 @@ rescue LoadError
 end
 
 begin
-  require 'localmemcache'
+  require "localmemcache"
 
   LocalMemCache.drop(:namespace => "read-write-many-small-items",
                      :force => true)
@@ -108,9 +108,9 @@ rescue LoadError
 end
 
 begin
-  require 'tokyocabinet'
+  require "tokyocabinet"
 
-  tc_hash_memory = TokyoCabinet::ADB::new
+  tc_hash_memory = TokyoCabinet::ADB.new
   tc_hash_memory.open("*#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Hash: memory") do
     values.each do |value|
@@ -119,7 +119,7 @@ begin
     end
   end
 
-  tc_tree_memory = TokyoCabinet::ADB::new
+  tc_tree_memory = TokyoCabinet::ADB.new
   tc_tree_memory.open("+#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Tree: memory") do
     values.each do |value|
@@ -129,7 +129,7 @@ begin
   end
 
   hash_file = Tempfile.new(["tc-hash", ".tch"])
-  tc_hash_file = TokyoCabinet::ADB::new
+  tc_hash_file = TokyoCabinet::ADB.new
   tc_hash_file.open("#{hash_file.path}#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Hash: file") do
     values.each do |value|
@@ -139,7 +139,7 @@ begin
   end
 
   tree_file = Tempfile.new(["tc-tree", ".tcb"])
-  tc_tree_file = TokyoCabinet::ADB::new
+  tc_tree_file = TokyoCabinet::ADB.new
   tc_tree_file.open("#{tree_file.path}#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Tree: file") do
     values.each do |value|

data/benchmark/repeat-load.rb

@@ -1,10 +1,10 @@
-require 'fileutils'
-require 'shellwords'
+require "fileutils"
+require "shellwords"
 
-require 'groonga'
+require "groonga"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'create-wikipedia-database'
+require "create-wikipedia-database"
 
 class SampleRecords
   def initialize(record_count)

data/benchmark/select.rb

@@ -1,10 +1,10 @@
-#encoding: UTF-8
+# -*- coding: utf-8 -*-
 
-require 'benchmark'
-require 'shellwords'
-require 'optparse'
+require "benchmark"
+require "shellwords"
+require "optparse"
 
-require 'groonga'
+require "groonga"
 
 Groonga::Logger.query_log_path = "/tmp/query.log"
 
@@ -17,7 +17,7 @@ module ColumnTokenizer
     end
     tokens.each do |token|
       unless token == "*"
-        token.sub!(/[^A-Za-z0-9_]\z/, '')
+        token.sub!(/[^A-Za-z0-9_]\z/, "")
       end
     end
   end
@@ -217,7 +217,7 @@ class Query
     end
 
     def to_parameter_symbol(name)
-      name.sub(NAMED_PARAMETER_PREFIX, '').to_sym
+      name.sub(NAMED_PARAMETER_PREFIX, "").to_sym
     end
 
     def create_query
@@ -383,7 +383,7 @@ class SelectorByMethod < Selector
     tokens = tokenize_column_list(sort_by)
 
     tokens.collect do |token|
-      key = token.sub(DESCENDING_ORDER_PREFIX, '')
+      key = token.sub(DESCENDING_ORDER_PREFIX, "")
       if token =~ DESCENDING_ORDER_PREFIX
         descending_order_sort_key(key)
       else
@@ -493,7 +493,7 @@ class SelectorByMethod < Selector
     columns = columns.collect do |column|
       if column == "*"
         table.columns.collect(&:name).collect do |name|
-          name.sub(/\A[A-Za-z0-9_]+\./, '')
+          name.sub(/\A[A-Za-z0-9_]+\./, "")
         end
       else
         column if column_included_in_record?(column, result.first)

data/benchmark/write-many-small-items.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # This benchmark is based on Tokyo Cabinet's benchmark at
 # http://alpha.mixi.co.jp/blog/?p=791
@@ -51,7 +51,7 @@ begin
   $LOAD_PATH.unshift(File.join(base_dir, "ext", "groonga"))
   $LOAD_PATH.unshift(File.join(base_dir, "lib"))
 
-  require 'groonga'
+  require "groonga"
   tmp_dir = "/tmp/groonga"
   FileUtils.rm_rf(tmp_dir)
   FileUtils.mkdir(tmp_dir)
@@ -89,7 +89,7 @@ rescue LoadError
 end
 
 begin
-  require 'localmemcache'
+  require "localmemcache"
 
   LocalMemCache.drop(:namespace => "write-many-small-items", :force => true)
   mem_cache = LocalMemCache.new(:namespace => "write-many-small-items")
@@ -102,9 +102,9 @@ rescue LoadError
 end
 
 begin
-  require 'tokyocabinet'
+  require "tokyocabinet"
 
-  tc_hash_memory = TokyoCabinet::ADB::new
+  tc_hash_memory = TokyoCabinet::ADB.new
   tc_hash_memory.open("*#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Hash: memory") do
     values.each do |value|
@@ -112,7 +112,7 @@ begin
     end
   end
 
-  tc_tree_memory = TokyoCabinet::ADB::new
+  tc_tree_memory = TokyoCabinet::ADB.new
   tc_tree_memory.open("+#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Tree: memory") do
     values.each do |value|
@@ -121,7 +121,7 @@ begin
   end
 
   hash_file = Tempfile.new(["tc-hash", ".tch"])
-  tc_hash_file = TokyoCabinet::ADB::new
+  tc_hash_file = TokyoCabinet::ADB.new
   tc_hash_file.open("#{hash_file.path}#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Hash: file") do
     values.each do |value|
@@ -130,7 +130,7 @@ begin
   end
 
   tree_file = Tempfile.new(["tc-tree", ".tcb"])
-  tc_tree_file = TokyoCabinet::ADB::new
+  tc_tree_file = TokyoCabinet::ADB.new
   tc_tree_file.open("#{tree_file.path}#bnum=#{n}#mode=wct#xmsiz=0")
   item("TC: Tree: file") do
     values.each do |value|

data/doc/text/install.textile

@@ -2,7 +2,7 @@ h1. Install
 
 This document describes how to install Rroonga.
 
-You can install Rrroonga by RubyGems. It is the standard way for Ruby
+You can install Rroonga by RubyGems. It is the standard way for Ruby
 libraries.
 
 Rroonga is depends on Groonga. So you need to install both Groonga and
@@ -48,7 +48,7 @@ Type the following command on Ruby console:
 
 <pre>
 !!!command_line
-% gem.bat install rroonga
+> gem install rroonga
 </pre>
 
 This document assumes that you're using "RubyInstaller for

data/doc/text/news.textile

@@ -1,5 +1,46 @@
 h1. NEWS
 
+h2(#4-0-6). 4.0.6: 2014-11-06
+
+h3. Improvements
+
+* Supported Groonga 4.0.7. [GitHub#28]
+** Changed {Groonga::Context#support_lzo?} always returns @false@.
+** Added {Groonga::Context#support_lz4?}.
+** Supported @:lz4@ in {Groonga::Table#define_column} options.
+** Supported @:lz4@ in {Groonga::VariableSizeColumn#compressed?} options.
+** Added {Groonga::LZ4Error}.
+** [grndump] Supported @COMPRESS_ZLIB@ and @COMPRESS_LZ4@ flags.
+** Added {Groonga::TableKeySupport#token_filters}.
+** Added {Groonga::TableKeySupport#token_filters=}.
+** Supported @:token_filters@ in {Groonga::Hash.create} options.
+** Supported @:token_filters@ in {Groonga::PatriciaTrie.create} options.
+** Supported @:token_filters@ in {Groonga::DoubleArrayTrie.create} options.
+** Supported @:token_filters@ in {Groonga::Schema.create_table} options.
+** Added {Groonga::TokenFilterError}.
+** [grndump] Supported token filters.
+* Added {Groonga::Expression#keywords}. [GitHub#30]
+* Stopped to require logger object as the first argument of
+  {Groonga::Logger.register} when block is specified.
+
+h3. Fixes
+
+* [doc] Removed deprecated example.
+  [GitHub#26] [Patch by ongaeshi]
+* Fixed a bug that a column assignment raises an error when
+  you assign value with type A and then assign value type B again.
+  [GitHub#27] [Patch by Daisuke Goto]
+* Fixed a memory leak in {Groonga::PatriciaTrie#open_near_cursor}.
+* Fixed a bug that you can access a column renamed by
+  {Groonga::Column#rename} with old name.
+  [GitHub#29] [Patch by Daisuke Goto]
+* [doc] Fixed wrong option name of {Groonga::Logger.register}.
+
+h3. Thanks
+
+* ongaeshi
+* Daisuke Goto
+
 h2(#4-0-5). 4.0.5: 2014-10-05
 
 h3. Improvements

data/doc/text/tutorial.textile

@@ -1,10 +1,10 @@
 h1. Tutorial
 
-This page introduce how to use rroonga via a simple application making.
+This page introduce how to use Rroonga via a simple application making.
 
 h2. Install
 
-You can install rroonga in your compter with RubyGems.
+You can install Rroonga in your compter with RubyGems.
 
 <pre>
 !!!command_line
@@ -14,11 +14,11 @@ You can install rroonga in your compter with RubyGems.
 h2. Create Database
 
 Let's create database for simple bookmark application.
-Please execute irb with loading rroonga with this command:
+Please execute irb with loading Rroonga with this command:
 
 <pre>
 !!!irb
-% irb --simple-prompt -rubygems -rgroonga
+% irb --simple-prompt -r groonga
 >>
 </pre>
 

data/example/bookmark.rb

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 
 base_dir = File.join(File.dirname(__FILE__), "..")
-groonga_ext_dir = File.join(base_dir, 'ext', 'groonga')
-groonga_lib_dir = File.join(base_dir, 'lib')
+groonga_ext_dir = File.join(base_dir, "ext", "groonga")
+groonga_lib_dir = File.join(base_dir, "lib")
 $LOAD_PATH.unshift(groonga_ext_dir)
 $LOAD_PATH.unshift(groonga_lib_dir)
 
@@ -14,19 +14,18 @@ rescue LoadError
   require "groonga"
 end
 
-require 'time'
+require "time"
 
 # Groonga::Logger.register(:level => :debug) do |level, time, title, message, location|
 #   p [level, time, title, message, location]
 # end
 
-$KCODE = "UTF-8"
 Groonga::Context.default_options = {:encoding => :utf8}
 
 path = ARGV[0]
 if path.nil?
-  require 'tmpdir'
-  require 'fileutils'
+  require "tmpdir"
+  require "fileutils"
   temporary_directory = File.join(Dir.tmpdir, "rroonga")
   FileUtils.mkdir_p(temporary_directory)
   at_exit {FileUtils.rm_rf(temporary_directory)}
@@ -112,7 +111,7 @@ p(add_bookmark("http://jp.rubyist.net/magazine/",
                "Rubyist Magazine - るびま", "moritan", "Ruby 記事",
                Time.parse("2010-10-07T14:18:28+09:00")))
 p(add_bookmark("http://groonga.rubyforge.org/",
-               "Rubyでgroonga使って全文検索 - ラングバ", "taporobo",
+               "RubyでGroonga使って全文検索 - ラングバ", "taporobo",
                "Ruby groonga 全文検索",
                Time.parse("2010-11-11T12:39:59+09:00")))
 p(add_bookmark("http://www.rubyist.net/~matz/",

data/example/index-html.rb

@@ -5,15 +5,15 @@ if ARGV.size < 2 or ARGV.find {|option| option == "-h" or option == "--help"}
   exit
 end
 
-require 'pathname'
+require "pathname"
 
 base_directory = Pathname(__FILE__).dirname + ".."
 $LOAD_PATH.unshift((base_directory + "ext").to_s)
 $LOAD_PATH.unshift((base_directory + "lib").to_s)
 
-require 'rubygems'
-require 'groonga'
-require 'nokogiri'
+require "rubygems"
+require "groonga"
+require "nokogiri"
 
 database_file, *targets = ARGV
 
@@ -71,8 +71,8 @@ targets.each do |target|
         end
         html_document.css("img").each do |image|
           image_content = []
-          title = image['title']
-          alt = image['alt']
+          title = image["title"]
+          alt = image["alt"]
           image_content << title if title and !title.empty?
           image_content << alt if alt and !alt.empty?
           contents.concat(image_content) unless image_content.empty?

data/ext/groonga/extconf.rb

@@ -167,11 +167,22 @@ def configure_command_line(prefix)
   escaped_command_line.join(" ")
 end
 
+def n_processors
+  proc_file = "/proc/cpuinfo"
+  if File.exist?(proc_file)
+    File.readlines(proc_file).grep(/^processor/).size
+  elsif /darwin/ =~ RUBY_PLATFORM
+    `sysctl -n hw.ncpu`.to_i
+  else
+    1
+  end
+end
+
 def install_for_gnu_build_system(install_dir)
   run_command("configuring...",
               configure_command_line(install_dir))
   run_command("building (maybe long time)...",
-              "make")
+              "make -j#{n_processors}")
   run_command("installing...",
               "make install")
 end
@@ -272,6 +283,9 @@ have_func("rb_sym2str", "ruby.h")
 have_func("rb_to_symbol", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")
 
+# TODO: Remove me after Groogna 4.0.8 is released.
+have_func("grn_expr_dump_plan", "groonga.h")
+
 checking_for(checking_message("--enable-debug-log option")) do
   enable_debug_log = enable_config("debug-log", false)
   if enable_debug_log
@@ -313,6 +327,14 @@ checking_for(checking_message("--enable-debug-build option")) do
   enable_debug_build
 end
 
+checking_for(checking_message("--enable-untyped-data-warning option")) do
+  enable_check_untyped_data = enable_config("untyped-data-warning", false)
+  if enable_check_untyped_data
+    $defs << "-DRUBY_UNTYPED_DATA_WARNING"
+  end
+  enable_check_untyped_data
+end
+
 if ENV["INSTALL_RB"] == "yes"
   $INSTALLFILES ||= []
   $INSTALLFILES << ["../../lib/**/*.rb", "$(RUBYLIBDIR)", "../../lib"]