fluent-plugin-groonga 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baa35518157dc9bbe01dd3306c3b13976b59bcb1
-  data.tar.gz: 70b51e76ca8903bf1d344319d65618f2edbd2fd3
+  metadata.gz: 2f26f1229bbc925451a26e486e53dded226d90e4
+  data.tar.gz: dedef4594068fddbcda0866e44f1e16ecbb2902c
 SHA512:
-  metadata.gz: 5ea5e5dceabf866dde7a8278cf60e5adca78e93deb8118bfa8a05c742491859499b446f570654011d8efbfbaba73e383fcbdefe3439ed84e1bd3d122fceaf27d
-  data.tar.gz: e2f4a573383da2102b7c19ffe63bd43e90d59fe0446a6bafb32bc4539e10c9b5eaa2e0a8e74c450986aa3475fb0ef686540d46c8cbc4df5b0220985a596ba5ed
+  metadata.gz: 50e0c5d734a4e1d601486ad33814f313363612f9a0e853d4128f41c502d5a38a5fa73183f3c6a64bbda8e4307173e57d1e67506e75115288f1888002f95f97f9
+  data.tar.gz: d203a60ffc2832960b909e89c8106d1d0e038be03681f1c769feed19871d3ba55f6f5dbf3db1aed9a84eedf7631799080ed54283fa06e6f334a9e3baf60994b1

data/doc/text/configuration.md

@@ -50,6 +50,24 @@ Here are available parameters in `source` directive:
 
     * default: `10041`
 
+  * `command_name_position`: It specifies where Groonga command's
+    name.
+
+    If `tag` is specified, the plugin puts Groonga command's name to
+    tag as `groonga.command.#{COMMAND_NAME}` format and record
+    is the arguments of the command.
+
+    If `record` is specified, the plugin puts both Groonga command's
+    name and arguments to record as `{"name": "#{COMMAND_NAME}",
+    "arguments": {...}}` format. Tag is always `groonga.command`.
+
+    `record` is suitable when you want to implement replication. If
+    you `tag` for replication, Groonga command's order may be changed.
+
+    * Available values: `tag`, `record`
+
+    * default: `tag`
+
   * `emit_commands`: TODO
 
 Here is an example:
@@ -65,6 +83,7 @@ Here is an example:
       port 10041
       real_host 192.168.0.1
       real_port 10041
+      command_name_position record
     </source>
 
 ## The `groonga` output plugin

data/doc/text/constitution.md

@@ -66,19 +66,21 @@ Here is an example configuration file:
     # For master Groonga server
     <source>
       @type groonga
-      protocol gqtp          # Or use the below line
+      protocol gqtp                # Or use the below line
       # protocol http
-      bind 127.0.0.1         # For client side Fluentd
-      # bind 192.168.0.1     # For master Groonga server side Fluentd
+      bind 127.0.0.1               # For client side Fluentd
+      # bind 192.168.0.1           # For master Groonga server side Fluentd
       port 10041
-      real_host 192.168.29.1 # IP address of master Groonga server
-      real_port 10041        # Port number of master Groonga server
-      # real_port 20041      # Use different port number
-                             # for master Groonga server side Fluentd
+      real_host 192.168.29.1       # IP address of master Groonga server
+      real_port 10041              # Port number of master Groonga server
+      # real_port 20041            # Use different port number
+                                   # for master Groonga server side Fluentd
+
+      command_name_position record # To keep command order
     </source>
 
     # For slave Groonga server
-    <match groonga.command.*>
+    <match groonga.command.**>
       @type groonga
       protocol gqtp            # Or use the below line
       # protocol http          # You can use different protocol for
@@ -126,7 +128,7 @@ You cannot update data until fluentd is up.
 Here are recover steps when master Groonga server is down:
 
   1. Stop fluentd.
-  2. Run `grndump /PATH/TO/SLAVE/GROONGA/SERVER/DB >
+  2. Run `groonga /PATH/TO/SLAVE/GROONGA/SERVER/DB dump >
      SLAVE_GROONGA_DUMP.grn` on slave Groonga server host.
   3. Run `groonga -n /PATH/TO/MASTER/GROONGA/SERVER/DB <
      SLAVE_GROONGA_DUMP.grn` on master Groonga server.
@@ -139,7 +141,7 @@ You cannot update data until you finish to recover.
 
 Here are recover steps when slave Groonga server is down:
 
-  1. Run `grndump /PATH/TO/MASTER/GROONGA/SERVER/DB >
+  1. Run `groonga /PATH/TO/MASTER/GROONGA/SERVER/DB dump >
      MASTER_GROONGA_DUMP.grn` on master Groonga server host.
   2. Run `groonga -n /PATH/TO/SLAVE/GROONGA/SERVER/DB <
      MASTER_GROONGA_DUMP.grn` on slave Groonga server.
