fluent-plugin-droonga 0.0.2 → 0.7.0

data/lib/droonga/plugin/{handler_groonga.rb → handler/groonga.rb}

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 droonga project
+# 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
@@ -17,11 +17,11 @@
 
 require "groonga"
 
-require "droonga/handler"
+require "droonga/handler_plugin"
 
 module Droonga
-  class GroongaHandler < Droonga::Handler
-    Droonga::HandlerPlugin.register("groonga", self)
+  class GroongaHandler < Droonga::HandlerPlugin
+    repository.register("groonga", self)
 
     command :table_create
     def table_create(request)
@@ -45,6 +45,38 @@ module Droonga
       SUCCESS          = 0
       INVALID_ARGUMENT = -22
     end
+
+    class Command
+      class CommandError < StandardError
+        attr_reader :status, :message, :result
+
+        def initialize(params={})
+          @status = params[:status]
+          @message = params[:message]
+          @result = params[:result]
+        end
+      end
+
+      def initialize(context)
+        @context = context
+      end
+
+      def execute(request)
+        @start_time = Time.now.to_f
+        result = process_request(request)
+        [header(Status::SUCCESS), result]
+      rescue CommandError => error
+        [header(error.status, error.message), error.result]
+      end
+
+      private
+      def header(return_code, error_message="")
+        elapsed_time = Time.now.to_f - @start_time
+        header = [return_code, @start_time, elapsed_time]
+        header.push(error_message) unless error_message.empty?
+        header
+      end
+    end
   end
 end
 

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 droonga project
+# 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
@@ -20,12 +20,8 @@ require "groonga/command/column-create"
 
 module Droonga
   class GroongaHandler
-    class ColumnCreate
-      def initialize(context)
-        @context = context
-      end
-
-      def execute(request)
+    class ColumnCreate < Command
+      def process_request(request)
         command_class = Groonga::Command.find("column_create")
         @command = command_class.new("column_create", request)
 
@@ -48,7 +44,7 @@ module Droonga
             table.column(column_name, column_type, options)
           end
         end
-        [true]
+        true
       end
 
       def create_column_options
@@ -78,7 +74,7 @@ module Droonga
             table.index("#{target_table}.#{target_column}", options)
           end
         end
-        [true]
+        true
       end
 
       def create_index_options

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 droonga project
+# 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
@@ -20,32 +20,23 @@ require "groonga/command/table-create"
 
 module Droonga
   class GroongaHandler
-    class TableCreate
-      def initialize(context)
-        @context = context
-      end
-
-      def header(return_code, error_message="")
-        elapsed_time = Time.now.to_f - @start_time
-        header = [return_code, @start_time, elapsed_time]
-        header.push(error_message) unless error_message.empty?
-        header
-      end
-
-      def execute(request)
-        @start_time = Time.now.to_f
-
+    class TableCreate < Command
+      def process_request(request)
         command_class = Groonga::Command.find("table_create")
         @command = command_class.new("table_create", request)
 
         name = @command["name"]
-        return [header(Status::INVALID_ARGUMENT, "Should not create anonymous table"), false] unless name
+        unless name
+          raise CommandError.new(:status => Status::INVALID_ARGUMENT,
+                                 :message => "Should not create anonymous table",
+                                 :result => false)
+        end
 
         options = parse_command
         Groonga::Schema.define(:context => @context) do |schema|
           schema.create_table(name, options)
         end
-        [header(Status::SUCCESS), true]
+        true
       end
 
       private

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 droonga project
+# 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
@@ -15,12 +15,12 @@
 # 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"
+require "droonga/handler_plugin"
 require "droonga/searcher"
 
 module Droonga
-  class SearchHandler < Droonga::Handler
-    Droonga::HandlerPlugin.register("search", self)
+  class SearchHandler < Droonga::HandlerPlugin
+    repository.register("search", self)
 
     command :search
     def search(request)

data/lib/droonga/plugin/{handler_watch.rb → handler/watch.rb}

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 droonga project
+# 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
@@ -18,11 +18,11 @@
 require "droonga/watcher"
 require "droonga/sweeper"
 require "droonga/watch_schema"
-require "droonga/handler"
+require "droonga/handler_plugin"
 
 module Droonga
-  class WatchHandler < Droonga::Handler
-    Droonga::HandlerPlugin.register("watch", self)
+  class WatchHandler < Droonga::HandlerPlugin
+    repository.register("watch", self)
 
     def initialize(*args)
       super

data/lib/droonga/plugin_loader.rb

@@ -0,0 +1,45 @@
+# -*- 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
+
+module Droonga
+  class PluginLoader
+    class << self
+      def load_all
+        $LOAD_PATH.each do |load_path|
+          Dir.glob("#{load_path}/droonga/plugin/*") do |type_path|
+            next unless File.directory?(type_path)
+            type = File.basename(type_path)
+            Dir.glob("#{type_path}/*.rb") do |path|
+              name = File.basename(path, ".rb")
+              plugin = new(type, name)
+              plugin.load
+            end
+          end
+        end
+      end
+    end
+
+    def initialize(type, name)
+      @type = type
+      @name = name
+    end
+
+    def load
+      require "droonga/plugin/#{@type}/#{@name}"
+    end
+  end
+end

