rroonga 6.1.0-x86-mingw32 → 6.1.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c79e8b3704720e6b6ff49c62561b1c7a97904c6
-  data.tar.gz: daa6a0730e425159454c54a776946630c8ceeb1c
+  metadata.gz: 6c3034661073e1369b519cb516fdbde62e46a324
+  data.tar.gz: 428d44a0fab1f6523827f89142027b8be18863a5
 SHA512:
-  metadata.gz: 62c4c9d8a061fc4b4c9af37bb679b18121931ca6ad562aef2df1014ca321a06b6107fe87f676368b0512fc064d7b2e08eafa08fd1708b20c934d3ae617f131fb
-  data.tar.gz: 1447fbfce9c8b9e19bb854928148c696f6b7f81d31d558b2dda532c5297201aab87540315509eb30cf7eea8ad18dae761adda552d1f1be0c9646d620e914f715
+  metadata.gz: 4a4198631e30010158b30eb18fba869fa38c36f6bdde8b980b3c1f7b1cab600db8b6a46f239af37fcbf22d5401e7da901846f90b946753457be6cec6db05958c
+  data.tar.gz: 031f5e7d7173003fd0dfe40ef60b6ce66154a9f114bd5144abed3ba4a4dd09ced9f29e66269c95f42596330d02ca1724cfbfc6e617ce39a2996f09859be6622b

data/Rakefile

@@ -157,7 +157,7 @@ windows_architectures = [:x86, :x64]
 
 namespace :build do
   namespace :windows do
-    ruby_versions = "2.1.6:2.2.2:2.3.0"
+    ruby_versions = "2.1.6:2.2.2:2.3.0:2.4.0"
 
     windows_architectures.each do |architecture|
       desc "Build gem for Windows #{architecture}"

data/doc/text/news.md

@@ -1,5 +1,33 @@
 # NEWS
 
+## 6.1.3: 2017-01-12 {#version-6-1-3}
+
+### Improvements
+
+  * Supported Groonga 6.1.3. Groonga 6.1.0 or older aren't supported.
+
+  * Added {Groonga::Context#support_zstd?}.
+
+  * Added {Groonga::ZstdError}.
+
+  * Supported Zstandard compression.
+    If Zstandard is available in your enviromemt, you can use Zstandard
+    compression for columns. How to use:
+
+          Groonga::Schema.define do |schema|
+            schema.create_table("Posts") do |table|
+              table.short_text("title", :compress => :zstandard)
+              # shortened form
+              # table.short_text("title", :compress => :zstd)
+            end
+          end
+
+  * Added PID for {Groonga::Logger::Flags}.
+
+  * Added {Groonga::Logger.flags}.
+
+  * Added {Groonga::Logger.flags=}.
+
 ## 6.1.0: 2016-11-07 {#version-6-1-0}
 
 ### Improvements

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

@@ -1,6 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2010-2015  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2016  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
@@ -698,6 +699,28 @@ rb_grn_context_support_lz4_p (VALUE self)
     return rb_support_p;
 }
 
