fluent-plugin-groonga 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6b4e7487748c2f6c1afd542bcc01b28cae47d5
-  data.tar.gz: 7a84873889cb7b1fa6a48d6e7335f314c4f8756f
+  metadata.gz: 1d63f8c4f3214cc7b8c43876faadcb3be1aae8bf
+  data.tar.gz: 0ffcbf7f152c8824991d50616cb277ec88396ac7
 SHA512:
-  metadata.gz: 6c6d1479f6d93ac5eab837923878e3ae973c77700d461b787bb44e0f86048bf93b7900c7651302f830e6fb497afcfa7c28c0af95813bd4f0eb1cf553514e8e15
-  data.tar.gz: 0615408e6acc183ae5d7de3cd2e2ea51e445b2988c83766985230951dcff6a37350733bfd8d12bcc61e2227b41c45ec1b6eb234225cc957bbe45f1f3cb9169d4
+  metadata.gz: 6e91d9055541ceb9ca4adf8a695f3f6752400860c9bd765647a841c378e1e885037db339356758993604ec7a60b3a40af66252ff0d8eecde7c5c714546c1984e
+  data.tar.gz: 4d83595cf18cfc73fb60332ba235e5f38814df328cb2c9c624bafc69596c3bdb9d7052db2e364163d1108cf1a2fdddd499d24bac9845018b1ff5f330da377e4a

data/doc/text/news.md

@@ -2,9 +2,17 @@
 
 # News
 
+## 1.1.0: 2016-01-24
+
+### Improvements
+
+* out: Stopped to try to create pseudo columns such as `_key`.
+* out: Supported boolean value.
+* in: Supported `plugin_register` and `plugin_unregister`.
+
 ## 1.0.9: 2014-11-20
 
-### Improves
+### Improvements
 
 * out: Added log message with host, port and command name on Groonga
   command execution error.

data/fluent-plugin-groonga.gemspec

@@ -17,7 +17,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "fluent-plugin-groonga"
-  spec.version = "1.0.9"
+  spec.version = "1.1.0"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]
   spec.summary = "Fluentd plugin to store data into Groonga and implement Groonga replication system."

data/lib/fluent/plugin/in_groonga.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -87,6 +87,7 @@ module Fluent
         /\Atable_/,
         /\Acolumn_/,
         "delete",
+        /\Aplugin_/,
         "register",
         "truncate",
         "load",

data/lib/fluent/plugin/out_groonga.rb

@@ -296,6 +296,7 @@ module Fluent
         nonexistent_columns = {}
         records.each do |record|
           record.each do |key, value|
+            next if pseudo_column_name?(key)
             column = @columns[key]
             if column.nil?
               nonexistent_columns[key] ||= []
@@ -345,6 +346,10 @@ module Fluent
         end
       end
 
+      def pseudo_column_name?(name)
+        name.start_with?("_")
+      end
+
       def create_column(name, sample_values)
         mapping = @mappings.find do |mapping|
           mapping.name == name
@@ -403,6 +408,7 @@ module Fluent
         end
 
         def guess
+          return "Bool"          if bool_values?
           return "Time"          if time_values?
           return "Int32"         if int32_values?
           return "Int64"         if int64_values?
@@ -437,6 +443,18 @@ module Fluent
           end
         end
 
+        BOOL_VALUES = [
+          true,
+          false,
+          "true",
+          "false",
+        ]
+        def bool_values?
+          @sample_values.all? do |sample_value|
+            BOOL_VALUES.include?(sample_value)
+          end
+        end
+
         def time_values?
           now = Time.now.to_i
           year_in_seconds = 365 * 24 * 60 * 60

data/sample/store-syslog.conf

@@ -1,5 +1,4 @@
 # Required plugins:
-#  * fluent-plugin-config-expander
 #  * fluent-plugin-forest
 #  * fluent-plugin-parser
 #  * fluent-plugin-record-reformer
@@ -10,14 +9,11 @@
 </source>
 
 <source>
-  type config_expander
-  <config>
-    type tail
-    path /var/log/messages
-    pos_file /var/log/td-agent/messages.pos
-    tag raw.messages.log.${hostname}
-    format none
-  </config>
+  type tail
+  path /var/log/messages
+  pos_file /var/log/td-agent/messages.pos
+  tag "raw.messages.log.#{Socket.gethostname}"
+  format none
 </source>
 
 <match raw.*.log.**>
@@ -66,12 +62,28 @@
     normalizer NormalizerAuto
   </table>
 
+  <table>
+    name Hosts
+    flags TABLE_PAT_KEY
+    key_type ShortText
+    # normalizer NormalizerAuto
+  </table>
+
   <table>
     name Timestamps
     flags TABLE_PAT_KEY
     key_type Time
   </table>
 
+  <mapping>
+    name host
+    type Hosts
+    <index>
+      table Hosts
+      name logs_index
+    </index>
+  </mapping>
+
   <mapping>
     name timestamp
     type Time

data/test/output/test_type_guesser.rb

@@ -22,6 +22,20 @@ class OutputTypeGuesserTest < Test::Unit::TestCase
       guesser.guess
     end
 
+    sub_test_case "Bool" do
+      test "true" do
+        assert_equal("Bool", guess([true]))
+      end
+
+      test "false" do
+        assert_equal("Bool", guess([false]))
+      end
+
+      test "string" do
+        assert_equal("Bool", guess(["true", "false"]))
+      end
+    end
+
     sub_test_case "Time" do
       test "now" do
         now = Time.now.to_i

data/test/test_input.rb

@@ -27,7 +27,7 @@ require "fluent/plugin/in_groonga"
 require "http_parser"
 
 class GroongaInputTest < Test::Unit::TestCase
-  setup
+  setup :before => :append
   def setup_fluent
     Fluent::Test.setup
     @now = Time.parse("2012-10-26T08:45:42Z").to_i

data/test/test_output.rb

@@ -27,7 +27,7 @@ require "fluent/plugin/out_groonga"
 require "http_parser"
 
 class GroongaOutputTest < Test::Unit::TestCase
-  setup
+  setup :before => :append
   def setup_fluent
     Fluent::Test.setup
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groonga
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -186,15 +186,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to store data into Groonga and implement Groonga replication
   system.
 test_files:
-- test/test_output.rb
 - test/test_input.rb
 - test/run-test.rb
+- test/test_output.rb
 - test/output/test_table_index_definition.rb
 - test/output/test_type_guesser.rb
 - test/output/test_table_definition.rb