fluent-plugin-droonga 0.9.0 → 0.9.9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-droonga
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.9
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -181,8 +181,7 @@ dependencies:
 description: Droonga(distributed Groonga) plugin for Fluent event collector
 email:
 - droonga@groonga.org
-executables:
-- grn2jsons
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -199,21 +198,23 @@ files:
 - benchmark/watch/benchmark-notify.sh
 - benchmark/watch/benchmark-publish.rb
 - benchmark/watch/benchmark-scan.rb
-- bin/grn2jsons
 - doc/text/news.md
 - fluent-plugin-droonga.gemspec
+- lib/droonga/adapter.rb
+- lib/droonga/adapter_runner.rb
 - lib/droonga/catalog.rb
 - lib/droonga/catalog/base.rb
+- lib/droonga/catalog/dataset.rb
 - lib/droonga/catalog/version1.rb
 - lib/droonga/catalog_loader.rb
 - lib/droonga/catalog_observer.rb
 - lib/droonga/collector.rb
 - lib/droonga/collector_plugin.rb
-- lib/droonga/command_mapper.rb
+- lib/droonga/command.rb
+- lib/droonga/command_repository.rb
 - lib/droonga/dispatcher.rb
-- lib/droonga/distribution_planner.rb
+- lib/droonga/distributed_command_planner.rb
 - lib/droonga/distributor.rb
-- lib/droonga/distributor_plugin.rb
 - lib/droonga/engine.rb
 - lib/droonga/event_loop.rb
 - lib/droonga/farm.rb
@@ -223,65 +224,70 @@ files:
 - lib/droonga/handler_message.rb
 - lib/droonga/handler_messenger.rb
 - lib/droonga/handler_plugin.rb
-- lib/droonga/input_adapter.rb
-- lib/droonga/input_adapter_plugin.rb
+- lib/droonga/handler_runner.rb
 - lib/droonga/input_message.rb
+- lib/droonga/legacy_pluggable.rb
+- lib/droonga/legacy_plugin.rb
+- lib/droonga/legacy_plugin_repository.rb
 - lib/droonga/logger.rb
+- lib/droonga/message_matcher.rb
 - lib/droonga/message_pack_packer.rb
 - lib/droonga/message_processing_error.rb
 - lib/droonga/message_pusher.rb
 - lib/droonga/message_receiver.rb
-- lib/droonga/output_adapter.rb
-- lib/droonga/output_adapter_plugin.rb
 - lib/droonga/output_message.rb
 - lib/droonga/partition.rb
+- lib/droonga/planner.rb
+- lib/droonga/planner_plugin.rb
 - lib/droonga/pluggable.rb
 - lib/droonga/plugin.rb
 - lib/droonga/plugin/collector/basic.rb
-- lib/droonga/plugin/collector/groonga.rb
 - lib/droonga/plugin/collector/search.rb
-- lib/droonga/plugin/distributor/crud.rb
-- lib/droonga/plugin/distributor/distributed_search_planner.rb
-- lib/droonga/plugin/distributor/groonga.rb
-- lib/droonga/plugin/distributor/search.rb
-- lib/droonga/plugin/distributor/watch.rb
-- lib/droonga/plugin/handler/add.rb
-- lib/droonga/plugin/handler/forward.rb
-- lib/droonga/plugin/handler/groonga.rb
-- lib/droonga/plugin/handler/groonga/column_create.rb
-- lib/droonga/plugin/handler/groonga/table_create.rb
-- lib/droonga/plugin/handler/groonga/table_remove.rb
-- lib/droonga/plugin/handler/search.rb
-- lib/droonga/plugin/handler/watch.rb
-- lib/droonga/plugin/input_adapter/crud.rb
-- lib/droonga/plugin/input_adapter/groonga.rb
-- lib/droonga/plugin/input_adapter/groonga/select.rb
-- lib/droonga/plugin/output_adapter/crud.rb
-- lib/droonga/plugin/output_adapter/groonga.rb
-- lib/droonga/plugin/output_adapter/groonga/select.rb
+- lib/droonga/plugin/metadata/adapter_message.rb
+- lib/droonga/plugin/metadata/handler_action.rb
+- lib/droonga/plugin/metadata/input_message.rb
+- lib/droonga/plugin/planner/crud.rb
+- lib/droonga/plugin/planner/distributed_search_planner.rb
+- lib/droonga/plugin/planner/groonga.rb
+- lib/droonga/plugin/planner/search.rb
+- lib/droonga/plugin/planner/watch.rb
 - lib/droonga/plugin_loader.rb
 - lib/droonga/plugin_registerable.rb
