fluent-plugin-droonga 0.9.0 → 0.9.9

data/lib/droonga/plugin/{handler/search.rb → metadata/handler_action.rb}

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 Droonga Project
+# 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
@@ -15,21 +13,27 @@
 # 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/handler_plugin"
-require "droonga/searcher"
-
 module Droonga
-  class SearchHandler < Droonga::HandlerPlugin
-    repository.register("search", self)
+  module Plugin
+    module Metadata
+      class HandlerAction
+        def initialize(handler_class)
+          @handler_class = handler_class
+        end
+
+        def synchronous?
+          configuration[:synchronous]
+        end
+
+        def synchronous=(boolean)
+          configuration[:synchronous] = boolean
+        end
 
-    command :search
-    def search(message, messenger)
-      searcher = Droonga::Searcher.new(@context)
-      values = {}
-      searcher.search(message.request["queries"]).each do |output, value|
-        values[output] = value
+        private
+        def configuration
+          @handler_class.options[:action] ||= {}
+        end
       end
-      messenger.emit(values)
     end
   end
 end

data/lib/droonga/plugin/metadata/input_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 InputMessage
+        def initialize(plugin_class)
+          @plugin_class = plugin_class
+        end
+
+        def type
+          configuration[:type]
+        end
+
+        def type=(type)
+          configuration[:type] = type
+        end
+
+        private
+        def configuration
+          @plugin_class.options[:message] ||= {}
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# -*- 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/planner_plugin"
+
+module Droonga
+  class CRUDPlanner < Droonga::PlannerPlugin
+    repository.register("crud", self)
+
+    command :add
+    def add(message)
+      scatter(message)
+    end
+
+    command :update
+    def update(message)
+      scatter(message)
+    end
+
+    # TODO: What is this?
+    command :reset
+    def reset(message)
+      scatter(message)
+    end
+
+    private
+    def scatter(message)
+      super(message,
+            :key => message["body"]["key"] || rand.to_s,
+            :reduce => {
+              "success" => "and"
+            })
+    end
+  end
+end

data/lib/droonga/plugin/{distributor → planner}/distributed_search_planner.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
@@ -15,27 +15,24 @@
 # 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
-  class DistributedSearchPlanner
-    attr_reader :messages
+require "droonga/searcher"
+require "droonga/distributed_command_planner"
 
+module Droonga
+  class DistributedSearchPlanner < DistributedCommandPlanner
     def initialize(search_request_message)
-      @source_message = search_request_message
-      @request = @source_message["body"]
-      @queries = @request["queries"]
+      super
 
-      @input_names = []
-      @output_names = []
-      @output_mappers = {}
-      @messages = []
+      @request = @source_message["body"]
+      raise NoQuery.new unless @request
 
-      build_messages
+      @request = Marshal.load(Marshal.dump(@request))
+      @queries = @request["queries"]
     end
 
-    private
-    UNLIMITED = -1
+    def plan
+      raise Searcher::NoQuery.new if @queries.nil? || @queries.empty?
 
-    def build_messages
       Searcher::QuerySorter.validate_dependencies(@queries)
 
       ensure_unifiable!
@@ -44,22 +41,21 @@ module Droonga
         transform_query(input_name, query)
       end
 
-      gatherer = {
-        "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"?
-      }
-      @messages << gatherer
-      searcher = {
-        "type" => "broadcast",
-        "command" => "search", # XXX should be placed in the "body"?
-        "dataset" => @source_message["dataset"] || @request["dataset"],
-        "body" => @request,
-        "outputs" => @input_names, # XXX should be placed in the "body"?
-        "replica" => "random", # XXX should be placed in the "body"?
-      }
-      @messages.push(searcher)
+      @dataset = @source_message["dataset"] || @request["dataset"]
+      broadcast(:body => @request)
+      
+      super
+    end
+
+    private
+    UNLIMITED = -1
+
+    def reduce_command
+      "search_reduce"
+    end
+
+    def gather_command
+      "search_gather"
     end
 
     def ensure_unifiable!
@@ -89,28 +85,13 @@ module Droonga
         return
       end
 
-      @input_names << input_name
-      output_name = input_name + "_reduced"
-      @output_names << output_name
-
       transformer = QueryTransformer.new(query)
 
-      reducer = {
-        "type" => "search_reduce",
-        "body" => {
-          input_name => {
-            output_name => transformer.reducers,
-          },
-        },
-        "inputs" => [input_name], # XXX should be placed in the "body"?
-        "outputs" => [output_name], # XXX should be placed in the "body"?
-      }
-      @messages << reducer
-
-      @output_mappers[output_name] = {
-        "output" => input_name,
-        "elements" => transformer.mappers,
-      }
+      elements = transformer.mappers
+      mapper = {}
+      mapper["elements"] = elements unless elements.empty?
+      reduce(input_name => { :reduce => transformer.reducers,
+                             :gather => mapper })
     end
 
     class QueryTransformer
@@ -130,7 +111,9 @@ module Droonga
         # So we have to override the format and restore it on the gathering
         # phase.
         @records_format = @output["format"] || "simple"
-        @output["format"] = "simple"
+        if @output["format"] && @output["format"] != "simple"
+          @output["format"] = "simple"
+        end
 
         @sort_keys = @query["sortBy"] || []
         @sort_keys = @sort_keys["keys"] || [] if @sort_keys.is_a?(Hash)
