fluent-plugin-droonga 0.0.2 → 0.7.0

data/lib/droonga/server.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,7 +15,7 @@
 # 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 "droonga/job_queue"
 
 module Droonga
   module Server
@@ -53,7 +53,7 @@ module Droonga
             $log.trace("#{log_tag}: stop: start")
 
             $log.trace("#{log_tag}: stop: queue: unblock: start")
-            max_n_retries = 10
+            max_n_retries = 20
             max_n_retries.times do |i|
               $log.trace("#{log_tag}: stop: queue: unblock: #{i}: start")
               super(stop_graceful)
@@ -95,16 +95,12 @@ module Droonga
 
       def open_queue
         config = @worker.config
-        # TODO: Use JobQueue object
-        context = Groonga::Context.new
-        database = context.open_database(config[:database])
-        queue = context[config[:queue_name]]
+        queue = JobQueue.open(config[:database],
+                              config[:queue_name] || "DroongaQueue")
         begin
           yield(queue)
         ensure
           queue.close
-          database.close
-          context.close
         end
       end
     end

data/lib/droonga/sweeper.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

data/lib/droonga/watch_schema.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

data/lib/droonga/watcher.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

data/lib/droonga/worker.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,25 +15,26 @@
 # 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/executor"
+require "droonga/job_queue"
+require "droonga/handler"
 
 module Droonga
   module Worker
-    attr_reader :context, :envelope, :name
-
     def initialize
-      @executor = Executor.new(config.merge(:proxy => false))
+      @database_name = config[:database]
+      @queue_name = config[:queue_name] || "DroongaQueue"
     end
 
     def run
       $log.trace("#{log_tag}: run: start")
+      handler = Handler.new(config)
+      job_queue = JobQueue.open(@database_name, @queue_name)
       @running = true
       while @running
-        $log.trace("#{log_tag}: run: pull_message: start")
-        @executor.execute_one
-        $log.trace("#{log_tag}: run: pull_message: done")
+        process(handler, job_queue)
       end
-      @executor.shutdown
+      handler.shutdown
+      job_queue.close
       $log.trace("#{log_tag}: run: done")
     end
 
@@ -44,6 +45,17 @@ module Droonga
     end
 
     private
+    def process(handler, job_queue)
+      $log.trace("#{log_tag}: process: start")
+      envelope = job_queue.pull_message
+      unless envelope
+        $log.trace("#{log_tag}: process: abort: no message")
+        return
+      end
+      handler.process(envelope)
+      $log.trace("#{log_tag}: process: done")
+    end
+
     def log_tag
       "[#{Process.ppid}][#{Process.pid}] worker"
     end

data/lib/fluent/plugin/out_droonga.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
@@ -16,28 +16,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require "droonga/engine"
+require "droonga/plugin_loader"
 
 module Fluent
   class DroongaOutput < Output
     Plugin.register_output("droonga", self)
 
     config_param :name, :string, :default => ""
-    config_param :proxy, :bool, :default => false
-    config_param :n_workers, :integer, :default => 0
-    config_param :database, :string, :default => ""
-    config_param :queue_name, :string, :default => "DroongaQueue"
-    config_param :handlers, :default => [] do |value|
-      value.split(/\s*,\s*/)
-    end
 
     def start
       super
-      @engine = Droonga::Engine.new(:database => @database,
-                                    :queue_name => @queue_name,
-                                    :n_workers => @n_workers,
-                                    :handlers => @handlers,
-                                    :name => @name,
-                                    :proxy => @proxy)
+      Droonga::PluginLoader.load_all
+      @engine = Droonga::Engine.new(:name => @name)
       @engine.start
     end
 
@@ -48,9 +38,37 @@ module Fluent
 
     def emit(tag, es, chain)
       es.each do |time, record|
-        @engine.emit(tag, time, record)
+        process_event(tag, record)
       end
       chain.next
     end
+
+    private
+    def process_event(tag, record)
+      $log.trace("out_droonga: tag: <#{tag}> caller: <#{caller.first}>")
+      @engine.process(parse_record(tag, record))
+    end
+
+    def parse_record(tag, record)
+      prefix, type, *arguments = tag.split(/\./)
+      if type.nil? || type.empty? || type == 'message'
+        envelope = record
+      else
+        envelope = {
+          "type" => type,
+          "arguments" => arguments,
+          "body" => record
+        }
+      end
+      envelope["via"] ||= []
+      reply_to = envelope["replyTo"]
+      if reply_to.is_a? String
+        envelope["replyTo"] = {
+          "type" => envelope["type"] + ".result",
+          "to" => reply_to
+        }
+      end
+      envelope
+    end
   end
 end

data/lib/groonga_command_converter.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

data/sample/cluster/fluentd.conf

@@ -5,7 +5,6 @@
 <match droonga.message>
   name localhost:23003/droonga
   type droonga
-  proxy true
 </match>
 <match output.message>
   type stdout

data/test/command/config/default/catalog.json

