rroonga 4.0.3-x64-mingw32 → 4.0.4-x64-mingw32

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)

data/ext/groonga/rb-grn-operator.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-patricia-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-patricia-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-plugin.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-posting.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-procedure-type.c

@@ -0,0 +1,40 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 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
+  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
+*/
+
+#include "rb-grn.h"
+
+void
+rb_grn_init_procedure_type (VALUE mGrn)
+{
+    VALUE rb_mGrnProcedureType;
+
+    rb_mGrnProcedureType = rb_define_module_under(mGrn, "ProcedureType");
+
+    rb_define_const(rb_mGrnProcedureType,
+                    "INVALID", INT2NUM(GRN_PROC_INVALID));
+    rb_define_const(rb_mGrnProcedureType,
+                    "TOKENIZER", INT2NUM(GRN_PROC_TOKENIZER));
+    rb_define_const(rb_mGrnProcedureType,
+                    "COMMAND", INT2NUM(GRN_PROC_COMMAND));
+    rb_define_const(rb_mGrnProcedureType,
+                    "FUNCTION", INT2NUM(GRN_PROC_FUNCTION));
+    rb_define_const(rb_mGrnProcedureType,
+                    "HOOK", INT2NUM(GRN_PROC_HOOK));
+    rb_define_const(rb_mGrnProcedureType,
+                    "NORMALIZER", INT2NUM(GRN_PROC_NORMALIZER));
+}

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009  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,13 +13,11 @@
 
   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"
 
-#define SELF(object) (RVAL2GRNPROCEDURE(object))
-
 VALUE rb_cGrnProcedure;
 
 grn_obj *
@@ -39,6 +37,19 @@ rb_grn_procedure_to_ruby_object (grn_ctx *context, grn_obj *procedure,
     return GRNOBJECT2RVAL(rb_cGrnProcedure, context, procedure, owner);
 }
 
+static VALUE
+rb_grn_procedure_get_type (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *procedure;
+    grn_proc_type type;
+
+    procedure = RVAL2GRNOBJECT(self, &context);
+    type = grn_proc_get_type(context, procedure);
+
+    return INT2NUM(type);
+}
+
 void
 rb_grn_init_procedure (VALUE mGrn)
 {
@@ -49,4 +60,6 @@ rb_grn_init_procedure (VALUE mGrn)
     rb_define_const(rb_cGrnProcedure, "BIGRAM", INT2NUM(GRN_DB_BIGRAM));
     rb_define_const(rb_cGrnProcedure, "TRIGRAM", INT2NUM(GRN_DB_TRIGRAM));
     rb_define_const(rb_cGrnProcedure, "MECAB", INT2NUM(GRN_DB_MECAB));
+
+    rb_define_method(rb_cGrnProcedure, "type", rb_grn_procedure_get_type, 0);
 }

data/ext/groonga/rb-grn-query-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-record.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-snippet.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-table-cursor-key-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-table-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-table-key-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-table.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"
@@ -77,6 +77,7 @@ rb_grn_table_bind (RbGrnTable *rb_grn_table,
     rb_grn_object = RB_GRN_OBJECT(rb_grn_table);
     rb_grn_table->value = grn_obj_open(context, GRN_BULK, 0,
                                        rb_grn_object->range_id);
+    rb_grn_table->columns = Qnil; /* For GC while the below rb_ary_new(). */
     rb_grn_table->columns = rb_ary_new();
 }
 
@@ -543,7 +544,7 @@ rb_grn_table_get_column (VALUE self, VALUE rb_name)
     owner = column->header.type == GRN_ACCESSOR;
     rb_column = GRNCOLUMN2RVAL(Qnil, context, column, owner);
     if (owner) {
-        rb_iv_set(rb_column, "table", self);
+        rb_grn_context_register_floating_object(DATA_PTR(rb_column));
     }
     rb_grn_named_object_set_name(RB_GRN_NAMED_OBJECT(DATA_PTR(rb_column)),
                                  name, name_size);

data/ext/groonga/rb-grn-type.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-utils.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"