@@ -163,13 +146,22 @@ module Droonga
         @records_offset = final_offset
         @records_limit = final_limit
 
+        updated_sort_limit = nil
+        updated_output_limit = nil
         if final_limit == UNLIMITED
-          @output["limit"] = UNLIMITED
+          updated_output_limit = UNLIMITED
         else
           if rich_sort?
-            @query["sortBy"]["limit"] = final_offset + [sort_limit, output_limit].max
+            updated_sort_limit = final_offset + [sort_limit, output_limit].max
           end
-          @output["limit"] = final_offset + final_limit
+          updated_output_limit = final_offset + final_limit
+        end
+
+        if updated_sort_limit && updated_sort_limit != @query["sortBy"]["limit"]
+          @query["sortBy"]["limit"] = updated_sort_limit
+        end
+        if updated_output_limit && @output["limit"] && updated_output_limit != @output["limit"]
+          @output["limit"] = updated_output_limit
         end
       end
 
@@ -206,7 +198,7 @@ module Droonga
       end
 
       def calculate_output_offset!
-        @output["offset"] = 0 if have_records?
+        @output["offset"] = 0 if have_records? && @output["offset"]
       end
 
       def final_offset
@@ -249,7 +241,6 @@ module Droonga
           @query["sortBy"]["limit"] = -1 if @query["sortBy"].is_a?(Hash)
           @output["limit"] = -1
           mapper = {
-            "type" => "count",
             "target" => "records",
           }
           unless @output["elements"].include?("records")
@@ -274,14 +265,15 @@ module Droonga
 
         @reducers["records"] = build_records_reducer
 
-        mapper = {
-          "type" => "sort",
-          "offset" => @records_offset,
-          "limit" => @records_limit,
-          "format" => @records_format,
-          "attributes" => final_attributes,
-        }
-        mapper["no_output"] = true unless @output_records
+        mapper = {}
+        if @output_records
+          mapper["format"]     = @records_format unless @records_format == "simple"
+          mapper["attributes"] = final_attributes unless final_attributes.empty?
+          mapper["offset"]     = @records_offset unless @records_offset.zero?
+          mapper["limit"]      = @records_limit unless @records_limit.zero?
+        else
+          mapper["no_output"] = true
+        end
         @mappers["records"] = mapper
       end
 
@@ -303,7 +295,7 @@ module Droonga
       def update_output_attributes!
         @output["attributes"] = array_style_attributes
         @output["attributes"] += sort_attribute_names
-        if unifiable? && !@output["attributes"].include?("_key")
+        if unifiable? && !source_column_names.include?("_key")
           @output["attributes"] << "_key"
         end
       end
@@ -316,7 +308,7 @@ module Droonga
             case attribute
             when String
               {
-                "label" => key,
+                "label"  => key,
                 "source" => attribute,
               }
             when Hash
@@ -365,7 +357,7 @@ module Droonga
       DESCENDING_OPERATOR = ">"
 
       def build_records_reducer
-        attributes = @output["attributes"]
+        attributes = source_column_names
         key_column_index = attributes.index("_key")
 
         operators = @sort_keys.collect do |sort_key|
@@ -376,12 +368,12 @@ module Droonga
           end
           {
             "operator" => operator,
-            "column" => attributes.index(sort_key),
+            "column"   => attributes.index(sort_key),
           }
         end
 
         reducer = {
-          "type" => "sort",
+          "type"      => "sort",
           "operators" => operators,
         }
         if unifiable? && !key_column_index.nil?

data/lib/droonga/plugin/{distributor → planner}/groonga.rb

@@ -15,10 +15,10 @@
 # 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/distributor_plugin"
+require "droonga/planner_plugin"
 
 module Droonga
-  class GroongaDistributor < Droonga::DistributorPlugin
+  class GroongaPlanner < Droonga::PlannerPlugin
     repository.register("groonga", self)
 
     command :table_create
@@ -26,7 +26,7 @@ module Droonga
       unless message["dataset"]
         raise "dataset must be set. FIXME: This error should return client."
       end
-      broadcast_all(message)
+      broadcast(message)
     end
 
     command :table_remove
@@ -34,42 +34,21 @@ module Droonga
       unless message["dataset"]
         raise "dataset must be set. FIXME: This error should return client."
       end
-      broadcast_all(message)
+      broadcast(message)
     end
 
     command :column_create
     def column_create(message)
-      broadcast_all(message)
+      broadcast(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
+    def broadcast(message)
+      super(message,
+            :write => true,
+            :reduce => {
+              "result" => "or"
+            })
     end
   end
 end

data/lib/droonga/plugin/{distributor → planner}/search.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
@@ -15,17 +15,17 @@
 # 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/distributor_plugin"
-require "droonga/plugin/distributor/distributed_search_planner"
+require "droonga/planner_plugin"
+require "droonga/plugin/planner/distributed_search_planner"
 
 module Droonga
-  class SearchDistributor < Droonga::DistributorPlugin
+  class SearchPlanner < Droonga::PlannerPlugin
     repository.register("search", self)
 
     command :search
     def search(message)
       planner = DistributedSearchPlanner.new(message)
-      distribute(planner.messages)
+      planner.plan
     end
   end
 end