rroonga 6.0.4-x64-mingw32 → 6.0.5-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2781651e9799537024a1e83c3f45f5244adc119f
-  data.tar.gz: fc42a29984041ead28e497370b44fedbac341a55
+  metadata.gz: c98624838e48a79cf0ad172314047638414b2a45
+  data.tar.gz: a9402ee25da0a8432ca938e555a31f11ac7e90d7
 SHA512:
-  metadata.gz: f5eec9fc6dc6f3330ec63d947973d807c7bfb679eab60599a01f4453c6e451d3d24d7c13e6ea08cdfae5739cd764b61ff65c4b214808294d66d97efec42454e7
-  data.tar.gz: 9278c30f7db23ae2228400609c013a878519aeb7205eebe93bc9e36ed7b995a594b4a9628b70dbabb93142fb5ea383cb3598dee8da755230ab76860088c734f2
+  metadata.gz: a834b65556ecbebf50c61c4d82f2e41d36a63d1523be352e3cedb0939dbd87ccd79bb44caf96c06a2315a92745c57453cc14601624c8c15a36da04405b91ff68
+  data.tar.gz: a2fcc9aa091fee92774c0f139b8799b9059ddd72fcfde4285577708c75feb664347b17020cd853abb9ec9b9f7491150b08a4fd162056572dc7ca52a97acedef1

data/doc/text/news.md

@@ -1,5 +1,44 @@
 # NEWS
 
