rroonga 1.2.5 → 1.2.6

data/Rakefile

@@ -26,6 +26,7 @@ require 'rubygems/package_task'
 require 'yard'
 require 'jeweler'
 require 'rake/extensiontask'
+require 'packnga'
 
 if YAML.const_defined?(:ENGINE)
   begin
@@ -101,6 +102,28 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar_gz = true
 end
 
+document_task = Packnga::DocumentTask.new(spec) do |t|
+  t.yard do |yard_task|
+    yard_task.files += FileList["ext/**/*.c"]
+  end
+end
+
+namespace :reference do
+  namespace :publication do
+    task :keep_compatible do
+      File.open(document_task.htaccess, "a") do |file|
+        file.puts("Redirect permanent /#{spec.name}/text/TUTORIAL_ja_rdoc.html " +
+                  "#{spec.homepage}#{spec.name}/ja/file.tutorial.html")
+      end
+    end
+
+    task :generate => :keep_compatible
+  end
+end
+
+Packnga::ReleaseTask.new(spec) do |task|
+end
+
 module YARD
   module CodeObjects
     class Proxy
@@ -123,33 +146,6 @@ module YARD
   end
 end
 
-reference_base_dir = Pathname.new("doc/reference")
-doc_en_dir = reference_base_dir + "en"
-html_base_dir = Pathname.new("doc/html")
-html_reference_dir = html_base_dir + spec.name
-YARD::Rake::YardocTask.new do |task|
-  task.options += ["--title", spec.name]
-  # task.options += ["--charset", "UTF-8"]
-  task.options += ["--readme", "README.textile"]
-  task.options += ["--files", "doc/text/**/*"]
-  task.options += ["--output-dir", doc_en_dir.to_s]
-  task.options += ["--charset", "utf-8"]
-  task.files += FileList["ext/groonga/**/*.c"]
-  task.files += FileList["lib/**/*.rb"]
-end
-
-task :yard do
-  doc_en_dir.find do |path|
-    next if path.extname != ".html"
-    html = path.read
-    html = html.gsub(/<div id="footer">.+<\/div>/m,
-                     "<div id=\"footer\"></div>")
-    path.open("w") do |html_file|
-      html_file.print(html)
-    end
-  end
-end
-
 def windows?(platform=nil)
   platform ||= RUBY_PLATFORM
   platform =~ /mswin(?!ce)|mingw|cygwin|bccwin/
@@ -191,264 +187,6 @@ Rake::ExtensionTask.new("groonga", spec) do |ext|
   end
 end
 
