fluent-plugin-droonga 0.8.0 → 0.9.0

data/lib/droonga/plugin/collector/search.rb

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+#
+# 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
+
+require "droonga/plugin/collector/basic"
+
+module Droonga
+  class SearchCollector < BasicCollector
+    repository.register("search", self)
+
+    command :collector_search_gather
+    def collector_search_gather(result)
+      output = body ? body[input_name] : input_name
+      if output.is_a?(Hash)
+        elements = output["elements"]
+        if elements && elements.is_a?(Hash)
+          # phase 1: pre-process
+          elements.each do |element, mapper|
+            case mapper["type"]
+            when "count"
+              result[element] = result[mapper["target"]].size
+            when "sort"
+              # do nothing on this phase!
+            end
+          end
+          # phase 2: post-process
+          elements.each do |element, mapper|
+            if mapper["no_output"]
+              result.delete(element)
+              next
+            end
+
+            case mapper["type"]
+            when "count"
+              # do nothing on this phase!
+            when "sort"
+              # because "count" type mapper requires all items of the array,
+              # I have to apply "sort" type mapper later.
+              if result[element]
+                result[element] = apply_output_range(result[element], mapper)
+                result[element] = apply_output_attributes_and_format(result[element], mapper)
+              end
+            end
+          end
+        end
+        output = output["output"]
+      end
+      emit(output, result)
+    end
+
+    def apply_output_attributes_and_format(items, output)
+      attributes = output["attributes"]
+      if attributes
+        format = output["format"]
+        if format == "complex"
+          items.collect! do |item|
+            complex_item = {}
+            attributes.each_with_index do |label, index|
+              complex_item[label] = item[index]
+            end
+            complex_item
+          end
+        else
+          items.collect! do |item|
+            item[0...attributes.size]
+          end
+        end
+      end
+      items
+    end
+
+    command :collector_search_reduce
+    def collector_search_reduce(request)
+      return unless request
+      body[input_name].each do |output, elements|
+        value = request
+        old_value = output_values[output]
+        value = reduce_elements(elements, old_value, request) if old_value
+        emit(output, value)
+      end
+    end
+
+    def reduce_elements(elements, left_values, right_values)
+      result = {}
+      elements.each do |key, deal|
+        result[key] = reduce(deal, left_values[key], right_values[key])
+      end
+      result
+    end
+  end
+end

data/lib/droonga/plugin/distributor/crud.rb

@@ -39,5 +39,46 @@ module Droonga
       key = message["body"]["key"] || rand.to_s
       scatter_all(message, key)
     end
+
+    private
+    def scatterer(message, key)
+      scatterer = super
+      scatterer["outputs"] << "success"
+      scatterer["outputs"] << "errors"
+      scatterer
+    end
+
+    def reducer(message)
+      reducer = super
+      reducer["body"]["success"] = {
+        "success_reduced" => {
+          "type" => "and",
+        },
+      }
+      reducer["inputs"] << "success"
+      reducer["outputs"] << "success_reduced"
+      reducer["body"]["errors"] = {
+        "errors_reduced" => {
+          "type" => "sum",
+          "limit" => -1,
+        },
+      }
+      reducer["inputs"] << "errors"
+      reducer["outputs"] << "errors_reduced"
+      reducer
+    end
+
+    def gatherer(message)
+      gatherer = super
+      gatherer["body"]["success_reduced"] = {
+        "output" => "success",
+      }
+      gatherer["inputs"] << "success_reduced"
+      gatherer["body"]["errors_reduced"] = {
+        "output" => "errors",
+      }
+      gatherer["inputs"] << "errors_reduced"
+      gatherer
+    end
   end
 end

data/lib/droonga/plugin/distributor/distributed_search_planner.rb