+## 6.0.5: 2016-07-15 {#version-6-0-5}
+
+### Improvements
+
+  * Supported Groonga 6.0.5. Groonga 6.0.4 or older aren't supported.
+
+  * {Groonga::ID}: Added a module that provided object ID related
+    features.
+
+  * {Groonga::ID.builtin?}: Added a new predicate method that checks
+    whether the given ID is ID for builtin object or not.
+
+  * {Groonga::ID::NIL}: Added a new constant that represents invalid ID.
+
+  * {Groonga::ID::MAX}: Added a new constant that represents the maximum ID.
+
+  * {Groonga::Name}: Added a new module that provides object name
+    related features.
+
+  * {Groonga::Name.column?}: Added a new predicate method that checks
+    whether the given name is column object name or not.
+
+  * {Groonga::Object#column?}: Added a new predicate for column.
+
+  * {Groonga::Object#reference_column?}: Added a new predicate for
+    column that uses table as value type.
+
+  * {Groonga::Object#index_column?}: Added a new predicate for
+    index column.
+
+  * {Groonga::Object#touch}: Added a new method that updates the last
+    modified time of the object.
+
+  * {Groonga::Object#last_modified}: Added a new method that returns
+    the last modified time of the object.
+
+  * {Groonga::Object#dirty?}: Added a new method that checks whether
+    the object is changed after the last flush.
+
 ## 6.0.4: 2016-06-14 {#version-6-0-4}
 
 ### Improvements

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

@@ -0,0 +1,56 @@
+/* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2016  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"
+
+/*
+ * Document-class: Groonga::ID
+ *
+ * This module provides Groonga ID related features.
+ */
+
+/*
+ * @overload builtin?(id)
+ *   @param [Integer] id The ID to be confirmed.
+ *   @return [Boolean] `true` if the `id` is builtin, `false` otherwise.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_id_s_builtin_p (VALUE self, VALUE rb_id)
+{
+    grn_ctx *ctx = NULL;
+    grn_id id;
+
+    id = NUM2INT(rb_id);
+
+    return CBOOL2RVAL(grn_id_is_builtin(ctx, id));
+}
+
+void
+rb_grn_init_id (VALUE mGrn)
+{
+    VALUE mGrnID;
+
+    mGrnID = rb_define_module_under(mGrn, "ID");
+
+    rb_define_const(mGrnID, "NIL", INT2NUM(GRN_ID_NIL));
+    rb_define_const(mGrnID, "MAX", INT2NUM(GRN_ID_MAX));
+
+    rb_define_singleton_method(mGrnID, "builtin?", rb_grn_id_s_builtin_p, 1);
+}

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

@@ -0,0 +1,55 @@
+/* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2016  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"
+
+/*
+ * Document-class: Groonga::Name
+ *
+ * This module provides object name related features.
+ */
+
+/*
+ * @overload column?(name)
+ *   @param [String] name The name to be confirmed.
+ *   @return [Boolean] `true` if the `name` is column, `false` otherwise.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_name_s_column_p (VALUE self, VALUE rb_name)
+{
+    grn_ctx *ctx = NULL;
+    const char *name;
+    size_t name_size;
+
+    name = StringValueCStr(rb_name);
+    name_size = RSTRING_LEN(rb_name);
+
+    return CBOOL2RVAL(grn_obj_name_is_column(ctx, name, name_size));
+}
+
+void
+rb_grn_init_name (VALUE mGrn)
+{
+    VALUE mGrnName;
+
+    mGrnName = rb_define_module_under(mGrn, "Name");
+
+    rb_define_singleton_method(mGrnName, "column?", rb_grn_name_s_column_p, 1);
+}

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

@@ -1549,6 +1549,83 @@ rb_grn_object_table_p (VALUE self)
     return CBOOL2RVAL(table_p);
 }
 
+/*
+ * Checks whether the object is column or not.
+ *
+ * @overload column?
+ *   @return [Boolean] `true` if the object is column, `false` otherwise.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_object_column_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    grn_bool column_p = GRN_FALSE;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        column_p = grn_obj_is_column(context, object);
+    }
+
+    return CBOOL2RVAL(column_p);
+}
+
+/*
+ * Checks whether the object is reference column or not.
+ *
+ * @overload reference_column?
+ *   @return [Boolean] `true` if the object is reference column,
+ *     `false` otherwise.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_object_reference_column_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    grn_bool reference_column_p = GRN_FALSE;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        reference_column_p = grn_obj_is_reference_column(context, object);
+    }
+
+    return CBOOL2RVAL(reference_column_p);
+}
+
+/*
+ * Checks whether the object is index column or not.
+ *
+ * @overload index_column?
+ *   @return [Boolean] `true` if the object is index column,
+ *     `false` otherwise.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_object_index_column_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    grn_bool index_column_p = GRN_FALSE;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+
+    if (context && object) {
+        index_column_p = grn_obj_is_index_column(context, object);
+    }
+
+    return CBOOL2RVAL(index_column_p);
+}
+
 /*
  * Checks whether the object is procedure or not.
  *
@@ -1767,6 +1844,84 @@ rb_grn_object_key_accessor_p (VALUE self)
     return CBOOL2RVAL(key_accessor_p);
 }
 
+/*
+ * Update the last modified time of the `object`. It's meaningful only
+ * for persistent database, table and column.
+ *
+ * @overload touch(time=nil)
+ *   @param [Time, nil] time (nil) The last modified time.
+ *     If `time` is `nil`, the current time is used.
+ *   @return [void]
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_object_touch (int argc, VALUE *argv, VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    VALUE rb_time;
+    grn_timeval time_buffer;
+    grn_timeval *time = NULL;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+    if (!context || !object) {
+        return Qnil;
+    }
+
+    rb_scan_args(argc, argv, "01", &rb_time);
+    if (!NIL_P(rb_time)) {
+        time_buffer.tv_sec = NUM2LONG(rb_funcall(rb_time, rb_intern("sec"), 0));
+        time_buffer.tv_nsec = NUM2INT(rb_funcall(rb_time, rb_intern("nsec"), 0));
+        time = &time_buffer;
+    }
+
+    grn_obj_touch(context, object, time);
+    rb_grn_context_check(context, self);
+
+    return Qnil;
+}
+
+/*
+ * @overload last_modified
+ *   @return [Time] The last modified time of the object.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_object_get_last_modified (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    uint32_t last_modified;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+    last_modified = grn_obj_get_last_modified(context, object);
+    return rb_funcall(rb_cTime, rb_intern("at"), 1, UINT2NUM(last_modified));
+}
+
+
+/*
+ * @overload dirty?
+ *   @return [Boolean] `true` if the object isn't flushed after the last change.
+ *
+ * @since 6.0.5
+ */
+static VALUE
+rb_grn_object_dirty_p (VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *object;
+    grn_bool is_dirty;
+
+    rb_grn_object_deconstruct(SELF(self), &object, &context,
+                              NULL, NULL, NULL, NULL);
+    is_dirty = grn_obj_is_dirty(context, object);
+    return CBOOL2RVAL(is_dirty);
+}
+
 void
 rb_grn_init_object (VALUE mGrn)
 {
@@ -1803,6 +1958,11 @@ rb_grn_init_object (VALUE mGrn)
 
     rb_define_method(rb_cGrnObject, "builtin?", rb_grn_object_builtin_p, 0);
     rb_define_method(rb_cGrnObject, "table?", rb_grn_object_table_p, 0);
+    rb_define_method(rb_cGrnObject, "column?", rb_grn_object_column_p, 0);
+    rb_define_method(rb_cGrnObject, "reference_column?",
+                     rb_grn_object_reference_column_p, 0);
+    rb_define_method(rb_cGrnObject, "index_column?",
+                     rb_grn_object_index_column_p, 0);
     rb_define_method(rb_cGrnObject, "procedure?", rb_grn_object_procedure_p, 0);
     rb_define_method(rb_cGrnObject, "function_procedure?",
                      rb_grn_object_function_procedure_p, 0);
@@ -1818,4 +1978,10 @@ rb_grn_init_object (VALUE mGrn)
                      rb_grn_object_accessor_p, 0);
     rb_define_method(rb_cGrnObject, "key_accessor?",
                      rb_grn_object_key_accessor_p, 0);
+
+    rb_define_method(rb_cGrnObject, "touch", rb_grn_object_touch, -1);
+    rb_define_method(rb_cGrnObject, "last_modified",
+                     rb_grn_object_get_last_modified, 0);
+    rb_define_method(rb_cGrnObject, "dirty?",
+                     rb_grn_object_dirty_p, 0);
 }

data/ext/groonga/rb-grn.h

@@ -99,7 +99,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 6
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 4
+#define RB_GRN_MICRO_VERSION 5
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
@@ -365,6 +365,8 @@ void           rb_grn_init_index                    (VALUE mGrn);
 void           rb_grn_init_request_canceler         (VALUE mGrn);
 void           rb_grn_init_request_timer            (VALUE mGrn);
 void           rb_grn_init_request_timer_id         (VALUE mGrn);
+void           rb_grn_init_id                       (VALUE mGrn);
+void           rb_grn_init_name                     (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 const char    *rb_grn_rc_to_message                 (grn_rc rc);

data/ext/groonga/rb-groonga.c

@@ -252,4 +252,6 @@ Init_groonga (void)
     rb_grn_init_request_canceler(mGrn);
     rb_grn_init_request_timer(mGrn);
     rb_grn_init_request_timer_id(mGrn);
+    rb_grn_init_id(mGrn);
+    rb_grn_init_name(mGrn);
 }

data/rroonga-build.rb

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

data/test/test-column.rb

@@ -349,6 +349,40 @@ class ColumnTest < Test::Unit::TestCase
     end
   end
 
+  def test_column?
+    assert do
+      @users_name_column.column?
+    end
+  end
+
+  sub_test_case "#reference_column" do
+    test "true" do
+      assert do
+        @bookmarks_user.reference_column?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @users_name_column.reference_column?
+      end
+    end
+  end
+
+  sub_test_case "#index_column?" do
+    test "true" do
+      assert do
+        @bookmarks_index_content.index_column?
+      end
+    end
+
+    test "false" do
+      assert do
+        not @users_name_column.index_column?
+      end
+    end
+  end
+
   private
   def assert_content_search(expected_records, term)
     records = @bookmarks_index_content.search(term).records

data/test/test-database.rb

@@ -366,4 +366,25 @@ class DatabaseTest < Test::Unit::TestCase
                    @database.disk_usage)
     end
   end
+
+  class LastModifiedTest < self
+    setup :setup_database
+
+    def test_touch
+      assert_equal(Time.at(0), @database.last_modified)
+      @database.touch
+      assert_equal(Time.now.sec, @database.last_modified.sec)
+    end
+
+    def test_dirty?
+      omit("TODO: Enable this after Groonga 6.0.6 is released.")
+      assert do
+        not @database.dirty?
+      end
+      @database.touch
+      assert do
+        @database.dirty?
+      end
+    end
+  end
 end

data/test/test-id.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2016  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
+
+class IDTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  test "NIL" do
+    assert_equal(0, Groonga::ID::NIL)
+  end
+
+  test "MAX" do
+    assert_equal(2 ** 30 - 1, Groonga::ID::MAX)
+  end
+
+  sub_test_case(".builtin?") do
+    test "true" do
+      assert do
+        Groonga::ID.builtin?(Groonga::Type::INT32)
+      end
+    end
+
+    test "false" do
+      Groonga::Schema.define do |schema|
+        schema.create_table("Users", :type => :hash)
+      end
+      users_id = Groonga["Users"].id
+
+      assert do
+        not Groonga::ID.builtin?(users_id)
+      end
+    end
+  end
+end

data/test/test-name.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2016  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
+
+class NameTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  sub_test_case(".column?") do
+    test "true" do
+      assert do
+        Groonga::Name.column?("Users.age")
+      end
+    end
+
+    test "false" do
+      assert do
+        not Groonga::Name.column?("Users")
+      end
+    end
+  end
+end

data/test/test-table.rb

@@ -561,7 +561,7 @@ class TableTest < Test::Unit::TestCase
     ruby_bookmarks = bookmarks.select {|record| (record["title"] == "Ruby") &
                                                 (record["title"] == "Ruby") }
     all_bookmarks = bookmarks.select
-    assert_equal([["groonga", 1], ["Ruby", 2]],
+    assert_equal([["groonga", 1.0], ["Ruby", 3.0]],
                  all_bookmarks.merge!(ruby_bookmarks).collect do |record|
                    [record[".title"], record.score]
                  end)

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

@@ -1606,6 +1606,11 @@ struct _grn_table_scan_hit {
   unsigned int length;
 };
 
+typedef struct {
+  int64_t tv_sec;
+  int32_t tv_nsec;
+} grn_timeval;
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -0,0 +1,30 @@
+/* -*- c-basic-offset: 2 -*- */
+/*
+  Copyright(C) 2016 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  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
+*/
+
+#pragma once
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+GRN_API grn_bool grn_id_is_builtin(grn_ctx *ctx, grn_id id);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *str);
+GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *utf8);
 
 #ifdef __cplusplus
 }