-include ERB::Util
-
-def apply_template(content, paths, templates, language)
-  content = content.sub(/lang="en"/, "lang=\"#{language}\"")
-
-  title = nil
-  content = content.sub(/<title>(.+?)<\/title>/m) do
-    title = $1
-    templates[:head].result(binding)
-  end
-
-  content = content.sub(/<body(?:.*?)>/) do |body_start|
-    "#{body_start}\n#{templates[:header].result(binding)}\n"
-  end
-
-  content = content.sub(/<\/body/) do |body_end|
-    "\n#{templates[:footer].result(binding)}\n#{body_end}"
-  end
-
-  content
-end
-
-def erb_template(name)
-  file = File.join("doc/templates", "#{name}.html.erb")
-  template = File.read(file)
-  erb = ERB.new(template, nil, "-")
-  erb.filename = file
-  erb
-end
-
-def rsync_to_rubyforge(spec, source, destination, options={})
-  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-  host = "#{config["username"]}@rubyforge.org"
-
-  rsync_args = "-av --exclude '*.erb' --chmod=ug+w"
-  rsync_args << " --delete" if options[:delete]
-  remote_dir = "/var/www/gforge-projects/#{spec.rubyforge_project}/"
-  sh("rsync #{rsync_args} #{source} #{host}:#{remote_dir}#{destination}")
-end
-
-def rake(*arguments)
-  ruby($0, *arguments)
-end
-
-namespace :reference do
-  translate_languages = [:ja]
-  supported_languages = [:en, *translate_languages]
-  html_files = FileList[doc_en_dir + "**/*.html"].to_a
-
-  directory reference_base_dir.to_s
-  CLOBBER.include(reference_base_dir.to_s)
-
-  po_dir = "doc/po"
-  namespace :pot do
-    pot_file = "#{po_dir}/#{spec.name}.pot"
-
-    directory po_dir
-    file pot_file => ["po", *html_files] do |t|
-      sh("xml2po", "--keep-entities", "--output", t.name, *html_files)
-    end
-
-    desc "Generates pot file."
-    task :generate => pot_file
-  end
-
-  namespace :po do
-    translate_languages.each do |language|
-      namespace language do
-        po_file = "#{po_dir}/#{language}.po"
-
-        file po_file => html_files do |t|
-          sh("xml2po", "--keep-entities", "--update", t.name, *html_files)
-        end
-
-        desc "Updates po file for #{language}."
-        task :update => po_file
-      end
-    end
-
-    desc "Updates po files."
-    task :update do
-      ruby($0, "clobber")
-      ruby($0, "yard")
-      translate_languages.each do |language|
-        ruby($0, "reference:po:#{language}:update")
-      end
-    end
-  end
-
-  namespace :translate do
-    translate_languages.each do |language|
-      po_file = "#{po_dir}/#{language}.po"
-      translate_doc_dir = "#{reference_base_dir}/#{language}"
-
-      desc "Translates documents to #{language}."
-      task language => [po_file, reference_base_dir, *html_files] do
-        doc_en_dir.find do |path|
-          base_path = path.relative_path_from(doc_en_dir)
-          translated_path = "#{translate_doc_dir}/#{base_path}"
-          if path.directory?
-            mkdir_p(translated_path)
-            next
-          end
-          case path.extname
-          when ".html"
-            sh("xml2po --keep-entities " +
-               "--po-file #{po_file} --language #{language} " +
-               "#{path} > #{translated_path}")
-          else
-            cp(path.to_s, translated_path, :preserve => true)
-          end
-        end
-      end
-    end
-  end
-
-  translate_task_names = translate_languages.collect do |language|
-    "reference:translate:#{language}"
-  end
-  desc "Translates references."
-  task :translate => translate_task_names
-
-  desc "Generates references."
-  task :generate => [:yard, :translate]
-
-  namespace :publication do
-    task :prepare do
-      supported_languages.each do |language|
-        raw_reference_dir = reference_base_dir + language.to_s
-        prepared_reference_dir = html_reference_dir + language.to_s
-        rm_rf(prepared_reference_dir.to_s)
-        head = erb_template("head.#{language}")
-        header = erb_template("header.#{language}")
-        footer = erb_template("footer.#{language}")
-        raw_reference_dir.find do |path|
-          relative_path = path.relative_path_from(raw_reference_dir)
-          prepared_path = prepared_reference_dir + relative_path
-          if path.directory?
-            mkdir_p(prepared_path.to_s)
-          else
-            case path.basename.to_s
-            when /(?:file|method|class)_list\.html\z/
-              cp(path.to_s, prepared_path.to_s)
-            when /\.html\z/
-              relative_dir_path = relative_path.dirname
-              current_path = relative_dir_path + path.basename
-              if current_path.basename.to_s == "index.html"
-                current_path = current_path.dirname
-              end
-              top_path = html_base_dir.relative_path_from(prepared_path.dirname)
-              paths = {
-                :top => top_path,
-                :current => current_path,
-              }
-              templates = {
-                :head => head,
-                :header => header,
-                :footer => footer
-              }
-              content = apply_template(File.read(path.to_s),
-                                       paths,
-                                       templates,
-                                       language)
-              File.open(prepared_path.to_s, "w") do |file|
-                file.print(content)
-              end
-            else
-              cp(path.to_s, prepared_path.to_s)
-            end
-          end
-        end
-      end
-      File.open("#{html_reference_dir}/.htaccess", "w") do |file|
-        file.puts("Redirect permanent /#{spec.name}/text/TUTORIAL_ja_rdoc.html " +
-                  "#{spec.homepage}#{spec.name}/ja/file.tutorial.html")
-        file.puts("RedirectMatch permanent ^/#{spec.name}/$ " +
-                  "#{spec.homepage}#{spec.name}/en/")
-      end
-    end
-  end
-
-  desc "Upload document to rubyforge."
-  task :publish => [:generate, "reference:publication:prepare"] do
-    rsync_to_rubyforge(spec, "#{html_reference_dir}/", spec.name)
-  end
-end
-
-namespace :html do
-  desc "Publish HTML to Web site."
-  task :publish do
-    rsync_to_rubyforge(spec, "#{html_base_dir}/", "")
-  end
-end
-
-desc "Upload document and HTML to rubyforge."
-task :publish => ["html:publish", "reference:publish"]
-
-desc "Tag the current revision."
-task :tag do
-  sh("git tag -a #{version} -m 'release #{version}!!!'")
-end
-
-namespace :release do
-  namespace :info do
-    desc "update version in index HTML."
-    task :update do
-      old_version = ENV["OLD_VERSION"]
-      old_release_date = ENV["OLD_RELEASE_DATE"]
-      new_release_date = ENV["RELEASE_DATE"] || Time.now.strftime("%Y-%m-%d")
-      new_version = ENV["VERSION"]
-
-      empty_options = []
-      empty_options << "OLD_VERSION" if old_version.nil?
-      empty_options << "OLD_RELEASE_DATE" if old_release_date.nil?
-
-      unless empty_options.empty?
-        raise ArgumentError, "Specify option(s) of #{empty_options.join(",")}."
-      end
-
-      indexes = ["doc/html/index.html", "doc/html/index.html.ja"]
-      indexes.each do |index|
-        content = replaced_content = File.read(index)
-        [[old_version, new_version],
-         [old_release_date, new_release_date]].each do |old, new|
-          replaced_content = replaced_content.gsub(/#{Regexp.escape(old)}/, new)
-          if /\./ =~ old
-            old_undnerscore = old.gsub(/\./, '-')
-            new_underscore = new.gsub(/\./, '-')
-            replaced_content =
-              replaced_content.gsub(/#{Regexp.escape(old_underscore)}/,
-                                    new_underscore)
-          end
-        end
-
-        next if replaced_content == content
-        File.open(index, "w") do |output|
-          output.print(replaced_content)
-        end
-      end
-    end
-  end
-
-  namespace :rubyforge do
-    desc "Upload tar.gz to RubyForge."
-    task :upload => "package" do
-      ruby("-S", "rubyforge",
-           "add_release",
-           spec.rubyforge_project,
-           spec.name,
-           spec.version.to_s,
-           "pkg/#{spec.name}-#{spec.version}.tar.gz")
-    end
-  end
-
-  desc "Release to RubyForge."
-  task :rubyforge => "release:rubyforge:upload"
-end
-
 namespace :test do
   task :install do
     gemspec_helper = Rake.application.jeweler.gemspec_helper

data/ext/groonga/Makefile

@@ -60,7 +60,7 @@ warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwri
 CFLAGS   = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC -Wall -I/tmp/local/include/groonga 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=1 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
+CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=5 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) -fno-strict-aliasing -g
 ldflags  = -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib
 dldflags = 

