rroonga 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8d5670d6f858be2364f027b3bcd907de5e18d342
-  data.tar.gz: 5e5aed82c913c8f8a50c865d17b867f680d5677f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWE2YmYxNmUyYjY1N2M0Mjk3NjA4OTIyNjIyNzY2ODgxODY4MTkwYg==
+  data.tar.gz: !binary |-
+    ZWU1ODAxN2JjNjAwNzQ3M2UzMmEzNzVjM2RiODM5NmRhMDVmYjQ1Mw==
 SHA512:
-  metadata.gz: f7634917933dbf137843426de92eef2db163c7bc0b8cc51511a99d5ca53e43a745d50f48ad8fbbd3b6a43ef38329861f08e322daefb81085844f1bc741915a6c
-  data.tar.gz: c9f30a3b12dc1021014dbcb3999635b5d63dc7693d97a3fb521daec3aaebe45f41d0abdcb195067ce4ecc4fc39a899517fb7fe15faeccedc1be88d497d75a359
+  metadata.gz: !binary |-
+    YmZkNjU3ZGVlYjM2YTNlMTQ2NDdhY2MxZWZhZjIwZWM2MjBhNzUyNWU4YWI4
+    NmYzYTkxZDAxNzNhMTk4ZGZiMmRlMjIyM2U1ODZlNTlkYjUzMzIxZDc0YmY1
+    MzQ4NzY2OGFhMWU3NDM3Mjk3OTExOGNlZWMwN2FkYzU2M2M5ZDI=
+  data.tar.gz: !binary |-
+    Mjg5Yjk4ZGRiNjJjNWVmOTdjODNkM2MyYTE2YzYwMDQ2YWQ5ODRmNDIwNWI5
+    NGY2NTAwMmYyMzU0ZjdmM2ZiNjllZTY4MDZkZjBjMWFhNjMxZDk3ZjE0MjE0
+    ZDVlNTIwYzBkNTI4Y2Y2YzdkMGJjYzk4NmQ4ZmQxYWYyYTg1ZjE=

data/Gemfile

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 source "https://rubygems.org/"
 

data/README.textile

@@ -37,7 +37,7 @@ contributed patches.)
 h2. Dependencies
 
 * Ruby >= 1.9.3
-* Groonga >= 3.0.8
+* Groonga >= 4.0.4
 
 h2. Install
 

data/Rakefile

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "find"
 require "fileutils"
@@ -156,4 +156,11 @@ namespace :test do
   end
 end
 
+desc "Remove Groonga binary directory"
+namespace :clean do
+  task :groonga do
+    rm_rf binary_dir
+  end
+end
+
 task :default => :test

data/bin/grndump

@@ -14,7 +14,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "ostruct"
 require "optparse"

data/bin/grntest-log-analyze

@@ -14,7 +14,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "ostruct"
 require "optparse"

data/bin/groonga-database-inspect

@@ -14,7 +14,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "ostruct"
 require "optparse"

data/bin/groonga-index-dump

@@ -14,7 +14,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "ostruct"
 require "optparse"

data/doc/text/news.textile

@@ -1,5 +1,33 @@
 h1. NEWS
 