@@ -155,7 +157,7 @@ is full (see `buffer_queue_limit`) or fluentd gives up retrying (see
 Groonga server before those situations:
 
   1. Stop fluentd.
-  2. Run `grndump /PATH/TO/MASTER/GROONGA/SERVER/DB >
+  2. Run `groonga /PATH/TO/MASTER/GROONGA/SERVER/DB dump >
      MASTER_GROONGA_DUMP.grn` on master Groonga server host.
   3. Run `groonga -n /PATH/TO/SLAVE/GROONGA/SERVER/DB <
      MASTER_GROONGA_DUMP.grn` on slave Groonga server host.
@@ -194,19 +196,21 @@ Here is an example configuration file:
     # For master Groonga server
     <source>
       @type groonga
-      protocol gqtp          # Or use the below line
+      protocol gqtp                # Or use the below line
       # protocol http
-      bind 127.0.0.1         # For client side Fluentd
-      # bind 192.168.0.1     # For master Groonga server side Fluentd
+      bind 127.0.0.1               # For client side Fluentd
+      # bind 192.168.0.1           # For master Groonga server side Fluentd
       port 10041
-      real_host 192.168.29.1 # IP address of master Groonga server
-      real_port 10041        # Port number of master Groonga server
-      # real_port 20041      # Use different port number
-                             # for master Groonga server side fluentd
+      real_host 192.168.29.1       # IP address of master Groonga server
+      real_port 10041              # Port number of master Groonga server
+      # real_port 20041            # Use different port number
+                                   # for master Groonga server side fluentd
+
+      command_name_position record # To keep command order
     </source>
 
     # For slave Groonga servers
-    <match groonga.command.*>
+    <match groonga.command.**>
       @type copy
 
       # The first slave Groonga server

data/doc/text/news.md

@@ -2,6 +2,18 @@
 
 # News
 
+## 1.2.3: 2018-01-16
+
+### Improvements
+
+* in: `command_name_position`: Added a new parameter to control
+  command format. The default behavior isn't changed.
+
+### Fixes
+
+* out: Fixed a bug that existing column may be tried to create when
+  Groonga command messages and data load messages are mixed.
+
 ## 1.2.2: 2017-11-22
 
 ### Fixes

data/fluent-plugin-groonga.gemspec

@@ -17,7 +17,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "fluent-plugin-groonga"
-  spec.version = "1.2.2"
+  spec.version = "1.2.3"
   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,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  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
@@ -36,6 +36,7 @@ module Fluent
       end
 
       config_param :protocol, :enum, :list => [:http, :gqtp], :default => :http
+      config_param :command_name_position, :enum, :list => [:tag, :record], :default => :tag
 
       def configure(conf)
         super
@@ -157,9 +158,20 @@ module Fluent
         def emit(command, params)
           normalized_command = command.split(".")[0]
           return unless emit_command?(normalized_command)
-          @input_plugin.router.emit("groonga.command.#{normalized_command}",
+          case @input_plugin.command_name_position
+          when :tag
+            tag = "groonga.command.#{normalized_command}"
+            record = params
+          else
+            tag = "groonga.command"
+            record = {
+              "name" => normalized_command,
+              "arguments" => params
+            }
+          end
+          @input_plugin.router.emit(tag,
                                     Engine.now,
-                                    params)
+                                    record)
         end
 
         def log

data/lib/fluent/plugin/out_groonga.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  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
@@ -314,6 +314,11 @@ module Fluent
           end
         end
 
+        def clear_cache
+          @target_table = nil
+          @columns = nil
+        end
+
         private
         def ensure_table
           return if @target_table
@@ -344,8 +349,7 @@ module Fluent
           @columns = {}
           column_list.each do |column|
             name = column.name
-            vector_p = column.flags.split("|").include?("COLUMN_VECTOR")
-            @columns[name] = Column.new(name, column.range, vector_p)
+            @columns[name] = Column.new(name, column.range, column.vector?)
             ensure_column_indexes(name)
           end
         end
@@ -579,13 +583,27 @@ module Fluent
           records = []
           chunk.msgpack_each do |message|
             tag, _, record = message
-            if /\Agroonga\.command\./ =~ tag
+            name = nil
+            arguments = nil
+            case tag
+            when /\Agroonga\.command\./
               name = $POSTMATCH
+              arguments = record
+            when "groonga.command"
+              name = record["name"]
+              arguments = record["arguments"]
+            end
+
+            if name
               unless records.empty?
                 store_records(records)
                 records.clear
               end
-              @client.execute(name, record)
+              @client.execute(name, arguments)
+              case name
+              when /\A(?:table|column)_(?:create|remove)/
+                @schema.clear_cache
+              end
             else
               records << record
             end

data/sample/command.conf

@@ -4,9 +4,11 @@
 
   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

data/sample/gqtp.conf

@@ -4,9 +4,11 @@
 
   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

data/sample/http.conf

@@ -4,9 +4,11 @@
 
   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

data/test/test_input.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  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
@@ -159,6 +159,69 @@ 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.run do
+            get("/d/table_create", "name" => "Users", "flags" => "TABLE_NO_KEY")
+            assert_equal("200", @last_response.code)
+          end
+          assert_equal([
+                         [
+                           "groonga.command",
+                           @now,
+                           {
+                             "name" => "table_create",
+                             "arguments" => {
+                               "name" => "Users",
+                               "flags" => "TABLE_NO_KEY",
+                             }
+                           },
+                         ]
+                       ],
+                       @driver.events)
+        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.run do
+            post("/d/load", json, "table" => "Users")
+            assert_equal("200", @last_response.code)
+          end
+          assert_equal([
+                         [
+                           "groonga.command",
+                           @now,
+                           {
+                             "name" => "load",
+                             "arguments" => {
+                               "table" => "Users",
+                               "values" => json,
+                             }
+                           },
+                         ]
+                       ],
+                       @driver.events)
+        end
+      end
+    end
+
     private
     def get(path, parameters={})
       http = Net::HTTP.new(@host, @port)

data/test/test_output.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  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
@@ -44,9 +44,10 @@ EOC
   class HTTPTest < self
     setup :before => :append
     def setup_real_server
+      @request_urls = []
       @request_parser = HTTP::Parser.new
       @request_body = ""
-      @response_body = nil
+      @response_bodies = []
 
       @real_host = "127.0.0.1"
       @real_port = 29292
@@ -55,16 +56,15 @@ EOC
         loop do
           response_config = WEBrick::Config::HTTP.dup.update(:Logger => $log)
           real_response = WEBrick::HTTPResponse.new(response_config)
-          request_headers = nil
-          request_body = ""
           client = @real_server.accept
           @request_parser.on_body = lambda do |chunk|
             @request_body << chunk
           end
           @request_parser.on_message_complete = lambda do
-            real_response.body = @response_body
+            real_response.body = @response_bodies.shift
             real_response.send_response(client)
             client.close
+            @request_urls << @request_parser.request_url
           end
 
           loop do
@@ -92,8 +92,8 @@ EOC
     end
 
     class CommandTest < self
-      def test_basic_command
-        @response_body = JSON.generate([[0, 0.0, 0.0], true])
+      def test_command_name_position_tag
+        @response_bodies << JSON.generate([[0, 0.0, 0.0], true])
         driver = create_driver
         time = event_time("2012-10-26T08:45:42Z")
         driver.run(default_tag: "groonga.command.table_create") do
@@ -102,6 +102,23 @@ EOC
         assert_equal("/d/table_create?name=Users",
                      @request_parser.request_url)
       end
+
+      def test_command_name_position_record
+        @response_bodies << JSON.generate([[0, 0.0, 0.0], true])
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run(default_tag: "groonga.command") do
+          driver.feed(time,
+                      {
+                        "name" => "table_create",
+                        "arguments" => {
+                          "name" => "Users",
+                        },
+                      })
+        end
+        assert_equal("/d/table_create?name=Users",
+                     @request_parser.request_url)
+      end
     end
 
     class StoreTest < self
@@ -112,8 +129,126 @@ EOC
         CONFIGURATION
       end
 
+      def table_list_response_body
+        [
+          [
+            [
+              "id",
+              "UInt32"
+            ],
+            [
+              "name",
+              "ShortText"
+            ],
+            [
+              "path",
+              "ShortText"
+            ],
+            [
+              "flags",
+              "ShortText"
+            ],
+            [
+              "domain",
+              "ShortText"
+            ],
+            [
+              "range",
+              "ShortText"
+            ],
+            [
+              "default_tokenizer",
+              "ShortText"
+            ],
+            [
+              "normalizer",
+              "ShortText"
+            ]
+          ],
+          [
+            256,
+            "Logs",
+            "//tmp/db/db.0000100",
+            "TABLE_HASH_KEY|PERSISTENT",
+            "ShortText",
+            nil,
+            nil,
+            nil,
+          ],
+        ]
+      end
+
+      def column_list_response_body
+        [
+          [
+            [
+              "id",
+              "UInt32"
+            ],
+            [
+              "name",
+              "ShortText"
+            ],
+            [
+              "path",
+              "ShortText"
+            ],
+            [
+              "type",
+              "ShortText"
+            ],
+            [
+              "flags",
+              "ShortText"
+            ],
+            [
+              "domain",
+              "ShortText"
+            ],
+            [
+              "range",
+              "ShortText"
+            ],
+            [
+              "source",
+              "ShortText"
+            ]
+          ],
+          [
+            256,
+            "_key",
+            "",
+            "",
+            "COLUMN_SCALAR",
+            "Logs",
+            "ShortText",
+            [
+            ]
+          ],
+          [
+            257,
+            "message",
+            "/tmp/db/db.0000101",
+            "scalar",
+            "COLUMN_SCALAR",
+            "Logs",
+            "ShortText",
+            [
+            ]
+          ],
+        ]
+      end
+
       def test_one_message
-        @response_body = JSON.generate([[0, 0.0, 0.0], [1]])
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            table_list_response_body,
+                                          ])
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            column_list_response_body,
+                                          ])
+        @response_bodies << JSON.generate([[0, 0.0, 0.0], [1]])
         driver = create_driver
         time = event_time("2012-10-26T08:45:42Z")
         driver.run(default_tag: "log") do
@@ -126,7 +261,15 @@ EOC
       end
 
       def test_multiple_messages
-        @response_body = JSON.generate([[0, 0.0, 0.0], [2]])
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            table_list_response_body,
+                                          ])
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            column_list_response_body,
+                                          ])
+        @response_bodies << JSON.generate([[0, 0.0, 0.0], [2]])
         driver = create_driver
         time = event_time("2012-10-26T08:45:42Z")
         driver.run(default_tag: "log") do
@@ -142,6 +285,257 @@ EOC
                      JSON.parse(@request_body))
       end
     end
+
+    class MixTest < self
+      def configuration
+        <<-CONFIGURATION
+          #{super}
+          store_table Logs
+        CONFIGURATION
+      end
+
+
+      def table_list_response_body
+        [
+          [
+            [
+              "id",
+              "UInt32"
+            ],
+            [
+              "name",
+              "ShortText"
+            ],
+            [
+              "path",
+              "ShortText"
+            ],
+            [
+              "flags",
+              "ShortText"
+            ],
+            [
+              "domain",
+              "ShortText"
+            ],
+            [
+              "range",
+              "ShortText"
+            ],
+            [
+              "default_tokenizer",
+              "ShortText"
+            ],
+            [
+              "normalizer",
+              "ShortText"
+            ]
+          ],
+          [
+            256,
+            "Logs",
+            "//tmp/db/db.0000100",
+            "TABLE_HASH_KEY|PERSISTENT",
+            "ShortText",
+            nil,
+            nil,
+            nil,
+          ],
+        ]
+      end
+
+      def column_list_response_body
+        [
+          [
+            [
+              "id",
+              "UInt32"
+            ],
+            [
+              "name",
+              "ShortText"
+            ],
+            [
+              "path",
+              "ShortText"
+            ],
+            [
+              "type",
+              "ShortText"
+            ],
+            [
+              "flags",
+              "ShortText"
+            ],
+            [
+              "domain",
+              "ShortText"
+            ],
+            [
+              "range",
+              "ShortText"
+            ],
+            [
+              "source",
+              "ShortText"
+            ]
+          ],
+          [
+            256,
+            "_key",
+            "",
+            "",
+            "COLUMN_SCALAR",
+            "Logs",
+            "ShortText",
+            [
+            ]
+          ],
+          [
+            257,
+            "message",
+            "/tmp/db/db.0000101",
+            "scalar",
+            "COLUMN_SCALAR",
+            "Logs",
+            "ShortText",
+            [
+            ]
+          ],
+        ]
+      end
+
+      def test_command_name_position_record
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            table_list_response_body,
+                                          ])
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            column_list_response_body,
+                                          ])
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run do
+          @response_bodies << JSON.generate([[0, 0.0, 0.0], 2])
+          driver.feed("log", time + 0, {"message" => "message1"})
+          driver.feed("log", time + 1, {"message" => "message2"})
+
+          @response_bodies << JSON.generate([[0, 0.0, 0.0], true])
+          driver.feed("groonga.command",
+                      time + 2,
+                      {
+                        "name" => "column_create",
+                        "arguments" => {
+                          "table" => "Logs",
+                          "name" => "new_column",
+                          "flags" => "COLUMN_SCALAR",
+                          "type" => "ShortText",
+                        },
+                      })
+
+          @response_bodies << JSON.generate([
+                                              [0, 0.0, 0.0],
+                                              table_list_response_body,
+                                            ])
+          new_column_list_response_body = column_list_response_body
+          new_column_list_response_body << [
+            258,
+            "new_column",
+            "/tmp/db/db.0000102",
+            "scalar",
+            "COLUMN_SCALAR",
+              "Logs",
+            "ShortText",
+            [
+            ],
+          ]
+          @response_bodies << JSON.generate([
+                                              [0, 0.0, 0.0],
+                                              new_column_list_response_body,
+                                            ])
+          @response_bodies << JSON.generate([[0, 0.0, 0.0], 2])
+          driver.feed("log", time + 3,
+                      {"message" => "message3", "new_column" => "value1"})
+          driver.feed("log", time + 4,
+                      {"message" => "message4", "new_column" => "value2"})
+        end
+        assert_equal([
+                       "/d/table_list",
+                       "/d/column_list?table=Logs",
+                       "/d/load?table=Logs",
+                       "/d/column_create?flags=COLUMN_SCALAR&name=new_column&table=Logs&type=ShortText",
+                       "/d/table_list",
+                       "/d/column_list?table=Logs",
+                       "/d/load?table=Logs",
+                     ],
+                     @request_urls)
+      end
+
+      def test_command_name_position_tag
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            table_list_response_body,
+                                          ])
+        @response_bodies << JSON.generate([
+                                            [0, 0.0, 0.0],
+                                            column_list_response_body,
+                                          ])
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run do
+          @response_bodies << JSON.generate([[0, 0.0, 0.0], 2])
+          driver.feed("log", time + 0, {"message" => "message1"})
+          driver.feed("log", time + 1, {"message" => "message2"})
+
+          @response_bodies << JSON.generate([[0, 0.0, 0.0], true])
+          driver.feed("groonga.command.column_create",
+                      time + 2,
+                      {
+                        "table" => "Logs",
+                        "name" => "new_column",
+                        "flags" => "COLUMN_SCALAR",
+                        "type" => "ShortText",
+                      })
+
+          @response_bodies << JSON.generate([
+                                              [0, 0.0, 0.0],
+                                              table_list_response_body,
+                                            ])
+          new_column_list_response_body = column_list_response_body
+          new_column_list_response_body << [
+            258,
+            "new_column",
+            "/tmp/db/db.0000102",
+            "scalar",
+            "COLUMN_SCALAR",
+              "Logs",
+            "ShortText",
+            [
+            ],
+          ]
+          @response_bodies << JSON.generate([
+                                              [0, 0.0, 0.0],
+                                              new_column_list_response_body,
+                                            ])
+          @response_bodies << JSON.generate([[0, 0.0, 0.0], 2])
+          driver.feed("log", time + 3,
+                      {"message" => "message3", "new_column" => "value1"})
+          driver.feed("log", time + 4,
+                      {"message" => "message4", "new_column" => "value2"})
+        end
+        assert_equal([
+                       "/d/table_list",
+                       "/d/column_list?table=Logs",
+                       "/d/load?table=Logs",
+                       "/d/column_create?flags=COLUMN_SCALAR&name=new_column&table=Logs&type=ShortText",
+                       "/d/table_list",
+                       "/d/column_list?table=Logs",
+                       "/d/load?table=Logs",
+                     ],
+                     @request_urls)
+      end
+    end
   end
 
   class CommandLineTest < self
@@ -227,7 +621,7 @@ EOC
     end
 
     class CommandTest < self
-      def test_basic_command
+      def test_command_name_position_tag
         driver = create_driver
         time = event_time("2012-10-26T08:45:42Z")
         driver.run(default_tag: "groonga.command.table_create") do
@@ -246,6 +640,32 @@ EOC
                        actual_input,
                      ])
       end
+
+      def test_command_name_position_record
+        driver = create_driver
+        time = event_time("2012-10-26T08:45:42Z")
+        driver.run(default_tag: "groonga.command") do
+          driver.feed(time,
+                      {
+                        "name" => "table_create",
+                        "arguments" => {
+                          "name" => "Users",
+                        },
+                      })
+        end
+        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
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groonga
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -192,9 +192,9 @@ specification_version: 4
 summary: Fluentd plugin to store data into Groonga and implement Groonga replication
   system.
 test_files:
-- 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/run-test.rb
 - test/output/test_table_definition.rb
+- test/output/test_type_guesser.rb
+- test/output/test_table_index_definition.rb
+- test/test_input.rb