data/ext/groonga/extconf.rb

@@ -158,7 +158,9 @@ checking_for(checking_message("debug flag")) do
   debug
 end
 
-$INSTALLFILES ||= []
-$INSTALLFILES << ["../../lib/**/*.rb", "$(RUBYLIBDIR)", "../../lib"]
+if ENV["INSTALL_RB"] == "yes"
+  $INSTALLFILES ||= []
+  $INSTALLFILES << ["../../lib/**/*.rb", "$(RUBYLIBDIR)", "../../lib"]
+end
 
 create_makefile(module_name)

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  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
@@ -192,10 +192,11 @@ rb_grn_array_add (int argc, VALUE *argv, VALUE self)
     id = grn_table_add(context, table, NULL, 0, NULL);
     rb_grn_context_check(context, self);
 
-    if (GRN_ID_NIL == id)
+    if (GRN_ID_NIL == id) {
 	return Qnil;
-    else
-	return rb_grn_record_new(self, id, values);
+    } else {
+	return rb_grn_record_new_added(self, id, values);
+    }
 }
 
 void

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

@@ -59,27 +59,12 @@ rb_grn_context_from_ruby_object (VALUE object)
     return rb_grn_context->context;
 }
 
-static void
-rb_grn_context_unlink_database (grn_ctx *context)
-{
-    grn_obj *database;
-
-    database = grn_ctx_db(context);
-    debug("context:database: %p:%p\n", context, database);
-    if (database && database->header.type == GRN_DB) {
-	debug("context:database: %p:%p: unlink\n", context, database);
-	grn_obj_unlink(context, database);
-    }
-    debug("context:database: %p:%p: done\n", context, database);
-}
-
 void
 rb_grn_context_fin (grn_ctx *context)
 {
     if (context->stat == GRN_CTX_FIN)
 	return;
 
-    rb_grn_context_unlink_database(context);
     grn_ctx_fin(context);
 }
 
@@ -122,8 +107,6 @@ rb_grn_context_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 
     rb_grn_context->context = NULL;
 
-    rb_grn_context_unlink_database(context);
-
     debug("context-finalize: %p:%p:%p: done\n",
 	  context, rb_grn_context, rb_grn_context->context);
 
@@ -315,7 +298,7 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
 {
     RbGrnContext *rb_grn_context;
     grn_ctx *context;
-    int flags = 0;
+    int flags = GRN_CTX_PER_DB;
     VALUE options, default_options;
     VALUE rb_encoding;
 
@@ -369,10 +352,12 @@ rb_grn_context_close (VALUE self)
     RbGrnContext *rb_grn_context;
 
     context = SELF(self);
-    rc = grn_ctx_fin(context);
-    Data_Get_Struct(self, RbGrnContext, rb_grn_context);
-    rb_grn_context->context = NULL;
-    rb_grn_rc_check(rc, self);
+    if (context) {
+	rc = grn_ctx_fin(context);
+	Data_Get_Struct(self, RbGrnContext, rb_grn_context);
+	rb_grn_context->context = NULL;
+	rb_grn_rc_check(rc, self);
+    }
 
     return Qnil;
 }

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

@@ -195,7 +195,7 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
 	grn_obj_unlink(context, old_database);
     database = grn_db_create(context, path, &create_args);
     rb_grn_context_check(context, rb_ary_new4(argc, argv));
-    rb_database = GRNOBJECT2RVAL(klass, context, database, GRN_TRUE);
+    rb_database = GRNOBJECT2RVAL(klass, context, database, GRN_FALSE);
     rb_iv_set(rb_database, "@context", rb_context);
     if (!NIL_P(rb_context))
 	rb_iv_set(rb_context, "database", rb_database);
@@ -504,6 +504,47 @@ rb_grn_database_touch (VALUE self)
     return Qnil;
 }
 