@@ -0,0 +1,43 @@
+{
+  "effective_date": "2013-09-01T00:00:00Z",
+  "zones": ["localhost:23003/droonga"],
+  "farms": {
+    "localhost:23003/droonga": {
+      "device": ".",
+      "capacity": 10
+    }
+  },
+  "datasets": {
+    "Droonga": {
+      "workers": 2,
+      "plugins": ["search", "groonga", "add"],
+      "number_of_replicas": 2,
+      "number_of_partitions": 2,
+      "partition_key": "_key",
+      "date_range": "infinity",
+      "ring": {
+        "localhost:23041": {
+          "weight": 50,
+          "partitions": {
+            "2013-09-01": [
+              "localhost:23003/droonga.000",
+              "localhost:23003/droonga.001"
+            ]
+          }
+        },
+        "localhost:23042": {
+          "weight": 50,
+          "partitions": {
+            "2013-09-01": [
+              "localhost:23003/droonga.002",
+              "localhost:23003/droonga.003"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "options": {
+    "plugins": ["select"]
+  }
+}

data/test/command/config/default/fluentd.conf

@@ -0,0 +1,11 @@
+<source>
+  type forward
+  port 23003
+</source>
+<match droonga.message>
+  name localhost:23003/droonga
+  type droonga
+</match>
+<match output.message>
+  type stdout
+</match>

data/test/command/fixture/documents.jsons

@@ -0,0 +1,208 @@
+#@disable-logging
+{
+  "dataset": "Droonga",
+  "type": "table_create",
+  "body": {
+    "default_tokenizer": "TokenBigram",
+    "normalizer": "NormalizerAuto",
+    "name": "Bigram",
+    "flags": "TABLE_PAT_KEY",
+    "key_type": "ShortText"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "table_create",
+  "body": {
+    "name": "Documents",
+    "flags": "TABLE_HASH_KEY",
+    "key_type": "ShortText"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "table_create",
+  "body": {
+    "name": "Sections",
+    "flags": "TABLE_HASH_KEY",
+    "key_type": "ShortText"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "column_create",
+  "body": {
+    "table": "Sections",
+    "name": "content",
+    "flags": "COLUMN_SCALAR",
+    "type": "Text"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "column_create",
+  "body": {
+    "table": "Sections",
+    "name": "title",
+    "flags": "COLUMN_SCALAR",
+    "type": "ShortText"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "column_create",
+  "body": {
+    "table": "Sections",
+    "name": "document",
+    "flags": "COLUMN_SCALAR",
+    "type": "Documents"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "column_create",
+  "body": {
+    "table": "Bigram",
+    "name": "Sections_title",
+    "flags": "COLUMN_INDEX|WITH_POSITION",
+    "type": "Sections",
+    "source": "title"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "column_create",
+  "body": {
+    "table": "Bigram",
+    "name": "Sections_content",
+    "flags": "COLUMN_INDEX|WITH_POSITION",
+    "type": "Sections",
+    "source": "content"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Documents",
+    "key": "Groonga"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.1",
+    "values": {
+      "content": "Groonga is a fast and accurate full text search engine based on inverted index. One of the characteristics of groonga is that a newly registered document instantly appears in search results. Also, groonga allows updates without read locks. These characteristics result in superior performance on real-time applications.",
+      "document": "Groonga",
+      "title": "Groonga overview"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.2",
+    "values": {
+      "content": "In widely used DBMSs, updates are immediately processed, for example, a newly registered record appears in the result of the next query. In contrast, some full text search engines do not support instant updates, because it is difficult to dynamically update inverted indexes, the underlying data structure.",
+      "document": "Groonga",
+      "title": "Full text search and Instant update"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.3",
+    "values": {
+      "content": "People can collect more than enough data in the Internet era. However, it is difficult to extract informative knowledge from a large database, and such a task requires a many-sided analysis through trial and error. For example, search refinement by date, time and location may reveal hidden patterns. Aggregate queries are useful to perform this kind of tasks.",
+      "document": "Groonga",
+      "title": "Column store and aggregate query"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.4",
+    "values": {
+      "content": "An inverted index is a traditional data structure used for large-scale full text search. A search engine based on inverted index extracts index terms from a document when it is added. Then in retrieval, a query is divided into index terms to find documents containing those index terms. In this way, index terms play an important role in full text search and thus the way of extracting index terms is a key to a better search engine.",
+      "document": "Groonga",
+      "title": "Inverted index and tokenizer"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.5",
+    "values": {
+      "content": "Multi-core processors are mainstream today and the number of cores per processor is increasing. In order to exploit multiple cores, executing multiple queries in parallel or dividing a query into sub-queries for parallel processing is becoming more important.",
+      "document": "Groonga",
+      "title": "Sharable storage and read lock-free"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.6",
+    "values": {
+      "content": "Location services are getting more convenient because of mobile devices with GPS. For example, if you are going to have lunch or dinner at a nearby restaurant, a local search service for restaurants may be very useful, and for such services, fast geo-location search is becoming more important.",
+      "document": "Groonga",
+      "title": "Geo-location (latitude and longitude) search"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.7",
+    "values": {
+      "content": "The basic functions of groonga are provided in a C library and any application can use groonga as a full text search engine or a column-oriented database. Also, libraries for languages other than C/C++, such as Ruby, are provided in related projects. See related projects for details.",
+      "document": "Groonga",
+      "title": "Groonga library"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.8",
+    "values": {
+      "content": "Groonga provides a built-in server command which supports HTTP, the memcached binary protocol and the groonga query transfer protocol (gqtp). Also, a groonga server supports query caching, which significantly reduces response time for repeated read queries. Using this command, groonga is available even on a server that does not allow you to install new libraries.",
+      "document": "Groonga",
+      "title": "Groonga server"
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Sections",
+    "key": "1.9",
+    "values": {
+      "content": "Groonga works not only as an independent column-oriented DBMS but also as storage engines of well-known DBMSs. For example, mroonga is a MySQL pluggable storage engine using groonga. By using mroonga, you can use groonga for column-oriented storage and full text search. A combination of a built-in storage engine, MyISAM or InnoDB, and a groonga-based full text search engine is also available. All the combinations have good and bad points and the best one depends on the application. See related projects for details.",
+      "document": "Groonga",
+      "title": "Groonga storage engine"
+    }
+  }
+}
+#@enable-logging