@@ -45,7 +45,7 @@ module Droonga
       end
 
       gatherer = {
-        "type" => "gather",
+        "type" => "search_gather",
         "body" => @output_mappers,
         "inputs" => @output_names, # XXX should be placed in the "body"?
         "post" => true, # XXX should be placed in the "body"?
@@ -96,7 +96,7 @@ module Droonga
       transformer = QueryTransformer.new(query)
 
       reducer = {
-        "type" => "reduce",
+        "type" => "search_reduce",
         "body" => {
           input_name => {
             output_name => transformer.reducers,
@@ -361,8 +361,8 @@ module Droonga
         sort_attributes
       end
 
-      ASCENDING_OPERATOR = "<".freeze
-      DESCENDING_OPERATOR = ">".freeze
+      ASCENDING_OPERATOR = "<"
+      DESCENDING_OPERATOR = ">"
 
       def build_records_reducer
         attributes = @output["attributes"]

data/lib/droonga/plugin/distributor/groonga.rb

@@ -29,9 +29,47 @@ module Droonga
       broadcast_all(message)
     end
 
+    command :table_remove
+    def table_remove(message)
+      unless message["dataset"]
+        raise "dataset must be set. FIXME: This error should return client."
+      end
+      broadcast_all(message)
+    end
+
     command :column_create
     def column_create(message)
       broadcast_all(message)
     end
+
+    private
+    def broadcaster(message)
+      broadcaster = super
+      broadcaster["outputs"] << "result"
+      broadcaster
+    end
+
+    def reducer(message)
+      reducer = super
+      reducer["type"] = "groonga_reduce"
+      reducer["body"]["result"] = {
+        "result_reduced" => {
+          "type" => "groonga_result",
+        },
+      }
+      reducer["inputs"] << "result"
+      reducer["outputs"] << "result_reduced"
+      reducer
+    end
+
+    def gatherer(message)
+      gatherer = super
+      gatherer["type"] = "groonga_gather"
+      gatherer["body"]["result_reduced"] = {
+        "output" => "result",
+      }
+      gatherer["inputs"] << "result_reduced"
+      gatherer
+    end
   end
 end

data/lib/droonga/plugin/handler/add.rb

@@ -59,7 +59,10 @@ module Droonga
 
     command :add
     def add(message, messenger)
-      outputs = process_add(message.request)
+      succeeded = process_add(message.request)
+      outputs = {
+        "success" => succeeded,
+      }
       messenger.emit(outputs)
     end
 

data/lib/droonga/plugin/handler/groonga/column_create.rb

@@ -25,6 +25,13 @@ module Droonga
         command_class = Groonga::Command.find("column_create")
         @command = command_class.new("column_create", request)
 
+        table_name = @command["table"]
+        if table_name.nil? || @context[table_name].nil?
+          raise CommandError.new(:status => Status::INVALID_ARGUMENT,
+                                 :message => "table doesn't exist: <#{table_name.to_s}>",
+                                 :result => false)
+        end
+
         if @command.column_index?
           define_index
         else

data/lib/droonga/plugin/handler/groonga/table_remove.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+#
+# 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
+
+require "groonga"
+require "groonga/command/table-remove"
+
+module Droonga
+  class GroongaHandler
+    class TableRemove < Command
+      def process_request(request)
+        command_class = Groonga::Command.find("table_remove")
+        @command = command_class.new("table_remove", request)
+
+        name = @command["name"]
+        if name.nil? || @context[name].nil?
+          raise CommandError.new(:status => Status::INVALID_ARGUMENT,
+                                 :message => "table not found",
+                                 :result => false)
+        end
+
+        Groonga::Schema.define(:context => @context) do |schema|
+          schema.remove_table(name)
+        end
+        true
+      end
+    end
+  end
+end

data/lib/droonga/plugin/handler/groonga.rb

@@ -26,14 +26,21 @@ module Droonga
     command :table_create
     def table_create(message, messenger)
       command = TableCreate.new(@context)
-      outputs = command.execute(message.request)
+      outputs = format_outputs(command.execute(message.request))
+      messenger.emit(outputs)
+    end
+
+    command :table_remove
+    def table_remove(message, messenger)
+      command = TableRemove.new(@context)
+      outputs = format_outputs(command.execute(message.request))
       messenger.emit(outputs)
     end
 
     command :column_create
     def column_create(message, messenger)
       command = ColumnCreate.new(@context)
-      outputs = command.execute(message.request)
+      outputs = format_outputs(command.execute(message.request))
       messenger.emit(outputs)
     end
 
@@ -41,6 +48,13 @@ module Droonga
       return true
     end
 
+    private
+    def format_outputs(result)
+      {
+        "result" => result,
+      }
+    end
+
     module Status
       SUCCESS          = 0
       INVALID_ARGUMENT = -22
@@ -81,4 +95,5 @@ module Droonga
 end
 
 require "droonga/plugin/handler/groonga/table_create"
+require "droonga/plugin/handler/groonga/table_remove"
 require "droonga/plugin/handler/groonga/column_create"

data/lib/droonga/plugin/handler/watch.rb

@@ -75,13 +75,13 @@ module Droonga
     def feed(message, messenger)
       request = message.request
       @watcher.feed(:targets => request["targets"]) do |route, subscribers|
-        notification_message = {
+        published_message = {
           "to"   => subscribers,
           "body" => request,
         }
-        notification_message = message.raw.merge(notification_message)
-        messenger.forward(notification_message,
-                          "to" => route, "type" => "watch.notification")
+        published_message = message.raw.merge(published_message)
+        messenger.forward(published_message,
+                          "to" => route, "type" => "watch.publish")
       end
     end
 

data/lib/droonga/plugin/input_adapter/crud.rb

@@ -0,0 +1,27 @@
+# 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
+
+require "droonga/input_adapter_plugin"
+
+module Droonga
+  class CRUDInputAdapter < Droonga::InputAdapterPlugin
+    repository.register("crud", self)
+
+    command :add
+    def add(input_message)
+      input_message.add_route("crud_generic_response")
+    end
+  end
+end

data/lib/droonga/plugin/input_adapter/groonga.rb

@@ -1,4 +1,4 @@
-# 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
@@ -28,6 +28,21 @@ module Droonga
       input_message.command = "search"
       input_message.body = search_request
     end
+
+    command :table_create
+    def table_create(input_message)
+      input_message.add_route("groonga_generic_response")
+    end
+
+    command :table_remove
+    def table_remove(input_message)
+      input_message.add_route("groonga_generic_response")
+    end
+
+    command :column_create
+    def column_create(input_message)
+      input_message.add_route("groonga_generic_response")
+    end
   end
 end
 

data/lib/droonga/plugin/output_adapter/crud.rb

@@ -0,0 +1,51 @@
+# 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
+
+require "droonga/output_adapter_plugin"
+
+module Droonga
+  class CRUDOutputAdapter < Droonga::OutputAdapterPlugin
+    repository.register("crud", self)
+
+    command :crud_generic_response
+    def crud_generic_response(output_message)
+      if output_message.body.include?("errors")
+        errors = output_message.body["errors"]
+        if errors && !errors.empty?
+          output_message.errors = errors
+
+          status_codes = []
+          errors.values.each do |error|
+            status_codes << error["statusCode"]
+          end
+          status_codes = status_codes.uniq
+          if status_codes.size == 1
+            output_message.status_code = status_codes.first
+          else
+            output_message.status_code = MessageProcessingError::STATUS_CODE
+          end
+
+          output_message.body = errors.values.first["body"]
+        end
+      end
+      if output_message.body.include?("success")
+        success = output_message.body["success"]
+        unless success.nil?
+          output_message.body = output_message.body["success"]
+        end
+      end
+    end
+  end
+end

data/lib/droonga/plugin/output_adapter/groonga.rb

@@ -1,4 +1,4 @@
-# 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
@@ -24,6 +24,13 @@ module Droonga
       command = Select.new
       output_message.body = command.convert(output_message.body)
     end
+
+    command :groonga_generic_response
+    def groonga_generic_response(output_message)
+      if output_message.body.include?("result")
+        output_message.body = output_message.body["result"]
+      end
+    end
   end
 end
 

data/lib/droonga/plugin.rb

@@ -37,7 +37,7 @@ module Droonga
     rescue => exception
       process_error(command, exception, arguments)
     end
-    
+
     private
     def run_command(command, *arguments)
       __send__(self.class.method_name(command), *arguments)

data/lib/droonga/replier.rb

@@ -15,6 +15,8 @@
 
 module Droonga
   class Replier
+    STATUS_OK = 200
+
     def initialize(forwarder)
       @forwarder = forwarder
     end
@@ -24,10 +26,14 @@ module Droonga
       destination = message["replyTo"]
       reply_message = {
         "inReplyTo"  => message["id"],
-        "statusCode" => message["statusCode"] || 200,
+        "statusCode" => message["statusCode"] || STATUS_OK,
         "type"       => destination["type"],
         "body"       => message["body"],
       }
+      if message.include?("errors")
+        errors = message["errors"]
+        reply_message["errors"] = errors unless errors.empty?
+      end
       @forwarder.forward(reply_message, destination)
       $log.trace("#{log_tag}: reply: done")
     end