rroonga 4.0.3-x86-mingw32 → 4.0.4-x86-mingw32

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"

data/ext/groonga/rb-grn-variable-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"
@@ -163,6 +163,7 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
     grn_id id;
     grn_obj *value;
     VALUE rb_value;
+    VALUE rb_range;
     unsigned int i, n;
 
     rb_grn_variable_size_column_deconstruct(SELF(self), &column, &context,
@@ -181,25 +182,36 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
     grn_obj_get_value(context, column, id, value);
     rb_grn_context_check(context, self);
 
+    rb_range = GRNTABLE2RVAL(context, range, GRN_FALSE);
+
     n = grn_vector_size(context, value);
     rb_value = rb_ary_new2(n);
     for (i = 0; i < n; i++) {
-        const char *element_value;
-        unsigned int element_value_length;
+        VALUE rb_element_value;
         unsigned int weight = 0;
         grn_id domain;
         VALUE rb_element;
 
-        element_value_length = grn_vector_get_element(context,
-                                                      value,
-                                                      i,
-                                                      &element_value,
-                                                      &weight,
-                                                      &domain);
+        if (value->header.type == GRN_UVECTOR) {
+            grn_id id;
+            id = grn_uvector_get_element(context, value, i, &weight);
+            rb_element_value = rb_grn_record_new(rb_range, id, Qnil);
+        } else {
+            const char *element_value;
+            unsigned int element_value_length;
+            element_value_length = grn_vector_get_element(context,
+                                                          value,
+                                                          i,
+                                                          &element_value,
+                                                          &weight,
+                                                          &domain);
+            rb_element_value = rb_str_new(element_value, element_value_length);
+        }
+
         rb_element = rb_hash_new();
         rb_hash_aset(rb_element,
                      ID2SYM(rb_intern("value")),
-                     rb_str_new(element_value, element_value_length));
+                     rb_element_value);
         rb_hash_aset(rb_element,
                      ID2SYM(rb_intern("weight")),
                      UINT2NUM(weight));
@@ -211,9 +223,11 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
 }
 
 typedef struct {
+    VALUE self;
     grn_ctx *context;
     grn_obj *vector;
     grn_obj *element_value;
+    grn_obj *range;
 } HashElementToVectorElementData;
 
 static int
@@ -223,15 +237,21 @@ hash_element_to_vector_element(VALUE key, VALUE value, VALUE user_data)
         (HashElementToVectorElementData *)user_data;
     unsigned int weight;
 
-    GRN_BULK_REWIND(data->element_value);
-    RVAL2GRNBULK(key, data->context, data->element_value);
-
     weight = NUM2UINT(value);
-    grn_vector_add_element(data->context, data->vector,
-                           GRN_BULK_HEAD(data->element_value),
-                           GRN_BULK_VSIZE(data->element_value),
-                           weight,
-                           data->element_value->header.domain);
+
+    if (data->vector->header.type == GRN_UVECTOR) {
+        grn_id id = RVAL2GRNID(key, data->context, data->range, data->self);
+        grn_uvector_add_element(data->context, data->vector, id, weight);
+    } else {
+        GRN_BULK_REWIND(data->element_value);
+        RVAL2GRNBULK(key, data->context, data->element_value);
+
+        grn_vector_add_element(data->context, data->vector,
+                               GRN_BULK_HEAD(data->element_value),
+                               GRN_BULK_VSIZE(data->element_value),
+                               weight,
+                               data->element_value->header.domain);
+    }
 
     return ST_CONTINUE;
 }
@@ -373,6 +393,7 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
     grn_obj_reinit(context, value,
                    value->header.domain,
                    value->header.flags | GRN_OBJ_VECTOR);
+    value->header.flags |= GRN_OBJ_WITH_WEIGHT;
     if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cArray))) {
         int i, n;
         n = RARRAY_LEN(rb_value);
@@ -389,22 +410,29 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
                 weight = NUM2UINT(rb_weight);
             }
 
-            GRN_BULK_REWIND(element_value);
-            if (!NIL_P(rb_element_value)) {
-                RVAL2GRNBULK(rb_element_value, context, element_value);
+            if (value->header.type == GRN_UVECTOR) {
+                grn_id id = RVAL2GRNID(rb_element_value, context, range, self);
+                grn_uvector_add_element(context, value, id, weight);
+            } else {
+                GRN_BULK_REWIND(element_value);
+                if (!NIL_P(rb_element_value)) {
+                    RVAL2GRNBULK(rb_element_value, context, element_value);
+                }
+
+                grn_vector_add_element(context, value,
+                                       GRN_BULK_HEAD(element_value),
+                                       GRN_BULK_VSIZE(element_value),
+                                       weight,
+                                       element_value->header.domain);
             }
-
-            grn_vector_add_element(context, value,
-                                   GRN_BULK_HEAD(element_value),
-                                   GRN_BULK_VSIZE(element_value),
-                                   weight,
-                                   element_value->header.domain);
         }
     } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cHash))) {
         HashElementToVectorElementData data;
+        data.self = self;
         data.context = context;
         data.vector = value;
         data.element_value = element_value;
+        data.range = range;
         rb_hash_foreach(rb_value, hash_element_to_vector_element, (VALUE)&data);
     } else {
         rb_raise(rb_eArgError,

data/ext/groonga/rb-grn-variable.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.h

@@ -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
 */
 
 #ifndef __RB_GRN_H__
@@ -84,7 +84,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 4
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 3
+#define RB_GRN_MICRO_VERSION 4
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -288,6 +288,7 @@ void           rb_grn_init_patricia_trie_cursor     (VALUE mGrn);
 void           rb_grn_init_double_array_trie_cursor (VALUE mGrn);
 void           rb_grn_init_type                     (VALUE mGrn);
 void           rb_grn_init_procedure                (VALUE mGrn);
+void           rb_grn_init_procedure_type           (VALUE mGrn);
 void           rb_grn_init_column                   (VALUE mGrn);
 void           rb_grn_init_fix_size_column          (VALUE mGrn);
 void           rb_grn_init_variable_size_column     (VALUE mGrn);
@@ -374,6 +375,7 @@ VALUE          rb_grn_object_set_raw                (RbGrnObject *rb_grn_object,
                                                      VALUE rb_value,
                                                      int flags,
                                                      VALUE related_object);
+void           rb_grn_object_close_raw              (RbGrnObject *rb_grn_object);
 VALUE          rb_grn_object_close                  (VALUE object);
 VALUE          rb_grn_object_closed_p               (VALUE object);
 VALUE          rb_grn_object_inspect_object         (VALUE inspected,

data/ext/groonga/rb-groonga.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-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
 */
 
 #include "rb-grn.h"
@@ -175,6 +175,7 @@ Init_groonga (void)
     rb_grn_init_posting(mGrn);
     rb_grn_init_type(mGrn);
     rb_grn_init_procedure(mGrn);
+    rb_grn_init_procedure_type(mGrn);
     rb_grn_init_column(mGrn);
     rb_grn_init_accessor(mGrn);
     rb_grn_init_geo_point(mGrn);