+/*
+ * If Groonga supports Zstandard compression, it returns `true`,
+ * otherwise it returns `false`.
+ *
+ * @overload support_zstd?
+ */
+static VALUE
+rb_grn_context_support_zstd_p (VALUE self)
+{
+    VALUE rb_support_p;
+    grn_ctx *context;
+    grn_obj support_p;
+
+    context = SELF(self);
+    GRN_BOOL_INIT(&support_p, 0);
+    grn_obj_get_info(context, NULL, GRN_INFO_SUPPORT_ZSTD, &support_p);
+    rb_support_p = CBOOL2RVAL(GRN_BOOL_VALUE(&support_p));
+    GRN_OBJ_FIN(context, &support_p);
+
+    return rb_support_p;
+}
+
 /*
  * コンテキストが使うデータベースを返す。
  *
@@ -1005,6 +1028,8 @@ rb_grn_init_context (VALUE mGrn)
                      rb_grn_context_support_lzo_p, 0);
     rb_define_method(cGrnContext, "support_lz4?",
                      rb_grn_context_support_lz4_p, 0);
+    rb_define_method(cGrnContext, "support_zstd?",
+                     rb_grn_context_support_zstd_p, 0);
 
     rb_define_method(cGrnContext, "database", rb_grn_context_get_database, 0);
 

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

@@ -706,9 +706,9 @@ rb_grn_database_reindex (VALUE self)
 }
 
 /*
- * Removes a broken object.
+ * Removes an object forcibly.
  *
- * You should use {Groonga::Object#remove} normally.
+ * Normally, you should use {Groonga::Object#remove}.
  *
  * @overload remove_force(name)
  *

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
   Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2014-2016  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
@@ -102,6 +102,7 @@ static VALUE eGrnPluginError;
 static VALUE eGrnScorerError;
 static VALUE eGrnCancel;
 static VALUE eGrnWindowFunctionError;
+static VALUE eGrnZstdError;
 
 VALUE
 rb_grn_rc_to_exception (grn_rc rc)
@@ -349,6 +350,9 @@ rb_grn_rc_to_exception (grn_rc rc)
       case GRN_WINDOW_FUNCTION_ERROR:
         exception = eGrnWindowFunctionError;
         break;
+      case GRN_ZSTD_ERROR:
+        exception = eGrnZstdError;
+        break;
     }
 
     if (NIL_P(exception))
@@ -1058,4 +1062,14 @@ rb_grn_init_exception (VALUE mGrn)
      */
     eGrnWindowFunctionError =
         rb_define_class_under(mGrn, "WindowFunctionError", rb_eGrnError);
+
+    /*
+     * Document-class: Groonga::ZstdError
+     *
+     * It is used when Zstd causes an error.
+     *
+     * @since 6.1.3
+     */
+    eGrnZstdError =
+        rb_define_class_under(mGrn, "ZstdError", rb_eGrnError);
 }

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

@@ -1,6 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2016-2017  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
@@ -547,6 +548,43 @@ rb_grn_logger_s_set_path (VALUE klass, VALUE rb_path)
     return Qnil;
 }
 
+/*
+ * Gets the current log flags that is used by the default logger.
+ *
+ * @overload flags
+ *   @return [Integer] The current log flags.
+ *
+ * @since 6.1.3
+ */
+static VALUE
+rb_grn_logger_s_get_flags (VALUE klass)
+{
+    int flags = 0;
+    VALUE rb_flags;
+
+    flags = grn_default_logger_get_flags();
+    rb_flags = INT2NUM(flags);
+
+    return rb_flags;
+}
+
+/*
+ * Sets the log flags that is used by the default logger.
+ *
+ * @overload flags=(flags)
+ *   @param flags [Integer] The log flags for the default logger.
+ *   @return void
+ *
+ * @since 6.1.3
+ */
+static VALUE
+rb_grn_logger_s_set_flags (VALUE klass, VALUE rb_flags)
+{
+    grn_default_logger_set_flags(NUM2INT(rb_flags));
+
+    return Qnil;
+}
+
 /*
  * Gets the current rotate threshold size that is used by the default
  * logger.
@@ -636,6 +674,10 @@ rb_grn_init_logger (VALUE mGrn)
                                rb_grn_logger_s_get_path, 0);
     rb_define_singleton_method(rb_cGrnLogger, "path=",
                                rb_grn_logger_s_set_path, 1);
+    rb_define_singleton_method(rb_cGrnLogger, "flags",
+                               rb_grn_logger_s_get_flags, 0);
+    rb_define_singleton_method(rb_cGrnLogger, "flags=",
+                               rb_grn_logger_s_set_flags, 1);
     rb_define_singleton_method(rb_cGrnLogger, "rotate_threshold_size",
                                rb_grn_logger_s_get_rotate_threshold_size, 0);
     rb_define_singleton_method(rb_cGrnLogger, "rotate_threshold_size=",
@@ -650,6 +692,7 @@ rb_grn_init_logger (VALUE mGrn)
     DEFINE_FLAG(TITLE);
     DEFINE_FLAG(MESSAGE);
     DEFINE_FLAG(LOCATION);
+    DEFINE_FLAG(PID);
 #undef DEFINE_FLAG
 
     rb_cGrnCallbackLogger =

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-2014  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2014-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -914,10 +914,18 @@ rb_grn_object_inspect_content_flags_with_label (VALUE inspected,
     switch (object->header.type) {
     case GRN_COLUMN_FIX_SIZE:
     case GRN_COLUMN_VAR_SIZE:
-        if (column_flags & GRN_OBJ_COMPRESS_ZLIB) {
+        switch (column_flags & GRN_OBJ_COMPRESS_MASK) {
+        case GRN_OBJ_COMPRESS_ZLIB:
             rb_ary_push(inspected_flags, rb_str_new_cstr("COMPRESS_ZLIB"));
-        } else if (column_flags & GRN_OBJ_COMPRESS_LZ4) {
+            break;
+        case GRN_OBJ_COMPRESS_LZ4:
             rb_ary_push(inspected_flags, rb_str_new_cstr("COMPRESS_LZ4"));
+            break;
+        case GRN_OBJ_COMPRESS_ZSTD:
+            rb_ary_push(inspected_flags, rb_str_new_cstr("COMPRESS_ZSTD"));
+            break;
+        default:
+            break;
         }
         break;
     case GRN_COLUMN_INDEX:

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

@@ -229,8 +229,10 @@ rb_grn_table_inspect (VALUE self)
  *   @option options :compress
  *     値の圧縮方法を指定する。省略した場合は、圧縮しない。
  *
- *     - +:zlib+ := 値をzlib圧縮して格納する。
- *     - +:lz4+ := 値をLZ4圧縮して格納する。
+ *     * `:zlib`: Compressed by zlib.
+ *     * `:lz4`: Compressed by LZ4.
+ *     * `:zstd`: Compressed by Zstandard.
+ *     * `:zstandard`: Compressed by Zstandard.
  *
  * @return [Groonga::FixSizeColumn, Groonga::VariableSizeColumn]
  */