-- lib/droonga/plugin_repository.rb
+- lib/droonga/plugin_registry.rb
+- lib/droonga/plugins/crud.rb
+- lib/droonga/plugins/error.rb
+- lib/droonga/plugins/groonga.rb
+- lib/droonga/plugins/groonga/column_create.rb
+- lib/droonga/plugins/groonga/generic_command.rb
+- lib/droonga/plugins/groonga/generic_response.rb
+- lib/droonga/plugins/groonga/select.rb
+- lib/droonga/plugins/groonga/table_create.rb
+- lib/droonga/plugins/groonga/table_remove.rb
+- lib/droonga/plugins/search.rb
+- lib/droonga/plugins/watch.rb
 - lib/droonga/processor.rb
 - lib/droonga/replier.rb
 - lib/droonga/searcher.rb
+- lib/droonga/searcher/mecab_filter.rb
 - lib/droonga/server.rb
 - lib/droonga/session.rb
 - lib/droonga/sweeper.rb
 - lib/droonga/test.rb
-- lib/droonga/test/stub_distributor.rb
 - lib/droonga/test/stub_handler.rb
 - lib/droonga/test/stub_handler_message.rb
 - lib/droonga/test/stub_handler_messenger.rb
+- lib/droonga/test/stub_planner.rb
 - lib/droonga/time_formatter.rb
 - lib/droonga/watch_schema.rb
 - lib/droonga/watcher.rb
 - lib/droonga/worker.rb
 - lib/fluent/plugin/out_droonga.rb
-- lib/groonga_command_converter.rb
 - sample/cluster/catalog.json
 - sample/cluster/fluentd.conf
-- sample/fluentd.conf
+- sample/mecab_filter/data.grn
+- sample/mecab_filter/ddl.grn
+- sample/mecab_filter/search_with_mecab_filter.json
+- sample/mecab_filter/search_without_mecab_filter.json
 - test/command/config/default/catalog.json
 - test/command/config/default/fluentd.conf
 - test/command/fixture/documents.jsons
@@ -347,6 +353,8 @@ files:
 - test/command/suite/search/error/deeply-cyclic-source.test
 - test/command/suite/search/error/missing-source-parameter.expected
 - test/command/suite/search/error/missing-source-parameter.test
+- test/command/suite/search/error/no-query.expected
+- test/command/suite/search/error/no-query.test
 - test/command/suite/search/error/unknown-source.expected
 - test/command/suite/search/error/unknown-source.test
 - test/command/suite/search/group/count.expected
@@ -386,6 +394,7 @@ files:
 - test/performance/watch/feed.json
 - test/performance/watch/fluentd.conf
 - test/performance/watch/subscribe.json
+- test/unit/catalog/test_dataset.rb
 - test/unit/catalog/test_version1.rb
 - test/unit/fixtures/array.grn
 - test/unit/fixtures/catalog/version1.json
@@ -393,6 +402,7 @@ files:
 - test/unit/fixtures/reference/array.grn
 - test/unit/fixtures/reference/hash.grn
 - test/unit/helper.rb
+- test/unit/helper/distributed_search_planner_helper.rb
 - test/unit/helper/fixture.rb
 - test/unit/helper/plugin_helper.rb
 - test/unit/helper/sandbox.rb
@@ -400,24 +410,27 @@ files:
 - test/unit/helper/watch_helper.rb
 - test/unit/plugin/collector/test_basic.rb
 - test/unit/plugin/collector/test_search.rb
-- test/unit/plugin/distributor/test_search.rb
-- test/unit/plugin/distributor/test_search_planner.rb
-- test/unit/plugin/handler/groonga/test_column_create.rb
-- test/unit/plugin/handler/groonga/test_table_create.rb
-- test/unit/plugin/handler/groonga/test_table_remove.rb
-- test/unit/plugin/handler/test_add.rb
-- test/unit/plugin/handler/test_groonga.rb
-- test/unit/plugin/handler/test_search.rb
-- test/unit/plugin/handler/test_watch.rb
-- test/unit/plugin/input_adapter/groonga/test_select.rb
-- test/unit/plugin/output_adapter/groonga/test_select.rb
+- test/unit/plugin/planner/search_planner/test_basic.rb
+- test/unit/plugin/planner/search_planner/test_group_by.rb
+- test/unit/plugin/planner/search_planner/test_output.rb
+- test/unit/plugin/planner/search_planner/test_sort_by.rb
+- test/unit/plugin/planner/test_search.rb
+- test/unit/plugins/crud/test_add.rb
+- test/unit/plugins/groonga/select/test_adapter_input.rb
+- test/unit/plugins/groonga/select/test_adapter_output.rb
+- test/unit/plugins/groonga/test_column_create.rb
+- test/unit/plugins/groonga/test_table_create.rb
+- test/unit/plugins/groonga/test_table_remove.rb
+- test/unit/plugins/test_groonga.rb
+- test/unit/plugins/test_search.rb
+- test/unit/plugins/test_watch.rb
 - test/unit/run-test.rb