+h2(#4-0-4). 4.0.4: 2014-08-29 (planned)
+
+h3. Improvements
+
+* Supported Groonga 4.0.4. Groonga 4.0.3 or older are not supported.
+* Added {Groonga::ProcedureType} that has constants as GRN_PROC_XXX.
+* Added {Groonga::Procedure#type} as grn_proc_get_type().
+  <pre>
+  procedure = Groonga["TokenBigram"]
+  p procedure.type == Groonga::ProcedureType::TOKENIZER  #=> true
+  </pre>
+* Avoided a crash when {Groonga::Record#inspct} is called on exit.
+  [GitHub#18] [Reported by Ippei Obayashi]
+* Updated Free Software Foundation address. [Masafumi Yokoyama]
+* Supported reference weight vector. It requires Groonga 4.0.4 or later.
+* Updated homepage in gemspec to use ranguba.org. [Masafumi Yokoyama]
+* Reduce memory usage without GC.
+
+h3. Fixes
+
+* Fixed a GC related crash when GC is run while {Groonga::Table#group}.
+
+h3. Thanks
+
+* Ippei Obayashi
+* uu59
+* cosmo0920
+
 h2(#4-0-3). 4.0.3: 2014-06-04
 
 h3. Fixes

data/ext/groonga/extconf.rb

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "English"
 require "pathname"
@@ -231,7 +231,7 @@ def build_groonga(major, minor, micro)
   end
 end
 
-unless PKGConfig.have_package(package_name, major, minor, micro)
+def install_local_groonga(package_name, major, minor, micro)
   unless have_local_groonga?(package_name, major, minor, micro)
     required_version = [major, minor, micro]
     if (required_version <=> LatestGroongaVersion::VERSION) < 0
@@ -247,6 +247,16 @@ unless PKGConfig.have_package(package_name, major, minor, micro)
   add_rpath_for_local_groonga
 end
 
+if win32?
+  unless have_local_groonga?(package_name, major, minor, micro)
+    install_local_groonga(package_name, major, minor, micro)
+  end
+else
+  unless PKGConfig.have_package(package_name, major, minor, micro)
+    install_local_groonga(package_name, major, minor, micro)
+  end
+end
+
 real_version = PKGConfig.modversion(package_name)
 real_major, real_minor, real_micro = real_version.split(/\./)
 

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"
@@ -66,6 +66,7 @@ void
 rb_grn_accessor_finalizer (grn_ctx *context, grn_obj *grn_object,
                            RbGrnAccessor *rb_accessor)
 {
+    rb_grn_context_unregister_floating_object(RB_GRN_OBJECT(rb_accessor));
     rb_grn_named_object_finalizer(context, grn_object,
                                   RB_GRN_NAMED_OBJECT(rb_accessor));
     if (context && rb_accessor->value)

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -14,7 +14,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2010-2012  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2010-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
@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"
@@ -79,6 +79,8 @@ rb_grn_context_register_floating_object (RbGrnObject *rb_grn_object)
                  (const void *)(&rb_grn_object), sizeof(RbGrnObject *),
                  NULL, NULL);
     rb_grn_object->floating = GRN_TRUE;
+
+    rb_grn_context_object_created(rb_grn_context->self, rb_grn_object->self);
 }
 
 void
@@ -117,9 +119,9 @@ rb_grn_context_close_floating_objects (RbGrnContext *rb_grn_context)
 
     rb_grn_context->floating_objects = NULL;
     GRN_HASH_EACH(context, floating_objects, id, &floating_object, NULL, NULL, {
-            (*floating_object)->floating = GRN_FALSE;
-            grn_obj_close(context, RB_GRN_OBJECT(*floating_object)->object);
-        });
+        (*floating_object)->floating = GRN_FALSE;
+        rb_grn_object_close_raw(*floating_object);
+    });
     grn_hash_close(context, floating_objects);
 }
 

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

data/ext/groonga/rb-grn-double-array-trie-cursor.c

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -14,7 +14,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

data/ext/groonga/rb-grn-encoding-support.c

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

data/ext/groonga/rb-grn-expression-builder.c

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

data/ext/groonga/rb-grn-geo-point.c

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

data/ext/groonga/rb-grn-hash-cursor.c

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -14,7 +14,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

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

@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "rb-grn.h"

data/ext/groonga/rb-grn-object.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
@@ -13,7 +13,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 /*
@@ -52,7 +52,7 @@ rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
             rb_grn_context_check(*context, object);
             if (!grn_object)
                 rb_raise(rb_eArgError,
-                         "unregistered groonga object: name: <%s>",
+                         "unregistered Groonga object: name: <%s>",
                          rb_grn_inspect(object));
             return grn_object;
         } else if (RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cInteger))) {
@@ -60,24 +60,24 @@ rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
             rb_grn_context_check(*context, object);
             if (!grn_object)
                 rb_raise(rb_eArgError,
-                         "unregistered groonga object: ID: <%s>",
+                         "unregistered Groonga object: ID: <%s>",
                          rb_grn_inspect(object));
             return grn_object;
         }
     }
 
     if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnObject))) {
-        rb_raise(rb_eTypeError, "not a groonga object: <%s>",
+        rb_raise(rb_eTypeError, "not a Groonga object: <%s>",
                  rb_grn_inspect(object));
     }
 
     Data_Get_Struct(object, RbGrnObject, rb_grn_object);
     if (!rb_grn_object)
-        rb_raise(rb_eGrnError, "groonga object is NULL");
+        rb_raise(rb_eGrnError, "Groonga object is NULL");
 
     if (!rb_grn_object->object) {
         rb_raise(rb_eGrnClosed,
-                 "can't access already closed groonga object: %s",
+                 "can't access already closed Groonga object: %s",
                  rb_grn_inspect(CLASS_OF(rb_grn_object->self)));
     }
 
@@ -87,6 +87,19 @@ rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
     return rb_grn_object->object;
 }
 
+static void
+rb_grn_object_unbind (RbGrnObject *rb_grn_object)
+{
+    debug("unbind: %p:%p:%p %s(%#x)\n",
+          rb_grn_object->context, rb_grn_object->object, rb_grn_object,
+          rb_grn_inspect_type(rb_grn_object->object->header.type),
+          rb_grn_object->object->header.type);
+
+    rb_grn_object->rb_grn_context = NULL;
+    rb_grn_object->context = NULL;
+    rb_grn_object->object = NULL;
+}
+
 static void
 rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
                              RbGrnObject *rb_grn_object)
@@ -109,61 +122,59 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
     rb_grn_object->have_finalizer = GRN_FALSE;
 
     switch (grn_object->header.type) {
-      case GRN_DB:
+    case GRN_DB:
         rb_grn_database_finalizer(context, rb_grn_context,
                                   grn_object, rb_grn_object);
         break;
-      case GRN_TYPE:
-      case GRN_PROC:
-      case GRN_CURSOR_TABLE_HASH_KEY:
-      case GRN_CURSOR_TABLE_PAT_KEY:
-      case GRN_CURSOR_TABLE_DAT_KEY:
-      case GRN_CURSOR_TABLE_NO_KEY:
+    case GRN_TYPE:
+    case GRN_PROC:
+    case GRN_CURSOR_TABLE_HASH_KEY:
+    case GRN_CURSOR_TABLE_PAT_KEY:
+    case GRN_CURSOR_TABLE_DAT_KEY:
+    case GRN_CURSOR_TABLE_NO_KEY:
         break;
-      case GRN_TABLE_HASH_KEY:
-      case GRN_TABLE_PAT_KEY:
-      case GRN_TABLE_DAT_KEY:
+    case GRN_TABLE_HASH_KEY:
+    case GRN_TABLE_PAT_KEY:
+    case GRN_TABLE_DAT_KEY:
         rb_grn_table_key_support_finalizer(context, grn_object,
                                            RB_GRN_TABLE_KEY_SUPPORT(rb_grn_object));
         break;
-      case GRN_TABLE_NO_KEY:
+    case GRN_TABLE_NO_KEY:
         rb_grn_table_finalizer(context, grn_object,
                                RB_GRN_TABLE(rb_grn_object));
         break;
-      case GRN_CURSOR_COLUMN_INDEX:
-          break;
-      case GRN_COLUMN_FIX_SIZE:
-      case GRN_COLUMN_VAR_SIZE:
+    case GRN_CURSOR_COLUMN_INDEX:
+        break;
+    case GRN_COLUMN_FIX_SIZE:
+    case GRN_COLUMN_VAR_SIZE:
         rb_grn_column_finalizer(context, grn_object,
                                 RB_GRN_COLUMN(rb_grn_object));
         break;
-      case GRN_COLUMN_INDEX:
+    case GRN_COLUMN_INDEX:
         rb_grn_index_column_finalizer(context, grn_object,
                                       RB_GRN_INDEX_COLUMN(rb_grn_object));
         break;
-      case GRN_ACCESSOR:
+    case GRN_ACCESSOR:
         rb_grn_accessor_finalizer(context, grn_object,
                                   RB_GRN_ACCESSOR(rb_grn_object));
         break;
-      case GRN_EXPR:
+    case GRN_EXPR:
         rb_grn_expression_finalizer(context, grn_object,
                                     RB_GRN_EXPRESSION(rb_grn_object));
         break;
-      case GRN_SNIP:
+    case GRN_SNIP:
         rb_grn_snippet_finalizer(context, grn_object,
                                  RB_GRN_SNIPPET(rb_grn_object));
         break;
-      default:
+    default:
         rb_raise(rb_eTypeError,
-                 "unsupported groonga object type for finalizer: %s(%#x)",
+                 "unsupported Groonga object type for finalizer: %s(%#x)",
                  rb_grn_inspect_type(grn_object->header.type),
                  grn_object->header.type);
         break;
     }
 
-    rb_grn_object->rb_grn_context = NULL;
-    rb_grn_object->context = NULL;
-    rb_grn_object->object = NULL;
+    rb_grn_object_unbind(rb_grn_object);
 }
 
 static grn_obj *
@@ -213,6 +224,8 @@ rb_grn_object_free (RbGrnObject *rb_grn_object)
             } else {
                 rb_grn_object_run_finalizer(context, grn_object, rb_grn_object);
             }
+        } else {
+            rb_grn_object_unbind(rb_grn_object);
         }
         if (rb_grn_object->need_close) {
             grn_obj_unlink(context, grn_object);
@@ -280,7 +293,7 @@ rb_grn_object_to_ruby_class (grn_obj *object)
         break;
       default:
         rb_raise(rb_eTypeError,
-                 "unsupported groonga object type for class detection: 0x%x",
+                 "unsupported Groonga object type for class detection: 0x%x",
                  object->header.type);
         break;
     }
@@ -314,11 +327,14 @@ rb_grn_object_to_ruby_object (VALUE klass, grn_ctx *context, grn_obj *object,
     rb_grn_object_assign(klass, rb_object, rb_context, context, object);
 
     switch (object->header.type) {
+    case GRN_ACCESSOR:
+    case GRN_SNIP:
     case GRN_TABLE_NO_KEY:
     case GRN_TABLE_HASH_KEY:
     case GRN_TABLE_PAT_KEY:
     case GRN_TABLE_DAT_KEY:
         rb_grn_context_object_created(rb_context, rb_object);
+        break;
     default:
         break;
     }
@@ -368,14 +384,12 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
               context, object, rb_grn_object,
               rb_grn_inspect_type(object->header.type),
               object->header.type);
-         /* TODO: We want to call finalizer for GRN_ACCESSOR. */
-        rb_grn_object->have_finalizer = GRN_FALSE;
+        rb_grn_object->have_finalizer = GRN_TRUE;
     }
 
     switch (object->header.type) {
       case GRN_PROC:
       case GRN_TYPE:
-      case GRN_ACCESSOR: /* TODO: We want to close GRN_ACCESSOR. */
         rb_grn_object->need_close = GRN_FALSE;
         break;
       default:
@@ -475,7 +489,7 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
                             context, object);
     } else {
         rb_raise(rb_eTypeError,
-                 "unsupported groonga object type for assignment: %s(%#x)",
+                 "unsupported Groonga object type for assignment: %s(%#x)",
                  rb_grn_inspect_type(object->header.type),
                  object->header.type);
     }