+/*
+ * Document-method: defrag
+ *
+ * call-seq:
+ *   database.defrag(options={}) -> n_segments
+ *
+ * Defrags all variable size columns in the database.
+ *
+ * @return [Integer] the number of defraged segments
+ * @option options [Integer] :threshold (0) the threshold to
+ *   determine whether a segment is defraged. Available
+ *   values are -4..22. -4 means all segments are defraged.
+ *   22 means no segment is defraged.
+ * @since 1.2.6
+ */
+static VALUE
+rb_grn_database_defrag (int argc, VALUE *argv, VALUE self)
+{
+    RbGrnColumn *rb_grn_column;
+    grn_ctx *context;
+    grn_obj *database;
+    int n_segments;
+    VALUE options, rb_threshold;
+    int threshold = 0;
+
+    rb_scan_args(argc, argv, "01", &options);
+    rb_grn_scan_options(options,
+			"threshold", &rb_threshold,
+			NULL);
+    if (!NIL_P(rb_threshold)) {
+	threshold = NUM2INT(rb_threshold);
+    }
+
+    rb_grn_database_deconstruct(SELF(self), &database, &context,
+				NULL, NULL, NULL, NULL);
+    n_segments = grn_obj_defrag(context, database, threshold);
+    rb_grn_context_check(context, self);
+
+    return INT2NUM(n_segments);
+}
+
 void
 rb_grn_init_database (VALUE mGrn)
 {
@@ -534,4 +575,5 @@ rb_grn_init_database (VALUE mGrn)
     rb_define_method(rb_cGrnDatabase, "locked?", rb_grn_database_is_locked, 0);
 
     rb_define_method(rb_cGrnDatabase, "touch", rb_grn_database_touch, 0);
+    rb_define_method(rb_cGrnDatabase, "defrag", rb_grn_database_defrag, -1);
 }

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

@@ -276,6 +276,7 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
 	source_id = NUM2UINT(rb_source);
     } else {
 	grn_obj *source;
+	grn_bool need_source_unlink = GRN_FALSE;
 
 	if (TYPE(rb_source) == T_STRING) {
 	    grn_obj *table;
@@ -304,6 +305,7 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
 		name = dot_point + 1;
 	    }
 	    source = grn_obj_column(context, table, name, length);
+	    need_source_unlink = GRN_TRUE;
 	} else {
 	    source = RVAL2GRNOBJECT(rb_source, &context);
 	}
@@ -321,6 +323,9 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
 	} else {
 	    source_id = grn_obj_id(context, source);
 	}
+	if (need_source_unlink) {
+	    grn_obj_unlink(context, source);
+	}
     }
 
     return source_id;

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

@@ -79,19 +79,13 @@ rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
     return rb_grn_object->object;
 }
 
-static grn_obj *
-rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
-			 grn_user_data *user_data)
+static void
+rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
+			     RbGrnObject *rb_grn_object)
 {
-    RbGrnObject *rb_grn_object;
-    grn_obj *grn_object = *grn_objects;
-
     if (rb_grn_exited)
-	return NULL;
-
-    rb_grn_object = user_data->ptr;
+	return;
 
-    grn_obj_user_data(context, grn_object)->ptr = NULL;
     grn_obj_set_finalizer(context, grn_object, NULL);
 
     debug("finalize: %p:%p:%p:%p:%p 0x%x\n",
@@ -101,11 +95,10 @@ rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 
     rb_grn_object->context = NULL;
     rb_grn_object->object = NULL;
+    rb_grn_object->have_finalizer = GRN_FALSE;
 
     switch (grn_object->header.type) {
       case GRN_DB:
-	grn_ctx_use(context, NULL);
-	break;
       case GRN_TYPE:
       case GRN_PROC:
       case GRN_CURSOR_TABLE_HASH_KEY:
@@ -148,6 +141,22 @@ rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 		 grn_object->header.type);
 	break;
     }
+}
+
+static grn_obj *
+rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
+			 grn_user_data *user_data)
+{
+    RbGrnObject *rb_grn_object;
+    grn_obj *grn_object = *grn_objects;
+
+    if (rb_grn_exited)
+	return NULL;
+
+    rb_grn_object = user_data->ptr;
+
+    grn_obj_user_data(context, grn_object)->ptr = NULL;
+    rb_grn_object_run_finalizer(context, grn_object, rb_grn_object);
 
     return NULL;
 }
@@ -160,19 +169,26 @@ rb_grn_object_free (RbGrnObject *rb_grn_object)
 
     context = rb_grn_object->context;
     grn_object = rb_grn_object->object;