@@ -312,10 +314,14 @@ rb_grn_table_define_column (int argc, VALUE *argv, VALUE self)
         flags |= GRN_OBJ_COMPRESS_LZ4;
     } else if (rb_grn_equal_option(rb_compress, "lz4")) {
         flags |= GRN_OBJ_COMPRESS_LZ4;
+    } else if (rb_grn_equal_option(rb_compress, "zstd")) {
+        flags |= GRN_OBJ_COMPRESS_ZSTD;
+    } else if (rb_grn_equal_option(rb_compress, "zstandard")) {
+        flags |= GRN_OBJ_COMPRESS_ZSTD;
     } else {
         rb_raise(rb_eArgError,
                  "invalid compress type: %s: "
-                 "available types: [:zlib, :lz4, nil]",
+                 "available types: [:zlib, :lz4, :zstd, :zstandard, nil]",
                  rb_grn_inspect(rb_compress));
     }
 

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

@@ -465,7 +465,7 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
  * @overload compressed?
  *   @return [Boolean] whether the column is compressed or not.
  * @overload compressed?(type)
- *   @param [:zlib, :lz4] type (nil)
+ *   @param [:zlib, :lz4, :zstd, :zstandard] type (nil)
  *   @return [Boolean] whether specified compressed type is used or not.
  * @since 1.3.1
  */
@@ -481,6 +481,7 @@ rb_grn_variable_size_column_compressed_p (int argc, VALUE *argv, VALUE self)
     grn_bool accept_any_type = GRN_FALSE;
     grn_bool need_zlib_check = GRN_FALSE;
     grn_bool need_lz4_check = GRN_FALSE;
+    grn_bool need_zstd_check = GRN_FALSE;
 
     rb_scan_args(argc, argv, "01", &type);
 
@@ -494,9 +495,14 @@ rb_grn_variable_size_column_compressed_p (int argc, VALUE *argv, VALUE self)
             need_lz4_check = GRN_TRUE;
         } else if (rb_grn_equal_option(type, "lz4")) {
             need_lz4_check = GRN_TRUE;
+        } else if (rb_grn_equal_option(type, "zstd")) {
+            need_zstd_check = GRN_TRUE;
+        } else if (rb_grn_equal_option(type, "zstandardd")) {
+            need_zstd_check = GRN_TRUE;
         } else {
             rb_raise(rb_eArgError,
-                     "compressed type should be <:zlib> or <:lz4>: <%s>",
+                     "compressed type should be "
+                     "<:zlib>, <:lz4>, <:zstd> or <:zstandard>: <%s>",
                      rb_grn_inspect(type));
         }
     }