-- test/unit/test_command_mapper.rb
-- test/unit/test_groonga_command_converter.rb
+- test/unit/test_command_repository.rb
+- test/unit/test_legacy_plugin.rb
+- test/unit/test_legacy_plugin_repository.rb
+- test/unit/test_message_matcher.rb
 - test/unit/test_message_pack_packer.rb
 - test/unit/test_output.rb
-- test/unit/test_plugin.rb
-- test/unit/test_plugin_repository.rb
 - test/unit/test_sweeper.rb
 - test/unit/test_time_formatter.rb
 - test/unit/test_watch_schema.rb
@@ -511,6 +524,8 @@ test_files:
 - test/command/suite/search/error/deeply-cyclic-source.test
 - test/command/suite/search/error/missing-source-parameter.expected
 - test/command/suite/search/error/missing-source-parameter.test
+- test/command/suite/search/error/no-query.expected
+- test/command/suite/search/error/no-query.test
 - test/command/suite/search/error/unknown-source.expected
 - test/command/suite/search/error/unknown-source.test
 - test/command/suite/search/group/count.expected
@@ -550,6 +565,7 @@ test_files:
 - test/performance/watch/feed.json
 - test/performance/watch/fluentd.conf
 - test/performance/watch/subscribe.json
+- test/unit/catalog/test_dataset.rb
 - test/unit/catalog/test_version1.rb
 - test/unit/fixtures/array.grn
 - test/unit/fixtures/catalog/version1.json
@@ -557,6 +573,7 @@ test_files:
 - test/unit/fixtures/reference/array.grn
 - test/unit/fixtures/reference/hash.grn
 - test/unit/helper.rb
+- test/unit/helper/distributed_search_planner_helper.rb
 - test/unit/helper/fixture.rb
 - test/unit/helper/plugin_helper.rb
 - test/unit/helper/sandbox.rb
@@ -564,24 +581,27 @@ test_files:
 - test/unit/helper/watch_helper.rb
 - test/unit/plugin/collector/test_basic.rb
 - test/unit/plugin/collector/test_search.rb
-- test/unit/plugin/distributor/test_search.rb
-- test/unit/plugin/distributor/test_search_planner.rb
-- test/unit/plugin/handler/groonga/test_column_create.rb
-- test/unit/plugin/handler/groonga/test_table_create.rb
-- test/unit/plugin/handler/groonga/test_table_remove.rb
-- test/unit/plugin/handler/test_add.rb
-- test/unit/plugin/handler/test_groonga.rb
-- test/unit/plugin/handler/test_search.rb
-- test/unit/plugin/handler/test_watch.rb
-- test/unit/plugin/input_adapter/groonga/test_select.rb
-- test/unit/plugin/output_adapter/groonga/test_select.rb
+- test/unit/plugin/planner/search_planner/test_basic.rb
+- test/unit/plugin/planner/search_planner/test_group_by.rb
+- test/unit/plugin/planner/search_planner/test_output.rb
+- test/unit/plugin/planner/search_planner/test_sort_by.rb
+- test/unit/plugin/planner/test_search.rb
+- test/unit/plugins/crud/test_add.rb
+- test/unit/plugins/groonga/select/test_adapter_input.rb
+- test/unit/plugins/groonga/select/test_adapter_output.rb
+- test/unit/plugins/groonga/test_column_create.rb
+- test/unit/plugins/groonga/test_table_create.rb
+- test/unit/plugins/groonga/test_table_remove.rb
+- test/unit/plugins/test_groonga.rb
+- test/unit/plugins/test_search.rb
+- test/unit/plugins/test_watch.rb
 - test/unit/run-test.rb
-- test/unit/test_command_mapper.rb
-- test/unit/test_groonga_command_converter.rb
+- test/unit/test_command_repository.rb
+- test/unit/test_legacy_plugin.rb
+- test/unit/test_legacy_plugin_repository.rb
+- test/unit/test_message_matcher.rb
 - test/unit/test_message_pack_packer.rb
 - test/unit/test_output.rb
-- test/unit/test_plugin.rb
-- test/unit/test_plugin_repository.rb
 - test/unit/test_sweeper.rb
 - test/unit/test_time_formatter.rb
 - test/unit/test_watch_schema.rb

