rroonga 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269475e06e66319490d5e9140e0c7dd6c3a3ee39
-  data.tar.gz: 1d46c8e6ddbb842a850c12c576e857ac959a2502
+  metadata.gz: 4775fe73dce23e5903d824e9aa15ce08ab2a7fcf
+  data.tar.gz: 42bef5aad29f73c0938b8016607c2b7a310fe98b
 SHA512:
-  metadata.gz: fe216529739235d3b06eddc14c6dfa270baa847c529e909b7e27ef53bc5a38b85e987b62a56dee222a268bf0ddd8bc912f9c40d4a6de5fc0ad83c4e4ecff4758
-  data.tar.gz: 4536a87811347c1cf3b7b1acf45d2d226205f5db61720351a4e86be2d826d2b41829c8c22e4e5f94cf40fd3523272135d0b920fb2fc9e48ae5a80a2314d611fc
+  metadata.gz: 7d71139c901226ef9ce502df03003efee23da0bc43e21787d10858816d2fb1416d8b2f739861c6dd15bfdf8f1b0dd00913e46d69397218e3513c3a5e1b8a9bab
+  data.tar.gz: 4c2276a3e98a3273f8d61dde5f5d198f73ed0850761d5eacc236e8205242c44e76501f393245b3a3ee0ae89ec26f95458a54cafe250af0f453fb63c0339a1323

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -195,8 +195,8 @@ email:
 - dara@shidara.net
 executables:
 - groonga-index-dump
-- grndump
 - groonga-database-inspect
+- grndump
 - grntest-log-analyze
 extensions:
 - ext/groonga/extconf.rb
@@ -238,6 +238,7 @@ files:
 - ext/groonga/rb-grn-expression-builder.c
 - ext/groonga/rb-grn-expression.c
 - ext/groonga/rb-grn-fix-size-column.c
+- ext/groonga/rb-grn-flushable.c
 - ext/groonga/rb-grn-geo-point.c
 - ext/groonga/rb-grn-greater-equal-operator.c
 - ext/groonga/rb-grn-greater-operator.c
@@ -318,6 +319,7 @@ files:
 - test/test-expression-builder.rb
 - test/test-expression.rb
 - test/test-fix-size-column.rb
+- test/test-flushable.rb
 - test/test-geo-point.rb
 - test/test-gqtp.rb
 - test/test-hash.rb
@@ -385,61 +387,62 @@ specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-schema.rb
-- test/test-snippet.rb
-- test/test-variable.rb
-- test/test-geo-point.rb
 - test/test-plugin.rb
-- test/test-table-group.rb
-- test/test-accessor.rb
-- test/test-double-array-trie.rb
-- test/test-pagination.rb
-- test/test-memory-pool.rb
-- test/test-column.rb
-- test/test-table-traverse.rb
-- test/test-expression.rb
+- test/test-query-logger.rb
 - test/test-table-select.rb
-- test/test-encoding.rb
-- test/test-logger.rb
-- test/test-schema-create-table.rb
-- test/test-hash.rb
-- test/test-type.rb
 - test/test-table-offset-and-limit.rb
+- test/test-token-regexp.rb
+- test/test-sub-records.rb
+- test/test-index-cursor.rb
+- test/test-convert.rb
 - test/test-version.rb
+- test/test-table.rb
 - test/test-lock-timeout.rb
+- test/test-schema-create-table.rb
 - test/test-index-column.rb
-- test/test-table-key-support.rb
-- test/test-vector-column.rb
-- test/test-normalizer.rb
-- test/test-table-select-weight.rb
-- test/test-schema-type.rb
-- test/test-sub-records.rb
-- test/test-procedure.rb
-- test/test-context.rb
-- test/test-gqtp.rb
-- test/test-remote.rb
-- test/test-database-dumper.rb
-- test/test-database-inspector.rb
-- test/test-patricia-trie.rb
-- test/run-test.rb
 - test/test-fix-size-column.rb
-- test/test-statistic-measurer.rb
+- test/test-table-dumper.rb
 - test/test-array.rb
-- test/test-table.rb
-- test/groonga-test-utils.rb
 - test/test-record.rb
-- test/test-exception.rb
-- test/test-table-select-normalize.rb
 - test/test-schema-dumper.rb
-- test/test-token-regexp.rb
-- test/test-table-dumper.rb
-- test/test-database.rb
-- test/test-query-logger.rb
 - test/test-variable-size-column.rb
-- test/test-table-select-mecab.rb
-- test/test-expression-builder.rb
+- test/test-type.rb
+- test/test-pagination.rb
+- test/test-database-dumper.rb
+- test/test-table-group.rb
+- test/test-accessor.rb
+- test/test-database.rb
+- test/test-database-inspector.rb
 - test/test-operator.rb
-- test/test-convert.rb
-- test/test-index-cursor.rb
+- test/test-procedure.rb
+- test/test-expression-builder.rb
 - test/test-command-select.rb
+- test/test-double-array-trie.rb
+- test/test-vector-column.rb
+- test/test-encoding.rb
+- test/test-table-key-support.rb
+- test/test-gqtp.rb
+- test/run-test.rb
+- test/test-patricia-trie.rb
+- test/test-remote.rb
+- test/test-table-select-weight.rb
+- test/test-statistic-measurer.rb
+- test/test-logger.rb
+- test/test-hash.rb
+- test/test-schema-type.rb
+- test/test-normalizer.rb
+- test/test-flushable.rb
+- test/test-snippet.rb
+- test/test-variable.rb
+- test/test-memory-pool.rb
+- test/test-exception.rb
+- test/test-table-select-mecab.rb
+- test/test-table-select-normalize.rb
+- test/test-schema.rb
+- test/test-geo-point.rb
+- test/test-table-traverse.rb
+- test/groonga-test-utils.rb
+- test/test-column.rb
+- test/test-context.rb
+- test/test-expression.rb
 has_rdoc: