fluent-plugin-groonga 1.1.8 → 1.2.0

data/sample/command.conf

@@ -4,13 +4,14 @@
 
   real_host 127.0.0.1
   real_port 20041
-
-#  command_name_position record
 </source>
 
-<match groonga.command.**>
+<match groonga.command.*>
   @type groonga
   protocol command
   database /tmp/groonga/db
-  flush_interval 1
+
+  <buffer>
+    flush_interval 1
+  </buffer>
 </match>

data/sample/gqtp.conf

@@ -4,14 +4,15 @@
 
   real_host 127.0.0.1
   real_port 20043
-
-#  command_name_position record
 </source>
 
-<match groonga.command.**>
+<match groonga.command.*>
   @type groonga
   protocol gqtp
   host 127.0.0.1
   port 30043
-  flush_interval 1
+
+  <buffer>
+    flush_interval 1
+  </buffer>
 </match>

data/sample/http.conf

@@ -4,14 +4,15 @@
 
   real_host 127.0.0.1
   real_port 20041
-
-#  command_name_position record
 </source>
 
-<match groonga.command.**>
+<match groonga.command.*>
   @type groonga
   protocol http
   host 127.0.0.1
   port 30041
-  flush_interval 1
+
+  <buffer>
+    flush_interval 1
+  </buffer>
 </match>

data/sample/store-apache.conf

@@ -42,9 +42,11 @@
   protocol http
   host 127.0.0.1
 
-  buffer_type file
-  buffer_path /tmp/buffer
-  flush_interval 1
+  <buffer>
+    @type file
+    path /tmp/buffer
+    flush_interval 1
+  <buffer>
 
   <table>
     name Codes

data/sample/store-syslog.conf

@@ -51,9 +51,11 @@
   protocol http
   host 127.0.0.1
 
-  buffer_type file
-  buffer_path /var/spool/td-agent/buffer/groonga
-  flush_interval 1
+  <buffer>
+    @type file
+    path /var/spool/td-agent/buffer/groonga
+    flush_interval 1
+  </buffer>
 
   <table>
     name Terms

data/sample/store.conf

@@ -9,7 +9,9 @@
   protocol http
   host 127.0.0.1
 
-  buffer_type file
-  buffer_path /tmp/buffer
-  flush_interval 1
+  <buffer>
+    @type file
+    path /tmp/buffer
+    flush_interval 1
+  <buffer>
 </match>

data/test/output/test_table_definition.rb

@@ -17,7 +17,7 @@ require "fluent/plugin/out_groonga"
 
 class OutputTypeTableDefinitionTest < Test::Unit::TestCase
   def definition(raw={})
-    Fluent::GroongaOutput::TableDefinition.new(raw)
+    Fluent::Plugin::GroongaOutput::TableDefinition.new(raw)
   end
 
   sub_test_case "readers" do

data/test/output/test_table_index_definition.rb

@@ -21,7 +21,7 @@ class OutputTypeTableIndexDefinitionTest < Test::Unit::TestCase
       :name              => "Terms",
       :default_tokenizer => "TokenBigram",
     }
-    Fluent::GroongaOutput::TableDefinition.new(raw)
+    Fluent::Plugin::GroongaOutput::TableDefinition.new(raw)
   end
 
   def definition(raw={})
@@ -29,7 +29,7 @@ class OutputTypeTableIndexDefinitionTest < Test::Unit::TestCase
       :source_columns => "title",
     }
     raw = default_raw.merge(raw)
-    Fluent::GroongaOutput::TableDefinition::IndexDefinition.new(table_definition,
+    Fluent::Plugin::GroongaOutput::TableDefinition::IndexDefinition.new(table_definition,
                                                                 raw)
   end
 

data/test/output/test_type_guesser.rb

@@ -18,7 +18,7 @@ require "fluent/plugin/out_groonga"
 class OutputTypeGuesserTest < Test::Unit::TestCase
   sub_test_case "#guess" do
     def guess(sample_values)
-      guesser = Fluent::GroongaOutput::Schema::TypeGuesser.new(sample_values)
+      guesser = Fluent::Plugin::GroongaOutput::Schema::TypeGuesser.new(sample_values)
       guesser.guess
     end
 

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  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
@@ -31,6 +31,9 @@ Test::Unit::Priority.enable
 $LOAD_PATH.unshift(lib_dir)
 
 require "fluent/test"
+require "fluent/test/helpers"
+
+include Fluent::Test::Helpers
 
 ENV["TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE"] ||= "5000"
 

data/test/test_input.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2018  Yasuhiro Horimoto <horimoto@clear-code.com>
 # Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -22,22 +19,21 @@ require "net/http"
 require "webrick/config"
 require "webrick/httpresponse"
 
-require "fluent/test"
-require "fluent/plugin/in_groonga"
+require "fluent/test/driver/input"
 
-require "http_parser"
+require "fluent/plugin/in_groonga"
 
 class GroongaInputTest < Test::Unit::TestCase
   setup :before => :append
   def setup_fluent
     Fluent::Test.setup
-    @now = Time.parse("2012-10-26T08:45:42Z").to_i
+    @now = event_time("2012-10-26T08:45:42Z")
     Fluent::Engine.now = @now
   end
 
   private
   def create_driver
-    driver = Fluent::Test::InputTestDriver.new(Fluent::GroongaInput)
+    driver = Fluent::Test::Driver::Input.new(Fluent::Plugin::GroongaInput)
     driver.configure(configuration)
     driver
   end
@@ -104,16 +100,21 @@ EOC
     def test_target_command
       @real_response["Content-Type"] = "application/json"
       @real_response.body = JSON.generate([[0, 0.0, 0.0], true])
-      @driver.expect_emit("groonga.command.table_create",
-                          @now,
-                          {
-                            "name" => "Users",
-                            "flags" => "TABLE_NO_KEY",
-                          })
       @driver.run do
         get("/d/table_create", "name" => "Users", "flags" => "TABLE_NO_KEY")
         assert_equal("200", @last_response.code)
       end
+      assert_equal([
+                     [
+                       "groonga.command.table_create",
+                       @now,
+                       {
+                         "name" => "Users",
+                         "flags" => "TABLE_NO_KEY",
+                       },
+                     ]
+                   ],
+                   @driver.events)
     end
 
     def test_not_target_command
@@ -121,7 +122,7 @@ EOC
         get("/d/status")
         assert_equal("200", @last_response.code)
       end
-      assert_empty(@driver.emits)
+      assert_empty(@driver.events)
     end
 
     def test_load
@@ -133,17 +134,21 @@ EOC
 {"name": "Bob"}
 ]
 EOJ
-      @driver.expect_emit("groonga.command.load",
-                          @now,
-                          {
-                            "table" => "Users",
-                            "values" => json,
-                          })
-
       @driver.run do
         post("/d/load", json, "table" => "Users")
         assert_equal("200", @last_response.code)
       end
+      assert_equal([
+                     [
+                       "groonga.command.load",
+                       @now,
+                       {
+                         "table" => "Users",
+                         "values" => json,
+                       },
+                     ],
+                   ],
+                   @driver.events)
     end
 
     def test_not_command
@@ -154,59 +159,6 @@ EOJ
       end
     end
 
-    sub_test_case("command_name_position") do
-      sub_test_case("record") do
-        def configuration
-          <<-CONFIGURATION
-            #{super}
-            command_name_position record
-          CONFIGURATION
-        end
-
-        def test_not_load
-          @real_response["Content-Type"] = "application/json"
-          @real_response.body = JSON.generate([[0, 0.0, 0.0], true])
-          @driver.expect_emit("groonga.command",
-                              @now,
-                              {
-                                "name" => "table_create",
-                                "arguments" => {
-                                  "name" => "Users",
-                                  "flags" => "TABLE_NO_KEY",
-                                }
-                              })
-          @driver.run do
-            get("/d/table_create", "name" => "Users", "flags" => "TABLE_NO_KEY")
-            assert_equal("200", @last_response.code)
-          end
-       end
-
-        def test_load
-          @real_response["Content-Type"] = "application/json"
-          @real_response.body = JSON.generate([[0, 0.0, 0.0], true])
-          json = <<-JSON
-[
-{"name": "Alice"},
-{"name": "Bob"}
-]
-          JSON
-          @driver.expect_emit("groonga.command",
-                      @now,
-                      {
-                        "name" => "load",
-                        "arguments" => {
-                          "table" => "Users",
-                          "values" => json,
-                        }
-                      })
-          @driver.run do
-            post("/d/load", json, "table" => "Users")
-            assert_equal("200", @last_response.code)
-          end
-        end
-      end
-    end
-
     private
     def get(path, parameters={})
       http = Net::HTTP.new(@host, @port)

data/test/test_output.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2018  Yasuhiro Horimoto <horimoto@clear-code.com>
 # Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -22,10 +19,9 @@ require "net/http"
 require "webrick/config"
 require "webrick/httpresponse"
 
-require "fluent/test"
-require "fluent/plugin/out_groonga"
+require "fluent/test/driver/output"
 
-require "http_parser"
+require "fluent/plugin/out_groonga"
 
 class GroongaOutputTest < Test::Unit::TestCase
   setup :before => :append
@@ -34,9 +30,8 @@ class GroongaOutputTest < Test::Unit::TestCase
   end
 
   private
-  def create_driver(tag)
-    driver = Fluent::Test::BufferedOutputTestDriver.new(Fluent::GroongaOutput,
-                                                        tag)
+  def create_driver
+    driver = Fluent::Test::Driver::Output.new(Fluent::Plugin::GroongaOutput)
     driver.configure(configuration)
     driver
   end
@@ -97,27 +92,13 @@ EOC
     end
 
     class CommandTest < self
-      def test_command_name_position_tag
+      def test_basic_command
         @response_body = JSON.generate([[0, 0.0, 0.0], true])
-        driver = create_driver("groonga.command.table_create")
-        time = Time.parse("2012-10-26T08:45:42Z").to_i
-        driver.emit({"name" => "Users"}, time)
-        driver.run
-        assert_equal("/d/table_create?name=Users",
-                     @request_parser.request_url)
-      end
-
-      def test_command_name_position_record
-        @response_body = JSON.generate([[0, 0.0, 0.0], true])
-        driver = create_driver("groonga.command")
-        time = Time.parse("2012-10-26T08:45:42Z").to_i
-        driver.emit({
-                      "name" => "table_create",
-                      "arguments" => {
-                        "name" => "Users"
-                      }
-                    }, time)
-        driver.run
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run(default_tag: "groonga.command.table_create") do
+          driver.feed(time, {"name" => "Users"})
+        end
         assert_equal("/d/table_create?name=Users",
                      @request_parser.request_url)
       end
@@ -133,10 +114,11 @@ EOC
 
       def test_one_message
         @response_body = JSON.generate([[0, 0.0, 0.0], [1]])
-        driver = create_driver("log")
-        time = Time.parse("2012-10-26T08:45:42Z").to_i
-        driver.emit({"message" => "1st message"}, time)
-        driver.run
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run(default_tag: "log") do
+          driver.feed(time, {"message" => "1st message"})
+        end
         assert_equal("/d/load?table=Logs",
                      @request_parser.request_url)
         assert_equal([{"message" => "1st message"}],
@@ -145,11 +127,12 @@ EOC
 
       def test_multiple_messages
         @response_body = JSON.generate([[0, 0.0, 0.0], [2]])
-        driver = create_driver("log")
-        time = Time.parse("2012-10-26T08:45:42Z").to_i
-        driver.emit({"message" => "1st message"}, time)
-        driver.emit({"message" => "2nd message"}, time + 1)
-        driver.run
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run(default_tag: "log") do
+          driver.feed(time, {"message" => "1st message"})
+          driver.feed(time + 1, {"message" => "2nd message"})
+        end
         assert_equal("/d/load?table=Logs",
                      @request_parser.request_url)
         assert_equal([
@@ -244,33 +227,12 @@ EOC
     end
 
     class CommandTest < self
-      def test_command_name_position_tag
-        driver = create_driver("groonga.command.table_create")
-        time = Time.parse("2012-10-26T08:45:42Z").to_i
-        driver.emit({"name" => "Users"}, time)
-        driver.run
-        assert_equal([
-                       [
-                         "--input-fd", actual_input_fd,
-                         "--output-fd", actual_output_fd,
-                         "-n", @database_path,
-                       ],
-                       "/d/table_create?name=Users\n",
-                     ],
-                     [
-                       actual_command_line,
-                       actual_input,
-                     ])
-      end
-
-      def test_command_name_position_record
-        driver = create_driver("groonga.command")
-        time = Time.parse("2012-10-26T08:45:42Z").to_i
-        driver.emit({
-                      "name" => "table_create",
-                      "arguments" => {"name" => "Users"}
-                    }, time)
-        driver.run
+      def test_basic_command
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run(default_tag: "groonga.command.table_create") do
+          driver.feed(time, {"name" => "Users"})
+        end
         assert_equal([
                        [
                          "--input-fd", actual_input_fd,