fluent-plugin-droonga 0.9.9 → 1.0.0

data/lib/droonga/logger.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 Droonga Project
+# 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
@@ -16,20 +16,61 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module Droonga
-  module Logger
-    module_function
-    def info(message)
-      if $log
-        $log.info(message)
-      end
-    end
-
-    def error(message, exception, additional_information={})
-      if $log
-        $log.error("#{message}: #{exception.message}(#{exception.class})",
-                   additional_information)
-        $log.error_backtrace(exception.backtrace)
-      end
+  class << self
+    def logger
+      @logger ||= Logger.new
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+  end
+
+  class Logger
+    def initialize(options={})
+      @output = Fluent::PluginLogger.new($log)
+      depth_offset = options[:depth_offset] || 0
+      @output.instance_variable_set(:@depth_offset, 4 + depth_offset)
+      @tag = options[:tag]
+    end
+
+    def level
+      @output.level
+    end
+
+    def trace(message, data={})
+      log(:trace, message, data)
+    end
+
+    def debug(message, data={})
+      log(:debug, message, data)
+    end
+
+    def info(message, data={})
+      log(:info, message, data)
+    end
+
+    def warn(message, data={})
+      log(:warn, message, data)
+    end
+
+    def error(message, data={})
+      log(:error, message, data)
+    end
+
+    def exception(message, exception, data={})
+      log(:error,
+          "#{message}: #{exception.message}(#{exception.class})",
+          data)
+      @output.error_backtrace(exception.backtrace)
+    end
+
+    private
+    def log(level, message, data)
+      message = "#{@tag}: #{message}" if @tag
+      arguments = [message]
+      arguments << data unless data.empty?
+      @output.send(level, *arguments)
     end
   end
 end

data/lib/droonga/message_matcher.rb

@@ -18,13 +18,13 @@ module Droonga
   #
   # It provides the small language. Here is the pattern syntax.
   #
-  #   * PATTERN = [TARGET_PATH, OPERATOR, ARGUMENTS*]
+  #   * PATTERN = [TARGET_PATH, OPERATOR, ARGUMENT*]
   #   * PATTERN = [PATTERN, LOGICAL_OPERATOR, PATTERN]
   #   * TARGET_PATH = "COMPONENT(.COMPONENT)*"
-  #   * OPERATOR = :equal, :in, :include?, :exist?
+  #   * OPERATOR = :equal, :in, :include, :exist, :start_with
   #                (More operators may be added in the future.
-  #                 For example, :start_with and so on.)
-  #   * ARGUMENTS = OBJECT_DEFINED_IN_JSON*
+  #                 For example, :end_with and so on.)
+  #   * ARGUMENT = OBJECT_DEFINED_IN_JSON
   #   * LOGICAL_OPERATOR = :or (:add will be added.)
   #
   # For example:
@@ -86,15 +86,20 @@ module Droonga
         arguments.any? do |argument|
           argument.include?(target)
         end
-      when :include?
+      when :include
         return false unless target.respond_to?(:include?)
         arguments.any? do |argument|
           target.include?(argument)
         end
-      when :exist?
+      when :exist
         target != NONEXISTENT_PATH
+      when :start_with
+        return false unless target.respond_to?(:start_with?)
+        arguments.any? do |argument|
+          target.start_with?(argument)
+        end
       else
-        raise ArgumentError, "Unknown operator"
+        raise ArgumentError, "Unknown operator: <#{operator}>"
       end
     end
   end

data/lib/droonga/message_pusher.rb

@@ -17,8 +17,12 @@
 
 require "msgpack"
 
+require "droonga/logger"
+
 module Droonga
   class MessagePusher
+    include Loggable
+
     attr_reader :raw_receiver
     def initialize(loop)
       @loop = loop
@@ -32,15 +36,15 @@ module Droonga
     end
 
     def shutdown
-      $log.trace("#{log_tag}: shutdown: start")
+      logger.trace("shutdown: start")
       socket_path = @raw_receiver.path
       @raw_receiver.close
       FileUtils.rm_f(socket_path)
-      $log.trace("#{log_tag}: shutdown: done")
+      logger.trace("shutdown: done")
     end
 
     def push(message)
-      $log.trace("#{log_tag}: push: start")
+      logger.trace("push: start")
       packed_message = message.to_msgpack
       path = @raw_receiver.path
       sender = Coolio::UNIXSocket.connect(path)
@@ -49,7 +53,7 @@ module Droonga
         close
       end
       @loop.attach(sender)
-      $log.trace("#{log_tag}: push: done")
+      logger.trace("push: done")
     end
 
     private

data/lib/droonga/message_receiver.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 Droonga Project
+# 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
@@ -17,8 +15,12 @@
 
 require "msgpack"
 
+require "droonga/loggable"
+
 module Droonga
   class MessageReceiver
+    include Loggable
+
     def initialize(loop, receiver, &callback)
       @loop = loop
       @receiver = Coolio::Server.new(receiver, Coolio::Socket) do |connection|
@@ -28,26 +30,26 @@ module Droonga
     end
 
     def start
-      $log.trace("#{log_tag}: start: start")
+      logger.trace("start: start")
       @loop.attach(@receiver)
-      $log.trace("#{log_tag}: start: done")
+      logger.trace("start: done")
     end
 
     def shutdown
-      $log.trace("#{log_tag}: shutdown: start")
+      logger.trace("shutdown: start")
       @receiver.close
