rroonga 5.0.3-x86-mingw32 → 5.0.4-x86-mingw32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI0MjgxYzZlNzE3MTU4MTlhOWM2MjkyMDkzNTM1MzU1YmY5M2Y1ZQ==
+    NDE4ZTg4MTM5NjQyNWM0MTJjZjRkZGYzOWVhMTI0OGUxMjBiNGEyYg==
   data.tar.gz: !binary |-
-    NTM2OTNlZDhkZWUzMjRkNGVlMjk2YWQ0MmQ4M2YwNTA3YjgwZWY1OQ==
+    NmMwMTNhN2E5N2IyOWVhMDUxMjE2ZDA0ZTBjYmI1NWI5OTRmNTYzMQ==
 SHA512:
   metadata.gz: !binary |-
-    OTdlZWNjNTEyNjJiMTU1MjgwZTU2ZmI1ZWRmMTk5Mzg5Y2E0YWI5NTVlODBl
-    ZWNlYzJiYzFmMzM5ZmNiZTJkMGJiYWJiNWZiODFiMGI1NGExMTg3MDYyMDU5
-    MjBkYzBhNGQyOGE0MGFlMWViNDllZTI0Y2VjNDE5ZDZiMWVjZGY=
+    ZmEyZDViNTg0YWM4NjU2ZTBjZDZlOWVlMDUwNTg5MzUwZGY2MmY0ZGMyMTJk
+    NjdlYTEwNGI1ZTc2ZjA4OWI5NGI2MDI0MzQ2MWZiYTkyMWQxNzczMzJiNDQx
+    NTNhMTZlOTM3Y2FkNDAwMDczZDIxZWQ2ZGY3YWNiZTBlMjRjZDk=
   data.tar.gz: !binary |-
-    OGNlNzk0MjdiZDBiZGQ0NTc5NDc2MTYxNzkzZDk4N2FjMjg0OTIyNWQyODFj
-    NjU4MTM3Nzk0Mjk2YjRmYjZmMjllMDU4Yjc3YTMyZTQ4MDY4NWQ1OGQ5N2Fk
-    ZWJlYTY0ODYzN2FjMDJjYjY4NTIyOWVhMjA3OTExOGVlZjkxNWI=
+    MDVhMjczY2IzODI0MmI2YzAyNGMwNzc0NGFmMWYzY2EyMzhjZjg3M2NlNjEx
+    YjU2OGRiZGY4NTkzOTNhY2VhMmViZTc5ZmI3MzRjZDU4NWY2YTA4MGZmMmZk
+    ZjdkNzIxZGIyMDI1NmFkMzQ4NDZlNjUwNTIwZmY5ZWY4NDFlYTU=

data/README.md

@@ -40,7 +40,7 @@ contributed patches.)
 ## Dependencies
 
 * Ruby >= 1.9.3
-* Groonga >= 5.0.3
+* Groonga >= 5.0.5
 
 ## Install
 

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

