droonga-engine 1.0.4 → 1.0.5

data/lib/droonga/plugins/groonga/column_list.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/column-list"
 

data/lib/droonga/plugins/groonga/column_remove.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/column-remove"
 

data/lib/droonga/plugins/groonga/column_rename.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/column-rename"
 

data/lib/droonga/plugins/groonga/delete.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/delete"
 

data/lib/droonga/plugins/groonga/generic_command.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga"
 

data/lib/droonga/plugins/groonga/generic_response.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 

data/lib/droonga/plugins/groonga/select.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 

data/lib/droonga/plugins/groonga/table_create.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/table-create"
 

data/lib/droonga/plugins/groonga/table_list.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 require "droonga/plugins/groonga/generic_command"

data/lib/droonga/plugins/groonga/table_remove.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/table-remove"
 

data/lib/droonga/plugins/groonga.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 

data/lib/droonga/plugins/search/distributed_search_planner.rb

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/searcher"
 require "droonga/distributed_command_planner"

data/lib/droonga/plugins/search.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 require "droonga/searcher"

data/lib/droonga/plugins/system.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 

data/lib/droonga/plugins/watch.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugin"
 require "droonga/watcher"

data/lib/droonga/{service_control_protocol.rb → process_control_protocol.rb}

@@ -11,10 +11,10 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
-  module ServiceControlProtocol
+  module ProcessControlProtocol
     module Messages
       STOP_GRACEFUL    = "stop-graceful\n"
       STOP_IMMEDIATELY = "stop-immediately\n"

data/lib/droonga/process_supervisor.rb

@@ -0,0 +1,91 @@
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "coolio"
+
+require "droonga/process_control_protocol"
+require "droonga/line_buffer"
+
+module Droonga
+  class ProcessSupervisor
+    include ProcessControlProtocol
+
+    def initialize(loop, input, output)
+      @loop = loop
+      @input = create_input(input)
+      @output = create_output(output)
+      @on_ready = nil
+      @on_finish = nil
+    end
+
+    def start
+      @loop.attach(@input)
+      @loop.attach(@output)
+    end
+
+    def stop
+      @input.close
+      @output.close
+    end
+
+    def stop_gracefully
+      @output.write(Messages::STOP_GRACEFUL)
+    end
+
+    def stop_immediately
+      @output.write(Messages::STOP_IMMEDIATELY)
+    end
+
+    def on_ready=(callback)
+      @on_ready = callback
+    end
+
+    def on_finish=(callback)
+      @on_finish = callback
+    end
+
+    private
+    def create_input(raw_input)
+      input = Coolio::IO.new(raw_input)
+      line_buffer = LineBuffer.new
+      on_read = lambda do |data|
+        line_buffer.feed(data) do |line|
+          case line
+          when Messages::READY
+            on_ready
+          when Messages::FINISH
+            on_finish
+          end
+        end
+      end
+      input.on_read do |data|
+        on_read.call(data)
+      end
+      input
+    end
+
+    def create_output(raw_output)
+      Coolio::IO.new(raw_output)
+    end
+
+    def on_ready
+      @on_ready.call if @on_ready
+    end
+
+    def on_finish
+      @on_finish.call if @on_finish
+    end
+  end
+end

data/lib/droonga/processor.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/loggable"
 require "droonga/handler_runner"

data/lib/droonga/reducer.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   class Reducer

data/lib/droonga/replier.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/loggable"
 require "droonga/status_code"
@@ -43,7 +43,7 @@ module Droonga
 
     private
     def log_tag
-      "[#{Process.ppid}][#{Process.pid}] replier"
+      "[#{Process.ppid}] replier"
     end
   end
 end

data/lib/droonga/safe_file_writer.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "pathname"
 require "fileutils"

data/lib/droonga/schema_applier.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/loggable"
 

data/lib/droonga/searcher/mecab_filter.rb

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "MeCab"
 

data/lib/droonga/searcher.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "English"
 require "tsort"
@@ -139,7 +139,7 @@ module Droonga
     end
 
     def log_tag
-      "[#{Process.ppid}][#{Process.pid}] searcher"
+      "[#{Process.ppid}] searcher"
     end
 
     class QuerySorter
@@ -448,7 +448,7 @@ module Droonga
       end
 
       def log_tag
-        "[#{Process.ppid}][#{Process.pid}] query_searcher"
+        "[#{Process.ppid}] query_searcher"
       end
     end
 
@@ -529,6 +529,21 @@ module Droonga
     end
 
     module RecordsFormattable
+      def format(output_target_attributes, records, output_limit, output_offset)
+        cursor_options = {
+          :offset => output_offset,
+          :limit => output_limit
+        }
+        formatted_records = nil
+        records.open_cursor(cursor_options) do |cursor|
+          formatted_records = cursor.collect do |record|
+            format_record(output_target_attributes, record)
+          end
+        end
+        formatted_records
+      end
+
+      private
       def record_value(record, attribute)
         if attribute[:source] == "_subrecs"
           if record.table.is_a?(Groonga::Array)
@@ -547,34 +562,30 @@ module Droonga
             variable.value = record
             expression.execute
           else
-            value = record[attribute[:source]]
-            if value.is_a?(Groonga::Record)
-              value.record_id
-            else
-              value
-            end
+            column_value = record[attribute[:source]]
+            format_column_value(column_value)
           end
         end
       end
 
