fluent-plugin-droonga 0.9.9 → 1.0.0

data/test/unit/test_output.rb

@@ -60,6 +60,10 @@ module OutputStub
       @engine = Engine.new(@response)
     end
 
+    def shutdown
+      @engine.shutdown
+    end
+
     def create_logger(tag, options)
       Logger.new(tag, options)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-droonga
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -178,13 +178,14 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Droonga(distributed Groonga) plugin for Fluent event collector
+description: Droonga (distributed Groonga) plugin for Fluent event collector
 email:
 - droonga@groonga.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .dir-locals.el
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -202,20 +203,27 @@ files:
 - 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/errors.rb
+- lib/droonga/catalog/schema.rb
 - lib/droonga/catalog/version1.rb
+- lib/droonga/catalog/version2.rb
 - lib/droonga/catalog_loader.rb
 - lib/droonga/catalog_observer.rb
 - lib/droonga/collector.rb
-- lib/droonga/collector_plugin.rb
-- lib/droonga/command.rb
-- lib/droonga/command_repository.rb
+- lib/droonga/collector_message.rb
+- lib/droonga/collector_runner.rb
+- lib/droonga/collectors.rb
+- lib/droonga/collectors/add.rb
+- lib/droonga/collectors/and.rb
+- lib/droonga/collectors/sum.rb
 - lib/droonga/dispatcher.rb
 - lib/droonga/distributed_command_planner.rb
 - lib/droonga/distributor.rb
 - lib/droonga/engine.rb
+- lib/droonga/error.rb
+- lib/droonga/error_messages.rb
 - lib/droonga/event_loop.rb
 - lib/droonga/farm.rb
 - lib/droonga/fluent_message_sender.rb
@@ -223,37 +231,26 @@ files:
 - lib/droonga/handler.rb
 - lib/droonga/handler_message.rb
 - lib/droonga/handler_messenger.rb
-- lib/droonga/handler_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/loggable.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_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/search.rb
-- lib/droonga/plugin/metadata/adapter_message.rb
+- lib/droonga/plugin/metadata/adapter_input_message.rb
+- lib/droonga/plugin/metadata/adapter_output_message.rb
+- lib/droonga/plugin/metadata/collector_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_registry.rb
+- lib/droonga/plugins/basic.rb
 - lib/droonga/plugins/crud.rb
 - lib/droonga/plugins/error.rb
 - lib/droonga/plugins/groonga.rb
@@ -264,13 +261,20 @@ files:
 - lib/droonga/plugins/groonga/table_create.rb
 - lib/droonga/plugins/groonga/table_remove.rb
 - lib/droonga/plugins/search.rb
+- lib/droonga/plugins/search/distributed_search_planner.rb
 - lib/droonga/plugins/watch.rb
 - lib/droonga/processor.rb
+- lib/droonga/reducer.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/single_step.rb
+- lib/droonga/single_step_definition.rb
+- lib/droonga/slice.rb
+- lib/droonga/status_code.rb
+- lib/droonga/step_runner.rb
 - lib/droonga/sweeper.rb
 - lib/droonga/test.rb
 - lib/droonga/test/stub_handler.rb
@@ -290,6 +294,8 @@ files:
 - sample/mecab_filter/search_without_mecab_filter.json
 - test/command/config/default/catalog.json
 - test/command/config/default/fluentd.conf
+- test/command/config/version1/catalog.json
+- test/command/config/version1/fluentd.conf
 - test/command/fixture/documents.jsons
 - test/command/fixture/event.jsons
 - test/command/fixture/user-table-array.jsons
@@ -331,10 +337,10 @@ files:
 - test/command/suite/groonga/table_remove/unknown-table.test
 - test/command/suite/message/error/missing-dataset.expected
 - test/command/suite/message/error/missing-dataset.test
-- test/command/suite/message/error/unknown-command.expected
-- test/command/suite/message/error/unknown-command.test
 - test/command/suite/message/error/unknown-dataset.expected
 - test/command/suite/message/error/unknown-dataset.test
+- test/command/suite/message/error/unknown-type.expected
+- test/command/suite/message/error/unknown-type.test
 - test/command/suite/search/attributes/array.expected
 - test/command/suite/search/attributes/array.test
 - test/command/suite/search/attributes/hash.expected
@@ -395,9 +401,12 @@ files:
 - test/performance/watch/fluentd.conf
 - test/performance/watch/subscribe.json
 - test/unit/catalog/test_dataset.rb
+- test/unit/catalog/test_schema.rb
 - test/unit/catalog/test_version1.rb
+- test/unit/catalog/test_version2.rb
 - test/unit/fixtures/array.grn
 - test/unit/fixtures/catalog/version1.json
+- test/unit/fixtures/catalog/version2.json
 - test/unit/fixtures/document.grn
 - test/unit/fixtures/reference/array.grn
 - test/unit/fixtures/reference/hash.grn
@@ -408,26 +417,23 @@ files:
 - test/unit/helper/sandbox.rb
 - test/unit/helper/stub_worker.rb
 - test/unit/helper/watch_helper.rb
-- test/unit/plugin/collector/test_basic.rb
-- test/unit/plugin/collector/test_search.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/search/planner/test_basic.rb
+- test/unit/plugins/search/planner/test_group_by.rb
+- test/unit/plugins/search/planner/test_output.rb
+- test/unit/plugins/search/planner/test_sort_by.rb
+- test/unit/plugins/search/test_collector.rb
+- test/unit/plugins/search/test_handler.rb
+- test/unit/plugins/search/test_planner.rb
+- test/unit/plugins/test_basic.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_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
@@ -457,10 +463,12 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Droonga(distributed Groonga) plugin for Fluent event collector
+summary: Droonga (distributed Groonga) plugin for Fluent event collector
 test_files:
 - test/command/config/default/catalog.json
 - test/command/config/default/fluentd.conf