@@ -524,6 +530,14 @@ rb_grn_variable_size_column_compressed_p (int argc, VALUE *argv, VALUE self)
             compressed_p = GRN_BOOL_VALUE(&support_p);
         }
         break;
+      case GRN_OBJ_COMPRESS_ZSTD:
+        if (accept_any_type || need_zstd_check) {
+            grn_obj support_p;
+            GRN_BOOL_INIT(&support_p, 0);
+            grn_obj_get_info(context, NULL, GRN_INFO_SUPPORT_ZSTD, &support_p);
+            compressed_p = GRN_BOOL_VALUE(&support_p);
+        }
+        break;
     }
 
     return CBOOL2RVAL(compressed_p);

data/ext/groonga/rb-grn.h

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
-  Copyright (C) 2015-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
+  Copyright (C) 2015-2017  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
@@ -99,7 +99,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 6
 #define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 0
+#define RB_GRN_MICRO_VERSION 3
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/ext/groonga/rb-groonga.c

@@ -159,7 +159,7 @@ rb_grn_s_get_lock_timeout (VALUE klass)
  * @overload lock_timeout=(timeout)
  *    @param [Integer] timeout The new lock timeout.
  *
- * @see {#lock_timeout}
+ * @see lock_timeout
  * @since 3.1.2
  */
 static VALUE

data/lib/groonga/dumper.rb

@@ -628,6 +628,8 @@ module Groonga
             flags << "COMPRESS_ZLIB"
           elsif column.compressed?(:lz4)
             flags << "COMPRESS_LZ4"
+          elsif column.compressed?(:zstd)
+            flags << "COMPRESS_ZSTD"
           end
         end
         parameters << "#{flags.join('|')}"

data/lib/groonga/logger.rb

@@ -23,6 +23,7 @@ module Groonga
         TITLE    => "title",
         MESSAGE  => "message",
         LOCATION => "location",
+        PID      => "pid",
       }
 
       class << self
@@ -34,7 +35,7 @@ module Groonga
         def label(flags)
           labels = []
           LABELS.each do |flag, label|
-            flags << label if (flags & flag) == flag
+            labels << label if (flags & flag) == flag
           end
           labels << "none" if labels.empty?
           labels.join("|")

data/lib/groonga/schema.rb

@@ -850,8 +850,10 @@ module Groonga
       #
       #   値の圧縮方法を指定する。省略した場合は、圧縮しない。
       #
-      #   - :zlib := 値をzlib圧縮して格納する。
-      #   - :lz4 := 値をLZ4圧縮して格納する。
+      #   * `:zlib`: Compressed by zlib.
+      #   * `:lz4`: Compzressed by LZ4.
+      #   * `:zstd`: Compressed by Zstandard.
+      #   * `:zstandard`: Compressed by Zstandard.
       def column(name, type, options={})
         definition = self[name, ColumnDefinition]
         if definition.nil?

data/rroonga-build.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2015-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
+# Copyright (C) 2015-2017  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
@@ -17,16 +17,16 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 6
-    MINOR = 0
-    MICRO = 9
+    MINOR = 1
+    MICRO = 1
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2016, 9, 29)
+    RELEASED_DATE = Time.utc(2016, 11, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 6
     MINOR = 1
-    MICRO = 0
+    MICRO = 3
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-context.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  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
@@ -122,6 +123,10 @@ class ContextTest < Test::Unit::TestCase
     assert_boolean(Groonga::Context.default.support_lz4?)
   end
 
+  def test_support_zstd?
+    assert_boolean(Groonga::Context.default.support_zstd?)
+  end
+
   def test_match_escalation_threshold
     assert_equal(0, context.match_escalation_threshold)
     context.match_escalation_threshold = -1