-    debug("rb-free: %p:%p:%p; %d\n", context, grn_object, rb_grn_object,
-	  rb_grn_object->have_finalizer);
-    if (!rb_grn_exited && context && grn_object && rb_grn_object->have_finalizer) {
-	grn_user_data *user_data;
-
-	user_data = grn_obj_user_data(context, grn_object);
-	debug("type: %x; need_close: %d; user_data: %p; ptr: %p\n",
+    debug("rb-free: %p:%p:%p; %d:%d\n", context, grn_object, rb_grn_object,
+	  rb_grn_object->have_finalizer, rb_grn_object->need_close);
+    if (!rb_grn_exited && context && grn_object &&
+	(rb_grn_object->have_finalizer || rb_grn_object->need_close)) {
+	grn_user_data *user_data = NULL;
+
+	if (rb_grn_object->have_finalizer) {
+	    user_data = grn_obj_user_data(context, grn_object);
+	}
+	debug("type: %#x; need_close: %d; user_data: %p; ptr: %p\n",
 	      grn_object->header.type,
 	      rb_grn_object->need_close,
 	      user_data,
 	      user_data ? user_data->ptr : NULL);
-	if (user_data && user_data->ptr) {
-	    rb_grn_object_finalizer(context, 1, &grn_object, user_data);
+	if (rb_grn_object->have_finalizer) {
+	    if (user_data && user_data->ptr) {
+		rb_grn_object_finalizer(context, 1, &grn_object, user_data);
+	    } else {
+		rb_grn_object_run_finalizer(context, grn_object, rb_grn_object);
+	    }
 	}
 	if (rb_grn_object->need_close) {
 	    grn_obj_unlink(context, grn_object);
@@ -297,15 +313,21 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
 
     user_data = grn_obj_user_data(context, object);
     if (user_data) {
-	debug("set-finalizer: %p:%p:%p 0x%x\n",
+	debug("set-finalizer: %p:%p:%p %#x\n",
 	      context, object, rb_grn_object,
 	      object->header.type);
 	user_data->ptr = rb_grn_object;
 	grn_obj_set_finalizer(context, object, rb_grn_object_finalizer);
 	rb_grn_object->have_finalizer = GRN_TRUE;
+    } else if (object->header.type == GRN_ACCESSOR) {
+	debug("set-finalizer(implicit): %p:%p:%p %#x\n",
+	      context, object, rb_grn_object,
+	      object->header.type);
+	rb_grn_object->have_finalizer = GRN_TRUE;
     }
 
     switch (object->header.type) {
+      case GRN_DB:
       case GRN_PROC:
       case GRN_TYPE:
 	rb_grn_object->need_close = GRN_FALSE;
@@ -495,13 +517,17 @@ rb_grn_object_deconstruct (RbGrnObject *rb_grn_object,
 VALUE
 rb_grn_object_close (VALUE self)
 {
+    RbGrnObject *rb_grn_object;
     grn_obj *object;
     grn_ctx *context;
 
-    rb_grn_object_deconstruct(SELF(self), &object, &context,
+    rb_grn_object = SELF(self);
+    rb_grn_object_deconstruct(rb_grn_object, &object, &context,
 			      NULL, NULL, NULL, NULL);
-    if (object && context)
+    if (object && context) {
+	rb_grn_object_run_finalizer(context, object, rb_grn_object);
 	grn_obj_close(context, object);
+    }
 
     return Qnil;
 }
@@ -517,13 +543,19 @@ rb_grn_object_close (VALUE self)
 VALUE
 rb_grn_object_unlink (VALUE self)
 {
+    RbGrnObject *rb_grn_object;
     grn_obj *object;
     grn_ctx *context;
 
-    rb_grn_object_deconstruct(SELF(self), &object, &context,
+    rb_grn_object = SELF(self);
+    rb_grn_object_deconstruct(rb_grn_object, &object, &context,
 			      NULL, NULL, NULL, NULL);
-    if (object && context)
+    if (object && context) {
+	if (!(rb_grn_object->object->header.flags & GRN_OBJ_PERSISTENT)) {
+	    rb_grn_object_run_finalizer(context, object, rb_grn_object);
+	}
 	grn_obj_unlink(context, object);
+    }
 
     return Qnil;
 }

data/ext/groonga/rb-grn-patricia-trie.c

@@ -798,6 +798,7 @@ rb_grn_patricia_trie_open_grn_near_cursor (int argc, VALUE *argv, VALUE self,
     GRN_OBJ_INIT(&casted_key, GRN_BULK, 0, table->header.domain);
     if (key_p->header.domain != table->header.domain) {
 	grn_obj_cast(*context, key_p, &casted_key, 0);
+	grn_obj_unlink(*context, key_p);
 	key_p = &casted_key;
     }
 
@@ -862,7 +863,7 @@ rb_grn_patricia_trie_open_near_cursor (int argc, VALUE *argv, VALUE self)
     VALUE rb_cursor;
 
     cursor = rb_grn_patricia_trie_open_grn_near_cursor(argc, argv,
-								self, &context, GRN_CURSOR_RK);
+						       self, &context, GRN_CURSOR_RK);
     rb_cursor = GRNTABLECURSOR2RVAL(Qnil, context, cursor);
     rb_iv_set(rb_cursor, "@table", self); /* FIXME: cursor should mark table */
     if (rb_block_given_p())

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  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,16 @@ rb_grn_record_new (VALUE table, grn_id id, VALUE values)
     return rb_grn_record_new_raw(table, UINT2NUM(id), values);
 }
 
+VALUE
+rb_grn_record_new_added (VALUE table, grn_id id, VALUE values)
+{
+    VALUE record;
+
+    record = rb_grn_record_new(table, id, values);
+    rb_funcall(record, rb_intern("added="), 1, Qtrue);
+    return record;
+}
+
 VALUE
 rb_grn_record_new_raw (VALUE table, VALUE rb_id, VALUE values)
 {

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  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
@@ -88,7 +88,7 @@ rb_grn_table_key_support_bind (RbGrnTableKeySupport *rb_grn_table_key_support,
 }
 
 static grn_id
-rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key)
+rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key, int *added)
 {
     grn_ctx *context;
     grn_obj *table;
@@ -103,7 +103,7 @@ rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key)
     GRN_BULK_REWIND(key);
     RVAL2GRNKEY(rb_key, context, key, domain_id, domain, self);
     id = grn_table_add(context, table,
-                       GRN_BULK_HEAD(key), GRN_BULK_VSIZE(key), NULL);
+                       GRN_BULK_HEAD(key), GRN_BULK_VSIZE(key), added);
     rb_grn_context_check(context, self);
 
     return id;
@@ -116,6 +116,11 @@ rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key)
  * 主キーが_key_のレコード追加し、追加したレコードを返す。レ
  * コードの追加に失敗した場合は+nil+を返す。
  *
+ * すでに同じキーのレコードが存在する場合は追加せずに同じレ
+ * コードを返す。追加されたかどうかは
+ * +Groonga::Record#added?+で調べることができる。+true+を返
+ * したら追加されたということを示す。
+ *
  * _values_にはレコードのカラムに設定する値を指定する。省略
  * した場合または+nil+を指定した場合はカラムは設定しない。カ
  * ラムの値は<tt>{:カラム名1 => 値1, :カラム名2 => 値2,
@@ -126,13 +131,19 @@ rb_grn_table_key_support_add (int argc, VALUE *argv, VALUE self)
 {
     grn_id id;
     VALUE key, values;
+    int added = GRN_FALSE;
 
     rb_scan_args(argc, argv, "11", &key, &values);
-    id = rb_grn_table_key_support_add_raw(self, key);
-    if (GRN_ID_NIL == id)
+    id = rb_grn_table_key_support_add_raw(self, key, &added);
+    if (GRN_ID_NIL == id) {
 	return Qnil;
-    else
-	return rb_grn_record_new(self, id, values);
+    } else {
+	if (added) {
+	    return rb_grn_record_new_added(self, id, values);
+	} else {
+	    return rb_grn_record_new(self, id, values);
+	}
+    }
 }
 
 grn_id
@@ -364,7 +375,7 @@ rb_grn_table_key_support_array_set (VALUE self, VALUE rb_key, VALUE rb_values)
 					 NULL, NULL, NULL,
 					 NULL);
 
-    id = rb_grn_table_key_support_add_raw(self, rb_key);
+    id = rb_grn_table_key_support_add_raw(self, rb_key, NULL);
 
     if (id == GRN_ID_NIL) {
 	rb_raise(rb_eGrnError,
@@ -409,7 +420,7 @@ rb_grn_table_key_support_set_column_value (int argc, VALUE *argv, VALUE self)
     }
 
     rb_key = rb_id_or_key;
-    id = rb_grn_table_key_support_add_raw(self, rb_key);
+    id = rb_grn_table_key_support_add_raw(self, rb_key, NULL);
     if (id == GRN_ID_NIL) {
 	rb_raise(rb_eGrnError,
 		 "failed to add record: %s",
@@ -533,7 +544,7 @@ rb_grn_table_key_support_set_value_by_key (VALUE self,
 					 &value, NULL, NULL,
 					 NULL);
 
-    id = rb_grn_table_key_support_add_raw(self, rb_key);
+    id = rb_grn_table_key_support_add_raw(self, rb_key, NULL);
     if (GRN_ID_NIL == id) {
 	rb_raise(rb_eGrnError,
 		 "failed to add new record with key: <%s>: <%s>",

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

@@ -243,6 +243,8 @@ rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
       case T_NIL:
 	grn_obj_reinit(context, bulk, GRN_DB_VOID, 0);
 	break;
+      case T_SYMBOL:
+	object = rb_sym_to_s(object);
       case T_STRING:
 	grn_obj_reinit(context, bulk, GRN_DB_TEXT, 0);
 	rb_grn_context_text_set(context, bulk, object);
@@ -306,7 +308,7 @@ rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
 	} else {
 	    rb_raise(rb_eTypeError,
 		     "bulked object should be one of "
-		     "[nil, true, false, String, Integer, Float, Time, "
+		     "[nil, true, false, String, Symbol, Integer, Float, Time, "
 		     "Groonga::Object, Groonga::Record]: %s",
 		     rb_grn_inspect(object));
 	}

data/ext/groonga/rb-grn-variable-size-column.c

@@ -18,7 +18,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnVariableSizeColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnColumn *)DATA_PTR(object))
 
 VALUE rb_cGrnVariableSizeColumn;
 
@@ -28,9 +28,55 @@ VALUE rb_cGrnVariableSizeColumn;
  * 可変長データ用のカラム。
  */
 
+/*
+ * Document-method: defrag
+ *
+ * call-seq:
+ *   column.defrag(options={}) -> n_segments
+ *
+ * Defrags the column.
+ *
+ * @return [Integer] the number of defraged segments
+ * @option options [Integer] :threshold (0) the threshold to
+ *   determine whether a segment is defraged. Available
+ *   values are -4..22. -4 means all segments are defraged.
+ *   22 means no segment is defraged.
+ * @since 1.2.6
+ */
+static VALUE
+rb_grn_variable_size_column_defrag (int argc, VALUE *argv, VALUE self)
+{
+    RbGrnColumn *rb_grn_column;
+    grn_ctx *context = NULL;
+    grn_obj *column;
+    int n_segments;
+    VALUE options, rb_threshold;
+    int threshold = 0;
+
+    rb_scan_args(argc, argv, "01", &options);
+    rb_grn_scan_options(options,
+			"threshold", &rb_threshold,
+			NULL);
+    if (!NIL_P(rb_threshold)) {
+	threshold = NUM2INT(rb_threshold);
+    }
+
+    rb_grn_column = SELF(self);
+    rb_grn_object_deconstruct(RB_GRN_OBJECT(rb_grn_column), &column, &context,
+			      NULL, NULL,
+			      NULL, NULL);
+    n_segments = grn_obj_defrag(context, column, threshold);
+    rb_grn_context_check(context, self);
+
+    return INT2NUM(n_segments);
+}
+
 void
 rb_grn_init_variable_size_column (VALUE mGrn)
 {
     rb_cGrnVariableSizeColumn =
 	rb_define_class_under(mGrn, "VariableSizeColumn", rb_cGrnColumn);
+
+    rb_define_method(rb_cGrnVariableSizeColumn, "defrag",
+		     rb_grn_variable_size_column_defrag, -1);
 }

data/ext/groonga/rb-grn.h

@@ -69,7 +69,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 2
-#define RB_GRN_MICRO_VERSION 5
+#define RB_GRN_MICRO_VERSION 6
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -474,6 +474,9 @@ VALUE          rb_grn_posting_new                   (grn_posting *posting,
 VALUE          rb_grn_record_new                    (VALUE table,
 						     grn_id id,
 						     VALUE values);
+VALUE          rb_grn_record_new_added              (VALUE table,
+						     grn_id id,
+						     VALUE values);
 VALUE          rb_grn_record_new_raw                (VALUE table,
 						     VALUE id,
 						     VALUE values);

data/extconf.rb

@@ -34,6 +34,7 @@ Dir.chdir(source_ext_dir.to_s) do
   end
   ruby = "#{config['bindir']}/#{config['ruby_install_name']}#{config['EXEEXT']}"
   message("checking in #{ext_dir}...\n")
+  ENV["INSTALL_RB"] = "yes"
   system(ruby, (ext_dir + 'extconf.rb').to_s, *ARGV) or exit 1
   message("checking in #{ext_dir}: done.\n")
   File.open("Makefile") do |file|

data/lib/groonga/pagination.rb

@@ -78,7 +78,7 @@ module Groonga
     #   selected_entries = entries.select do |record|
     #     entry.description =~ query
     #   end
-    #   paged_entries = selected_entries.paginate(["_score", :desc],
+    #   paged_entries = selected_entries.paginate([["_score", :desc]],
     #                                             :page => 1,
     #                                             :size => 10)
     #

data/lib/groonga/record.rb

@@ -32,6 +32,7 @@ module Groonga
     def initialize(table, id, values=nil)
       @table = table
       @id = id
+      @added = false
       if values
         values.each do |name, value|
           self[name] = value
@@ -380,6 +381,15 @@ module Groonga
       super or !@table.column(name.to_s.sub(/=\z/, '')).nil?
     end
 
+    def added?
+      @added
+    end
+
+    # @private
+    def added=(added)
+      @added = added
+    end
+
     private
     def normalize_column_name(name)
       name.to_s

data/rroonga-build.rb

@@ -19,7 +19,7 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 1
     MINOR = 2
-    MICRO = 2
+    MICRO = 5
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-accessor.rb

@@ -22,6 +22,10 @@ class AccessorTest < Test::Unit::TestCase
     @id = @posts.column("_id")
   end
 
+  def teardown
+    @id = nil
+  end
+
   def test_name
     assert_nil(@id.name)
   end

data/test/test-array.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2011  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
@@ -91,4 +91,12 @@ class ArrayTest < Test::Unit::TestCase
     users.set_column_value(morita_id, "name", "morita")
     assert_equal("morita", users.column_value(morita_id, "name"))
   end
+
+  def test_added?
+    users = Groonga::Array.create(:name => "Users")
+    first_user = users.add
+    assert_predicate(first_user, :added?)
+    second_user = users.add
+    assert_predicate(second_user, :added?)
+  end
 end

data/test/test-database.rb

@@ -130,4 +130,20 @@ class DatabaseTest < Test::Unit::TestCase
       database.touch
     end
   end
+
+  def test_defrag
+    setup_database
+    Groonga::Schema.define do |schema|
+      schema.create_table("Users") do |table|
+        table.short_text("name")
+        table.short_text("address")
+      end
+    end
+    users = context["Users"]
+    1000.times do |i|
+      users.add(:name => "user #{i}" * 1000,
+                :address => "address #{i}" * 1000)
+    end
+    assert_equal(7, @database.defrag)
+  end
 end

data/test/test-hash.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+#
+# Copyright (C) 2009-2011  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
@@ -75,7 +76,6 @@ class HashTest < Test::Unit::TestCase
     assert_equal(bookmark, bookmarks["http://google.com/"])
   end
 
-
   def test_inspect_anonymous
     path = @tables_dir + "anoymous.groonga"
     anonymous_table = Groonga::Hash.create(:path => path.to_s)
@@ -308,4 +308,13 @@ class HashTest < Test::Unit::TestCase
       }
     end
   end
+
+  def test_added?
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    bob = users.add("bob")
+    assert_predicate(bob, :added?)
+    bob_again = users.add("bob")
+    assert_not_predicate(bob_again, :added?)
+  end
 end

data/test/test-patricia-trie.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2011  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
@@ -379,4 +379,13 @@ class PatriciaTrieTest < Test::Unit::TestCase
     numbers.add(7)
     assert_equal([1, 2, 5, 7], numbers.collect {|number| number.key})
   end
+
+  def test_added?
+    users = Groonga::PatriciaTrie.create(:name => "Users",
+                                         :key_type => "ShortText")
+    bob = users.add("bob")
+    assert_predicate(bob, :added?)
+    bob_again = users.add("bob")
+    assert_not_predicate(bob_again, :added?)
+  end
 end

data/test/test-table-select.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2011  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
@@ -53,7 +53,7 @@ class TableSelectTest < Test::Unit::TestCase
                     :user => "darashi")
   end
 
-  def test_select_sub_expression
+  def test_sub_expression
     result = @comments.select do |record|
       record.match("Hello", "content") &
         (record["created_at"] < Time.parse("2009-08-01"))
@@ -61,22 +61,22 @@ class TableSelectTest < Test::Unit::TestCase
     assert_equal_select_result([@comment2], result)
   end
 
-  def test_select_query
+  def test_query
     result = @comments.select("content:@Hello")
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_query_with_parser
+  def test_query_with_parser
     result = @comments.select("content @ \"Hello\"", :syntax => :script)
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_query_with_default_column
+  def test_query_with_default_column
     result = @comments.select("Hello", {:default_column => 'content'})
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_expression
+  def test_expression
     expression = Groonga::Expression.new
     variable = expression.define_variable(:domain => @comments)
     expression.append_object(variable)
@@ -87,76 +87,90 @@ class TableSelectTest < Test::Unit::TestCase
     assert_equal_select_result([@comment1, @comment2], result)
   end
 
-  def test_select_query_with_block
+  def test_query_with_block
     result = @comments.select("content:@Hello") do |record|
       record["created_at"] < Time.parse("2009-08-01")
     end
     assert_equal_select_result([@comment2], result)
   end
 
-  def test_select_query_with_block_match
+  def test_query_with_block_match
     result = @comments.select("content:@Hello") do |record|
       record.match("World", "content")
     end
     assert_equal_select_result([@comment2], result)
   end
 
-  def test_select_without_block
+  def test_without_block
     assert_equal_select_result([@comment1, @comment2,
                                 @comment3, @japanese_comment],
                                @comments.select)
   end
 
-  def test_select_query_japanese
+  def test_query_japanese
     result = @comments.select("content:@ボロTV")
     assert_equal_select_result([@japanese_comment], result)
   end
 
-  def test_select_but_query
+  def test_but_query
     result = @comments.select do |record|
       record["content"].match "Hello -World"
     end
     assert_equal_select_result([@comment1], result)
   end
 
-  def test_select_query_with_three_terms
+  def test_query_with_three_terms
     result = @comments.select do |record|
       record["content"].match "Say Hello World"
     end
     assert_equal_select_result([], result)
   end
 
-  def test_select_query_with_brackets
+  def test_query_with_brackets
     result = @comments.select do |record|
       record["content"].match "Say (Hello World)"
     end
     assert_equal_select_result([], result)
   end
 
-  def test_select_equal_reference_column_by_key
+  def test_equal_reference_column_by_key
     result = @comments.select do |record|
       record["user"] == "darashi"
     end
     assert_equal_select_result([@japanese_comment], result)
   end
 
-  def test_select_not_equal_reference_column_by_key
+  def test_not_equal_reference_column_by_key
     result = @comments.select('user != "darashi"', :syntax => :script)
     assert_equal_select_result([@comment1, @comment2, @comment3],
                                result)
   end
 
-  def test_select_equal_reference_column_by_nonexistent_key
+  def test_equal_reference_column_by_nonexistent_key
     result = @comments.select do |record|
       record["user"] == "nonexistent"
     end
     assert_equal_select_result([], result)
   end
 
-  def test_select_query_key
+  def test_query_key
     result = @users.select do |record|
       record["_key"] =~ "mori"
     end
     assert_equal_select_result([@users["morita"]], result)
   end
+
+  def test_symbol
+    result = @comments.select do |record|
+      record[:content].match("Say Hello World")
+    end
+    assert_equal_select_result([], result)
+  end
+
+  def test_method
+    result = @comments.select do |record|
+      record.content.match("Say Hello World")
+    end
+    assert_equal_select_result([], result)
+  end
 end

data/test/test-type.rb

@@ -23,12 +23,12 @@ class TypeTest < Test::Unit::TestCase
     assert_equal("user_id", type.name)
   end
 
-  def test_new_with_hyphen_name
+  def test_new_with_space_name
     exception = assert_raise(Groonga::InvalidArgument) do
-      Groonga::Type.new("user-id", :type => :integer)
+      Groonga::Type.new("user id", :type => :integer)
     end
     message =
-      "name can't start with '_' and 0-9, and contains only 0-9, A-Z, a-z, or _"
+      "name can't start with '_' and contains only 0-9, A-Z, a-z, #, - or _"
     assert_match(/#{Regexp.escape(message)}/,
                  exception.message)
   end

data/test/test-variable-size-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2011  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
@@ -107,4 +107,11 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     @morita.prepend("nick_names", "moritapo")
     assert_equal(["moritapo", "morita"], @morita["nick_names"])
   end
+
+  def test_defrag
+    1000.times do |i|
+      @users.add(:name => "user #{i}" * 1000)
+    end
+    assert_equal(3, @name.defrag)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -119,6 +119,20 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: packnga
+  prerelease: false
+  type: :development
+  requirement: *id008
 description: |-
   rroonga is an extension library to use groonga's DB-API
   layer. rroonga provides Rubyish readable and writable API