+- test/command/config/version1/catalog.json
+- test/command/config/version1/fluentd.conf
 - test/command/fixture/documents.jsons
 - test/command/fixture/event.jsons
 - test/command/fixture/user-table-array.jsons
@@ -502,10 +510,10 @@ test_files:
 - test/command/suite/groonga/table_remove/unknown-table.test
 - test/command/suite/message/error/missing-dataset.expected
 - test/command/suite/message/error/missing-dataset.test
-- test/command/suite/message/error/unknown-command.expected
-- test/command/suite/message/error/unknown-command.test
 - test/command/suite/message/error/unknown-dataset.expected
 - test/command/suite/message/error/unknown-dataset.test
+- test/command/suite/message/error/unknown-type.expected
+- test/command/suite/message/error/unknown-type.test
 - test/command/suite/search/attributes/array.expected
 - test/command/suite/search/attributes/array.test
 - test/command/suite/search/attributes/hash.expected
@@ -566,9 +574,12 @@ test_files:
 - test/performance/watch/fluentd.conf
 - test/performance/watch/subscribe.json
 - test/unit/catalog/test_dataset.rb
+- test/unit/catalog/test_schema.rb
 - test/unit/catalog/test_version1.rb
+- test/unit/catalog/test_version2.rb
 - test/unit/fixtures/array.grn
 - test/unit/fixtures/catalog/version1.json
+- test/unit/fixtures/catalog/version2.json
 - test/unit/fixtures/document.grn
 - test/unit/fixtures/reference/array.grn
 - test/unit/fixtures/reference/hash.grn
@@ -579,26 +590,23 @@ test_files:
 - test/unit/helper/sandbox.rb
 - test/unit/helper/stub_worker.rb
 - test/unit/helper/watch_helper.rb
-- test/unit/plugin/collector/test_basic.rb
-- test/unit/plugin/collector/test_search.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/search/planner/test_basic.rb
+- test/unit/plugins/search/planner/test_group_by.rb
+- test/unit/plugins/search/planner/test_output.rb
+- test/unit/plugins/search/planner/test_sort_by.rb
+- test/unit/plugins/search/test_collector.rb
+- test/unit/plugins/search/test_handler.rb
+- test/unit/plugins/search/test_planner.rb
+- test/unit/plugins/test_basic.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_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

data/lib/droonga/collector_plugin.rb

@@ -1,50 +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/legacy_plugin"
-
-module Droonga
-  class CollectorPlugin < LegacyPlugin
-    extend PluginRegisterable
-
-    attr_reader :task, :input_name, :step, :output_values, :body, :output_names
-    def initialize
-      super()
-    end
-
-    def process(command, message)
-      return false unless message.is_a? Hash
-      @task = message["task"]
-      return false unless @task.is_a? Hash
-      @step = @task["step"]
-      return false unless @step.is_a? Hash
-      @output_values = @task["values"]
-      @body = @step["body"]
-      @output_names = @step["outputs"]
-      @id = message["id"]
-      @value = message["value"]
-      @input_name = message["name"]
-      super(command, @value)
-      true
-    end
-
-    # TODO: consider better name
-    def emit(name, value)
-      @output_values[name] = value
-    end
-  end
-end

data/lib/droonga/legacy_pluggable.rb

@@ -1,66 +0,0 @@
-# Copyright (C) 2013-2014 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
-
-module Droonga
-  module LegacyPluggable
-    class UnknownPlugin < StandardError
-      attr_reader :command
-
-      def initialize(command)
-        @command = command
-      end
-    end
-
-    def shutdown
-      $log.trace("#{log_tag}: shutdown: plugin: start")
-      @plugins.each do |plugin|
-        plugin.shutdown
-      end
-      $log.trace("#{log_tag}: shutdown: plugin: done")
-    end
-
-    def processable?(command)
-      not find_plugin(command).nil?
-    end
-
-    def process(command, *arguments)
-      plugin = find_plugin(command)
-      $log.trace("#{log_tag}: process: start: <#{command}>",
-                 :plugin => plugin.class)
-      raise UnknownPlugin.new(command) if plugin.nil?
-      result = plugin.process(command, *arguments)
-      $log.trace("#{log_tag}: process: done: <#{command}>",
-                 :plugin => plugin.class)
-      result
-    end
-
-    private
-    def load_plugins(names)
-      @plugins = names.collect do |name|
-        plugin = instantiate_plugin(name)
-        if plugin.nil?
-          raise "unknown plugin: <#{name}>: TODO: improve error handling"
-        end
-        plugin
-      end
-    end
-
-    def find_plugin(command)
-      @plugins.find do |plugin|
-        plugin.processable?(command)
-      end
-    end
-  end
-end

data/lib/droonga/legacy_plugin.rb

@@ -1,57 +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_registerable"
-
-module Droonga
-  class LegacyPlugin
-    def initialize
-    end
-
-    def start
-    end
-
-    def shutdown
-    end
-
-    def processable?(command)
-      self.class.processable?(command)
-    end
-
-    def process(command, *arguments)
-      run_command(command, *arguments)
-    rescue => exception
-      process_error(command, exception, arguments)
-    end
-
-    private
-    def run_command(command, *arguments)
-      if command.is_a?(Command)
-        method_name = command.method_name
-      else
-        method_name = self.class.method_name(command)
-      end
-      __send__(method_name, *arguments)
-    end
-
-    def process_error(command, error, arguments)
-      Logger.error("error while processing: <#{command}>",
-                   error,
-                   :arguments => arguments)
-    end
-  end
-end