-      def format(output_target_attributes, records, output_limit, output_offset)
-        cursor_options = {
-          :offset => output_offset,
-          :limit => output_limit
-        }
-        formatted_records = nil
-        records.open_cursor(cursor_options) do |cursor|
-          formatted_records = cursor.collect do |record|
-            format_record(output_target_attributes, record)
+      def format_column_value(column_value)
+        case column_value
+        when Groonga::Record
+          column_value.record_id
+        when Array
+          column_value.collect do |sub_column_value|
+            format_column_value(sub_column_value)
           end
+        else
+          column_value
         end
-        formatted_records
       end
     end
 
     class SimpleRecordsFormatter
       include RecordsFormattable
 
+      private
       def format_record(attributes, record)
         attributes.collect do |attribute|
           record_value(record, attribute)
@@ -585,6 +596,7 @@ module Droonga
     class ComplexRecordsFormatter
       include RecordsFormattable
 
+      private
       def format_record(attributes, record)
         values = {}
         attributes.each do |attribute|

data/lib/droonga/serf.rb

@@ -11,12 +11,13 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "English"
 
 require "json"
 require "coolio"
+require "open3"
 
 require "droonga/path"
 require "droonga/loggable"
@@ -57,13 +58,17 @@ module Droonga
         {}
       end
 
-      def send_event(name, event, payload)
-        new(nil, name).send_event(event, payload)
+      def status(key)
+        load_status[key]
       end
 
       def send_query(name, query, payload)
         new(nil, name).send_query(query, payload)
       end
+
+      def live_nodes(name)
+        new(nil, name).live_nodes
+      end
     end
 
     include Loggable
@@ -98,22 +103,49 @@ module Droonga
       @agent and @agent.running?
     end
 
-    def shutdown
-      logger.trace("shutdown: start")
-      run("leave").shutdown
-      @agent.shutdown
+    def stop
+      logger.trace("stop: start")
+      run("leave").stop
+      @agent.stop
       @agent = nil
-      logger.trace("shutdown: done")
+      logger.trace("stop: done")
     end
 
-    def send_event(event, payload)
+    def send_query(query, payload)
       ensure_serf
-      run("event", event, JSON.generate(payload)).shutdown
+      options = ["-format", "json"] + additional_options_from_payload(payload)
+      options += [query, JSON.generate(payload)]
+      result = run_once("query", *options)
+      if payload["node"]
+        responses = result[:result]["Responses"]
+        response = responses[payload["node"]]
+        if response.is_a?(String)
+          begin
+            result[:response] = JSON.parse(response)
+          rescue JSON::ParserError
+            result[:response] = response
+          end
+        else
+          result[:response] = response
+        end
+      end
+      result
     end
 
-    def send_query(query, payload)
+    def live_nodes
       ensure_serf
-      run("query", query, JSON.generate(payload)).shutdown
+      nodes = {}
+      result= run_once("members", "-format", "json")
+      members = result[:result]
+      members["members"].each do |member|
+        if member["status"] == "alive"
+          nodes[member["name"]] = {
+            "serfAddress" => member["addr"],
+            "tags"        => member["tags"],
+          }
+        end
+      end
+      nodes
     end
 
     private
@@ -145,6 +177,21 @@ module Droonga
       process
     end
 
+    def run_once(command, *options)
+      process = SerfProcess.new(@loop, @serf, command,
+                                "-rpc-addr", rpc_address,
+                                *options)
+      process.run_once
+    end
+
+    def additional_options_from_payload(payload)
+      options = []
+      if payload.is_a?(Hash) and payload.include?("node")
+        options += ["-node", payload["node"]]
+      end
+      options
+    end
+
     def extract_host(node_name)
       node_name.split(":").first
     end
@@ -220,7 +267,7 @@ module Droonga
         end
       end
 
-      def shutdown
+      def stop
         return if @pid.nil?
         Process.waitpid(@pid)
         @output_io.close
@@ -232,6 +279,15 @@ module Droonga
         not @pid.nil?
       end
 
+      def run_once
+        stdout, stderror, status = Open3.capture3(@serf, @command, *@options, :pgroup => true)
+        {
+          :result => JSON.parse(stdout),
+          :error  => stderror,
+          :status => status,
+        }
+      end
+
       private
       def capture_output
         result = nil
@@ -290,7 +346,8 @@ module Droonga
               hour, minute, second = $4, $5, $6
               level = $7
               content = $POSTMATCH
-              logger.send(level.downcase, content)
+              level = normalize_level(level)
+              logger.send(level, content)
             else
               logger.info(content)
             end
@@ -300,6 +357,16 @@ module Droonga
         end
       end
 
+      def normalize_level(level)
+        level = level.downcase
+        case level
+        when "err"
+          "error"
+        else
+          level
+        end
+      end
+
       def on_error_output(line_buffer, data)
         line_buffer.feed(data) do |line|
           line = line.chomp

data/lib/droonga/serf_downloader.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "stringio"
 require "tmpdir"
@@ -33,7 +33,7 @@ module Droonga
 
     def download
       detect_platform
-      version = "0.6.0"
+      version = "0.6.3"
       url_base = "https://dl.bintray.com/mitchellh/serf"
       base_name = "#{version}_#{@os}_#{@architecture}.zip"
       connection = Faraday.new(url_base) do |builder|

data/lib/droonga/session.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   class Session

data/lib/droonga/single_step.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/planner"
 require "droonga/collectors"

data/lib/droonga/single_step_definition.rb

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   class SingleStepDefinition