@@ -788,6 +788,8 @@ rb_grn_init_column (VALUE mGrn)
 {
     rb_cGrnColumn = rb_define_class_under(mGrn, "Column", rb_cGrnObject);
 
+    rb_include_module(rb_cGrnColumn, rb_mGrnFlushable);
+
     rb_define_method(rb_cGrnColumn, "table", rb_grn_column_get_table, 0);
     rb_define_method(rb_cGrnColumn, "local_name",
                      rb_grn_column_get_local_name, 0);

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

@@ -601,6 +601,7 @@ rb_grn_init_database (VALUE mGrn)
 
     rb_include_module(rb_cGrnDatabase, rb_mEnumerable);
     rb_include_module(rb_cGrnDatabase, rb_mGrnEncodingSupport);
+    rb_include_module(rb_cGrnDatabase, rb_mGrnFlushable);
 
     rb_define_singleton_method(rb_cGrnDatabase, "create",
                                rb_grn_database_s_create, -1);

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

@@ -0,0 +1,81 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2015  Masafumi Yokoyama <yokoyama@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"
+
+#define SELF(object) (RB_GRN_OBJECT(DATA_PTR(object)))
+
+VALUE rb_mGrnFlushable;
+
+/*
+ * Document-module: Groonga::Flushable
+ *
+ * It provides the ability to flush data on memory to disk.
+ */
+
+/*
+ * Flush memory mapped data to disk.
+ *
+ * @overload flush(options={})
+ *   @param [::Hash] options
+ *   @option options [Boolean] :recursive (true) Whether to flush objects
+ *     which a target object has recursively.
+ *   @return [void]
+ */
+static VALUE
+rb_grn_flushable_flush (int argc, VALUE *argv, VALUE self)
+{
+    grn_ctx *context = NULL;
+    grn_obj *object = NULL;
+    VALUE rb_recursive_p;
+    VALUE rb_options;
+
+    rb_scan_args(argc, argv, "01", &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "recursive", &rb_recursive_p,
+                        NULL);
+    if (NIL_P(rb_recursive_p)) {
+        rb_recursive_p = Qtrue;
+    }
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+    if (!object) {
+        rb_raise(rb_eGrnClosed,
+                 "can't access already closed Groonga object: <%s>",
+                 rb_grn_inspect(self));
+    }
+
+    if (RVAL2CBOOL(rb_recursive_p)) {
+        grn_obj_flush_recursive(context, object);
+    } else {
+        grn_obj_flush(context, object);
+    }
+    rb_grn_context_check(context, self);
+
+    return Qnil;
+}
+
+void
+rb_grn_init_flushable (VALUE mGrn)
+{
+    rb_mGrnFlushable = rb_define_module_under(mGrn, "Flushable");
+
+    rb_define_method(rb_mGrnFlushable, "flush",
+                     rb_grn_flushable_flush, -1);
+}

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

@@ -2571,6 +2571,7 @@ rb_grn_init_table (VALUE mGrn)
     rb_define_alloc_func(rb_cGrnTable, rb_grn_table_alloc);
 
     rb_include_module(rb_cGrnTable, rb_mEnumerable);
+    rb_include_module(rb_cGrnTable, rb_mGrnFlushable);
 
     rb_define_method(rb_cGrnTable, "initialize", rb_grn_table_initialize, 0);
 

data/ext/groonga/rb-grn.h

@@ -101,7 +101,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 5
 #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
 
@@ -257,6 +257,7 @@ RB_GRN_VAR VALUE rb_eGrnInvalidArgument;
 RB_GRN_VAR VALUE rb_eGrnNoMemoryAvailable;
 RB_GRN_VAR VALUE rb_cGrnObject;
 RB_GRN_VAR VALUE rb_mGrnEncodingSupport;
+RB_GRN_VAR VALUE rb_mGrnFlushable;
 RB_GRN_VAR VALUE rb_cGrnDatabase;
 RB_GRN_VAR VALUE rb_cGrnTable;
 RB_GRN_VAR VALUE rb_mGrnTableKeySupport;
@@ -305,6 +306,7 @@ void           rb_grn_init_utils                    (VALUE mGrn);
 void           rb_grn_init_exception                (VALUE mGrn);
 void           rb_grn_init_encoding                 (VALUE mGrn);
 void           rb_grn_init_encoding_support         (VALUE mGrn);
+void           rb_grn_init_flushable                (VALUE mGrn);
 void           rb_grn_init_context                  (VALUE mGrn);
 void           rb_grn_init_object                   (VALUE mGrn);
 void           rb_grn_init_database                 (VALUE mGrn);

data/ext/groonga/rb-groonga.c

@@ -166,6 +166,7 @@ Init_groonga (void)
     rb_grn_init_utils(mGrn);
     rb_grn_init_encoding(mGrn);
     rb_grn_init_encoding_support(mGrn);
+    rb_grn_init_flushable(mGrn);
     rb_grn_init_context(mGrn);
     rb_grn_init_object(mGrn);
     rb_grn_init_database(mGrn);

data/rroonga-build.rb

@@ -20,15 +20,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 3
+    MICRO = 5
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2015, 4, 29)
+    RELEASED_DATE = Time.utc(2015, 6, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 5
     MINOR = 0
-    MICRO = 4
+    MICRO = 5
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-flushable.rb

@@ -0,0 +1,49 @@
+# Copyright (C) 2015  Masafumi Yokoyama <yokoyama@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
+
+class FlushableTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  def test_flush_table
+    table = Groonga::Hash.create
+    assert_nothing_raised do
+      table.flush
+    end
+  end
+
+  def test_flush_column
+    table = Groonga::Hash.create(:name => "Users")
+    column = table.define_column("name", "ShortText")
+    assert_nothing_raised do
+      column.flush
+    end
+  end
+
+  def test_flush_database
+    assert_nothing_raised do
+      @database.flush
+    end
+  end
+
+  def test_flush_not_recursive
+    table = Groonga::Hash.create
+    table.extend(Groonga::Flushable)
+    assert_nothing_raised do
+      table.flush(:recursive => false)
+    end
+  end
+end

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86
+prefix=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/libexec/mecab
+       	echo /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/libexec/mecab
        	;;
 	
     --sysconfdir)