data/bin/grn2jsons

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 Droonga Project
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-require "groonga_command_converter"
-require "json"
-require "ostruct"
-require "optparse"
-
-options = OpenStruct.new
-option_parser = OptionParser.new do |parser|
-  parser.on("-i=ID", "--id=ID",
-            "base id. (optional)") do |id|
-    options.id = id
-  end
-
-  parser.on("-d=DATE", "--date=DATE",
-            "date. (optional)") do |date|
-    options.date = date
-  end
-
-  parser.on("-r=REPLYTO", "--reply-to=REPLYTO",
-            "value of replyTo field.") do |reply_to|
-    options.reply_to = reply_to
-  end
-
-  parser.on("-s=DATASET", "--dataset=DATASET",
-            "dataset.") do |dataset|
-    options.dataset = dataset
-  end
-end
-args = option_parser.parse!(ARGV)
-
-if options.dataset.nil?
-  raise "You must specify the name of the dataset by --dataset option."
-end
-
-convert_options = {
-  :id => options.id,
-  :date => options.date,
-  :reply_to => options.reply_to,
-  :dataset => options.dataset,
-}
-converter = Droonga::GroongaCommandConverter.new(convert_options)
-
-source_file = args[0]
-result_file = args[1]
-
-input = nil
-if source_file.nil?
-  input = STDIN.read
-else
-  input = File.read(source_file)
-end
-
-result_file = args[1]
-
-if result_file.nil?
-  converter.convert(input) do |command|
-    puts(JSON.generate(command))
-  end
-else
-  File.open("w", result_file) do |file|
-    converter.convert(input) do |command|
-      file.puts(JSON.generate(command))
-    end
-  end
-end

data/lib/droonga/distribution_planner.rb

@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 Droonga Project
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-require "tsort"
-
-module Droonga
-  class DistributionPlanner
-    class UndefinedInputError < StandardError
-      attr_reader :input
-      def initialize(input)
-        @input = input
-        super("undefined input assigned: <#{input}>")
-      end
-    end
-
-    class CyclicComponentsError < StandardError
-      attr_reader :components
-      def initialize(components)
-        @components = components
-        super("cyclic components found: <#{components}>")
-      end
-    end
-
-    include TSort
-
-    def initialize(dispatcher, components)
-      @dispatcher = dispatcher
-      @components = components
-    end
-
-    def plan
-      @dependency = {}
-      @components.each do |component|
-        @dependency[component] = component["inputs"]
-        next unless component["outputs"]
-        component["outputs"].each do |output|
-          @dependency[output] = [component]
-        end
-      end
-      components = []
-      each_strongly_connected_component do |cs|
-        raise CyclicComponentsError.new(cs) if cs.size > 1
-        components.concat(cs) unless cs.first.is_a? String
-      end
-      components
-    end
-
-    private
-    def tsort_each_node(&block)
-      @dependency.each_key(&block)
-    end
-
-    def tsort_each_child(node, &block)
-      if node.is_a? String and @dependency[node].nil?
-        raise UndefinedInputError.new(node)
-      end
-      if @dependency[node]
-        @dependency[node].each(&block)
-      end
-    end
-  end
-end

data/lib/droonga/distributor_plugin.rb

@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 Droonga Project
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-require "droonga/plugin"
-
-module Droonga
-  class DistributorPlugin < Plugin
-    extend PluginRegisterable
-
-    def initialize(distributor)
-      super()
-      @distributor = distributor
-    end
-
-    def distribute(message)
-      @distributor.distribute(message)
-    end
-
-    def scatter_all(message, key)
-      messages = [reducer(message), gatherer(message), scatterer(message, key)]
-      distribute(messages)
-    end
-
-    def broadcast_all(message)
-      messages = [reducer(message), gatherer(message), broadcaster(message)]
-      distribute(messages)
-    end
-
-    private
-    def process_error(command, error, arguments)
-      if error.is_a?(MessageProcessingError)
-        raise error
-      else
-        super
-      end
-    end
-
-    def scatterer(message, key)
-      {
-        "command" => message["type"],
-        "dataset" => message["dataset"],
-        "body"    => message["body"],
-        "key"     => key,
-        "type"    => "scatter",
-        "outputs" => [],
-        "replica" => "all",
-        "post"    => true
-      }
-    end
-
-    def broadcaster(message)
-      {
-        "command" => message["type"],
-        "dataset" => message["dataset"],
-        "body"    => message["body"],
-        "type"    => "broadcast",
-        "outputs" => [],
-        "replica" => "all",
-        "post"    => true
-      }
-    end
-
-    def reducer(message)
-      {
-        "type"    => "reduce",
-        "body"    => {},
-        "inputs"  => [],
-        "outputs" => [],
-      }
-    end
-
-    def gatherer(message)
-      {
-        "type"   => "gather",
-        "body"   => {},
-        "inputs" => [],
-        "post"   => true,
-      }
-    end
-  end
-end