-      $log.trace("#{log_tag}: shutdown: done")
+      logger.trace("shutdown: done")
     end
 
     private
     def setup_receive_handler(connection)
       unpacker = MessagePack::Unpacker.new
       on_read = lambda do |data|
-        $log.trace("#{log_tag}: on_read: start")
+        logger.trace("on_read: start")
         unpacker.feed_each(data) do |message|
           @callback.call(message)
         end
-        $log.trace("#{log_tag}: on_read: done")
+        logger.trace("on_read: done")
       end
       connection.on_read do |data|
         on_read.call(data)

data/lib/droonga/output_message.rb

@@ -13,6 +13,8 @@
 # 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/status_code"
+
 module Droonga
   class OutputMessage
     def initialize(raw_message)

data/lib/droonga/planner.rb

@@ -13,25 +13,36 @@
 # 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_pluggable"
-require "droonga/planner_plugin"
+require "droonga/loggable"
+require "droonga/distributed_command_planner"
+require "droonga/error_messages"
 
 module Droonga
   class Planner
-    include LegacyPluggable
+    include Loggable
+    include ErrorMessages
 
-    def initialize(dispatcher, plugins)
-      @dispatcher = dispatcher
-      load_plugins(plugins)
+    def initialize
+    end
+
+    def plan(message)
+      raise NotImplemented, "#{self.class.name}\##{__method__} must implement."
     end
 
     private
-    def instantiate_plugin(name)
-      PlannerPlugin.repository.instantiate(name, self)
+    def scatter(message, options={})
+      planner = DistributedCommandPlanner.new(message)
+      planner.scatter
+      planner.key = options[:key]
+      planner.reduce(options[:reduce])
+      planner.plan
     end
 
-    def log_tag
-      "[#{Process.pid}] planner"
+    def broadcast(message, options={})
+      planner = DistributedCommandPlanner.new(message)
+      planner.broadcast(:write => options[:write])
+      planner.reduce(options[:reduce])
+      planner.plan
     end
   end
 end

data/lib/droonga/plugin.rb

@@ -14,8 +14,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require "droonga/plugin_registry"
+require "droonga/single_step_definition"
 require "droonga/adapter"
+require "droonga/planner"
 require "droonga/handler"
+require "droonga/collectors"
 
 module Droonga
   module Plugin
@@ -24,5 +27,17 @@ module Droonga
         @@registry ||= PluginRegistry.new
       end
     end
+
+    def register(name)
+      Plugin.registry.register(name, self)
+    end
+
+    def define_single_step(&block)
+      single_step_definitions << SingleStepDefinition.new(self, &block)
+    end
+
+    def single_step_definitions
+      @single_step_definitions ||= []
+    end
   end
 end

data/lib/droonga/plugin/metadata/{adapter_message.rb → adapter_input_message.rb}

@@ -16,30 +16,22 @@
 module Droonga
   module Plugin
     module Metadata
-      class AdapterMessage
+      class AdapterInputMessage
         def initialize(adapter_class)
           @adapter_class = adapter_class
         end
 
-        def input_pattern
-          configuration[:input_pattern]
+        def pattern
+          configuration[:pattern]
         end
 
-        def input_pattern=(pattern)
-          configuration[:input_pattern] = pattern
-        end
-
-        def output_pattern
-          configuration[:output_pattern]
-        end
-
-        def output_pattern=(pattern)
-          configuration[:output_pattern] = pattern
+        def pattern=(pattern)
+          configuration[:pattern] = pattern
         end
 
         private
         def configuration
-          @adapter_class.options[:message] ||= {}
+          @adapter_class.options[:input_message] ||= {}
         end
       end
     end

data/lib/droonga/plugin/metadata/adapter_output_message.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 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 Plugin
+    module Metadata
+      class AdapterOutputMessage
+        def initialize(adapter_class)
+          @adapter_class = adapter_class
+        end
+
+        def pattern
+          configuration[:pattern]
+        end
+
+        def pattern=(pattern)
+          configuration[:pattern] = pattern
+        end
+
+        private
+        def configuration
+          @adapter_class.options[:output_message] ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/droonga/plugin/metadata/collector_message.rb

@@ -0,0 +1,39 @@
+# Copyright (C) 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 Plugin
+    module Metadata
+      class CollectorMessage
+        def initialize(plugin_class)
+          @plugin_class = plugin_class
+        end
+
+        def pattern
+          configuration[:pattern]
+        end
+
+        def pattern=(pattern)
+          configuration[:pattern] = pattern
+        end
+
+        private
+        def configuration
+          @plugin_class.options[:message] ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/droonga/plugin/metadata/input_message.rb

@@ -17,6 +17,19 @@ module Droonga
   module Plugin
     module Metadata
       class InputMessage
+        class NotStringMessageType < Error
+          def initialize(type)
+            super("You must specify a string as a message type. " +
+                    "#{type.inspect} is not a string.")
+          end
+        end
+
+        class BlankMessageType < Error
+          def initialize
+            super("You must specify a non-empty string as a message type.")
+          end
+        end
+
         def initialize(plugin_class)
           @plugin_class = plugin_class
         end
@@ -26,6 +39,8 @@ module Droonga
         end
 
         def type=(type)
+          raise NotStringMessageType.new(type) unless type.is_a?(String)
+          raise BlankMessageType.new if type.empty?
           configuration[:type] = type
         end