@@ -557,6 +571,24 @@ rb_grn_object_deconstruct (RbGrnObject *rb_grn_object,
         *range = rb_grn_object->range;
 }
 
+void
+rb_grn_object_close_raw (RbGrnObject *rb_grn_object)
+{
+    grn_obj *object;
+    grn_ctx *context;
+
+    rb_grn_object_deconstruct(rb_grn_object, &object, &context,
+                              NULL, NULL, NULL, NULL);
+    if (object && context) {
+        if (rb_grn_object->have_finalizer) {
+            rb_grn_object_run_finalizer(context, object, rb_grn_object);
+        } else {
+            rb_grn_object_unbind(rb_grn_object);
+        }
+        grn_obj_close(context, object);
+    }
+}
+
 /*
  * _object_ が使用しているリソースを開放する。これ以降 _object_ を
  * 使うことはできない。
@@ -567,16 +599,9 @@ VALUE
 rb_grn_object_close (VALUE self)
 {
     RbGrnObject *rb_grn_object;
-    grn_obj *object;
-    grn_ctx *context;
 
     rb_grn_object = SELF(self);
-    rb_grn_object_deconstruct(rb_grn_object, &object, &context,
-                              NULL, NULL, NULL, NULL);
-    if (object && context) {
-        rb_grn_object_run_finalizer(context, object, rb_grn_object);
-        grn_obj_close(context, object);
-    }
+    rb_grn_object_close_raw(rb_grn_object);
 
     return Qnil;
 }
@@ -599,6 +624,7 @@ rb_grn_object_unlink (VALUE self)
     if (object && context) {
         if (!(rb_grn_object->object->header.flags & GRN_OBJ_PERSISTENT)) {
             rb_grn_object_run_finalizer(context, object, rb_grn_object);
+            rb_grn_object_unbind(rb_grn_object);
         }
         grn_obj_unlink(context, object);
     }
@@ -1174,7 +1200,7 @@ rb_grn_object_get_range (VALUE self)
 }
 
 /*
- * _object_ と _other_ が同じgroongaのオブジェクトなら +true+ を返
+ * _object_ と _other_ が同じGroongaのオブジェクトなら +true+ を返
  * し、そうでなければ +false+ を返す。
  *
  * @overload ==(other)