data/lib/droonga/plugin_registerable.rb

@@ -0,0 +1,51 @@
+# -*- 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/command_mapper"
+require "droonga/plugin_repository"
+
+module Droonga
+  module PluginRegisterable
+    class << self
+      def extended(plugin_class)
+        super
+        plugin_class.class_variable_set(:@@repository, PluginRepository.new)
+      end
+    end
+
+    def repository
+      class_variable_get(:@@repository)
+    end
+
+    def inherited(sub_class)
+      super
+      sub_class.instance_variable_set(:@command_mapper, CommandMapper.new)
+    end
+
+    def command(name_or_map)
+      @command_mapper.register(name_or_map)
+    end
+
+    def method_name(command)
+      @command_mapper[command]
+    end
+
+    def processable?(command)
+      not method_name(command).nil?
+    end
+  end
+end

data/lib/droonga/plugin_repository.rb

@@ -0,0 +1,56 @@
+# -*- 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
+
+module Droonga
+  class PluginRepository
+    include Enumerable
+
+    def initialize
+      @plugins = {}
+    end
+
+    def each(&block)
+      @plugins.each(&block)
+    end
+
+    def register(name, klass)
+      @plugins[name] = klass
+    end
+
+    def [](name)
+      @plugins[name]
+    end
+
+    def clear
+      @plugins.clear
+    end
+
+    def instantiate(name, *args, &block)
+      plugin_class = self[name]
+      if plugin_class.nil?
+        # TODO: use the original error
+        raise ArgumentError, "unknown plugin: <#{name}>"
+      end
+      begin
+        plugin_class.new(*args, &block)
+      rescue
+        p [plugin_class, plugin_class.method(:new), plugin_class.method(:new).arity, args.size]
+        raise
+      end
+    end
+  end
+end

data/lib/droonga/processor.rb

@@ -0,0 +1,64 @@
+# -*- 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/job_queue"
+require "droonga/handler"
+
+module Droonga
+  class Processor
+    def initialize(options={})
+      @options = options
+      @database_name = @options[:database]
+      @queue_name = @options[:options] || "DroongaQueue"
+      @n_workers = @options[:n_workers] || 0
+    end
+
+    def start
+      Droonga::JobQueue.ensure_schema(@database_name,
+                                      @queue_name)
+      @job_queue = JobQueue.open(@database_name, @queue_name)
+      @handler = Handler.new(@options)
+    end
+
+    def shutdown
+      $log.trace("processor: shutdown: start")
+      @handler.shutdown
+      @job_queue.close
+      $log.trace("processor: shutdown: done")
+    end
+
+    def process(envelope, synchronous=nil)
+      $log.trace("proessor: process: start")
+      reply_to = envelope["replyTo"]
+      command = envelope["type"]
+      if @handler.processable?(command)
+        $log.trace("proessor: process: handlable: #{command}")
+        if synchronous.nil?
+          synchronous = @handler.prefer_synchronous?(command)
+        end
+        if @n_workers.zero? or synchronous
+          @handler.process(envelope)
+        else
+          @job_queue.push_message(envelope)
+        end
+      else
+        $log.trace("proessor: process: ignore #{command}")
+      end
+      $log.trace("proessor: process: done")
+    end
+  end
+end

data/lib/droonga/searcher.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013 droonga project
+# 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
@@ -159,8 +159,8 @@ module Droonga
           end
           if condition["query"]
             options[:syntax] = :query
-            if condition["default_operator"]
-              case condition["default_operator"]
+            if condition["defaultOperator"]
+              case condition["defaultOperator"]
               when "||"
                 options[:default_operator] = Groonga::Operator::OR
               when "&&"
@@ -171,17 +171,17 @@ module Droonga
                 raise "undefined operator assigned #{condition["default_operator"]}"
               end
             end
-            if condition["allow_pragma"]
+            if condition["allowPragma"]
               options[:allow_pragma] = true
             end
-            if condition["allow_column"]
+            if condition["allowColumn"]
               options[:allow_column] = true
             end
             expression.parse(condition["query"], options)
           elsif condition["script"]
             # "script" is ignored when "query" is also assigned.
             options[:syntax] = :script
-            if condition["allow_update"]
+            if condition["allowUpdate"]
               options[:allow_update] = true
             end
             expression.parse(condition["script"], options)
@@ -296,8 +296,12 @@ module Droonga
         # XXX IMPLEMENT ME!!!
         attributes = nil
         if @query["output"]["format"] == "complex"
+          # should convert columnst to an object like:
+          # {"_id" => {"type" => "UInt32", "vector" => false}}
           attributes = {}
         else
+          # should convert columnst to an object like:
+          # [{"name" => "_id", "type" => "UInt32", "vector" => false}]
           attributes = []
         end
 
@@ -360,7 +364,12 @@ module Droonga
             variable.value = record
             expression.execute
           else
-            record[attribute[:source]]
+            value = record[attribute[:source]]
+            if value.is_a?(Groonga::Record)
+              value.record_id
+            else
+              value
+            end
           end
         end
       end