data/vendor/local/bin/onig-config

@@ -27,7 +27,7 @@ if test $# -eq 0; then
   show_usage
 fi
 
-prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86
+prefix=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86
 exec_prefix=${prefix}
 is_set_exec_prefix=no
 

data/vendor/local/etc/groonga/httpd/groonga-httpd.conf

@@ -15,7 +15,7 @@ http {
   keepalive_timeout 65;
 
   # The default groonga database path.
-  groonga_database /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/var/lib/groonga/db/db;
+  groonga_database /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/var/lib/groonga/db/db;
 
   # Create a groonga database automatically if the groonga database doesn't
   # exist.
@@ -45,7 +45,7 @@ http {
     }
 
     location / {
-      root /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/share/groonga/html/admin;
+      root /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/share/groonga/html/admin;
       index index.html;
     }
 

data/vendor/local/include/groonga/groonga/groonga.h

@@ -907,6 +907,8 @@ GRN_API grn_rc grn_obj_lock(grn_ctx *ctx, grn_obj *obj, grn_id id, int timeout);
 GRN_API grn_rc grn_obj_unlock(grn_ctx *ctx, grn_obj *obj, grn_id id);
 GRN_API grn_rc grn_obj_clear_lock(grn_ctx *ctx, grn_obj *obj);
 GRN_API unsigned int grn_obj_is_locked(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_rc grn_obj_flush(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_rc grn_obj_flush_recursive(grn_ctx *ctx, grn_obj *obj);
 GRN_API int grn_obj_defrag(grn_ctx *ctx, grn_obj *obj, int threshold);
 
 GRN_API grn_obj *grn_obj_db(grn_ctx *ctx, grn_obj *obj);

data/vendor/local/include/groonga/groonga/plugin.h

@@ -55,6 +55,11 @@ GRN_PLUGIN_EXPORT grn_rc GRN_PLUGIN_INIT(grn_ctx *ctx);
 GRN_PLUGIN_EXPORT grn_rc GRN_PLUGIN_REGISTER(grn_ctx *ctx);
 GRN_PLUGIN_EXPORT grn_rc GRN_PLUGIN_FIN(grn_ctx *ctx);
 
+#define GRN_PLUGIN_DECLARE_FUNCTIONS(tag)                               \
+  extern grn_rc GRN_PLUGIN_IMPL_NAME_TAGGED(init, tag)(grn_ctx *ctx);   \
+  extern grn_rc GRN_PLUGIN_IMPL_NAME_TAGGED(register, tag)(grn_ctx *ctx); \
+  extern grn_rc GRN_PLUGIN_IMPL_NAME_TAGGED(fin, tag)(grn_ctx *ctx)
+
 /*
   Don't call these functions directly. Use GRN_PLUGIN_MALLOC(),
   GRN_PLUGIN_REALLOC() and GRN_PLUGIN_FREE() instead.

data/vendor/local/lib/groonga/plugins/functions/vector.la

@@ -17,7 +17,7 @@ old_library='vector.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/functions'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/functions'

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -17,7 +17,7 @@ old_library='tsv.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/query_expanders'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/query_expanders'

data/vendor/local/lib/groonga/plugins/ruby/eval.la

@@ -17,7 +17,7 @@ old_library='eval.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'

data/vendor/local/lib/groonga/plugins/ruby/load.la

@@ -17,7 +17,7 @@ old_library='load.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'