droonga-engine 1.0.5 → 1.0.6

data/test/unit/catalog/test_version1.rb

@@ -46,13 +46,13 @@ class CatalogVersion1Test < Test::Unit::TestCase
       partitions = @catalog.get_partitions("localhost:23003/test")
       assert_equal({
                      "localhost:23003/test.000" => {
-                       :database  => "#{base_path}/000/db",
+                       :database  => "#{base_path}/database/000/db",
                        :dataset   => "Test",
                        :plugins   => ["for_dataset"],
                        :n_workers => 0
                      },
                      "localhost:23003/test.002" => {
-                       :database  => "#{base_path}/002/db",
+                       :database  => "#{base_path}/database/002/db",
                        :dataset   => "Test",
                        :plugins   => ["for_dataset"],
                        :n_workers => 0

data/test/unit/catalog/test_version2.rb

@@ -45,19 +45,19 @@ class CatalogVersion2Test < Test::Unit::TestCase
       slices = @catalog.slices("localhost:23003/test")
       assert_equal({
                      "localhost:23003/test.000" => {
-                       :database  => "#{base_path}/000/db",
+                       :database  => "#{base_path}/database/000/db",
                        :dataset   => "Test",
                        :plugins   => ["plugin1", "plugin2", "plugin3"],
                        :n_workers => 4,
                      },
                      "localhost:23003/test.001" => {
-                       :database  => "#{base_path}/001/db",
+                       :database  => "#{base_path}/database/001/db",
                        :dataset   => "Test",
                        :plugins   => ["plugin1", "plugin2", "plugin3"],
                        :n_workers => 4,
                      },
                      "localhost:23003/test.002" => {
-                       :database  => "#{base_path}/002/db",
+                       :database  => "#{base_path}/database/002/db",
                        :dataset   => "Test",
                        :plugins   => ["plugin1", "plugin2", "plugin3"],
                        :n_workers => 4,

data/test/unit/helper/sandbox.rb

@@ -28,6 +28,8 @@ module Sandbox
 
     @database_path = @temporary_directory + "database"
     @database = nil
+
+    ENV[Droonga::Path::BASE_DIR_ENV_NAME] = @temporary_directory.to_s
   end
 
   def setup_temporary_directory
@@ -41,7 +43,7 @@ module Sandbox
       FileUtils.mkdir_p(@base_temporary_directory.to_s)
     end
 
-    @temporary_directory = @base_temporary_directory + "fluent-plugin-droonga"
+    @temporary_directory = @base_temporary_directory + "droonga-engine"
     FileUtils.rm_rf(@temporary_directory.to_s)
     FileUtils.mkdir_p(@temporary_directory.to_s)
   end

data/test/unit/plugins/catalog/test_fetch.rb

@@ -0,0 +1,76 @@
+# 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 "fileutils"
+
+require "droonga/plugins/catalog"
+require "droonga/path"
+
+class CatalogFetchHandlerTest < Test::Unit::TestCase
+  def setup
+    setup_handler
+    setup_catalog_json
+  end
+
+  def teardown
+    teardown_handler
+    teardown_catalog_json
+  end
+
+  private
+  def setup_handler
+    @worker = StubWorker.new
+    @messenger = Droonga::Test::StubHandlerMessenger.new
+    @loop = nil
+    @handler = Droonga::Plugins::Catalog::FetchHandler.new("name",
+                                                           @worker.context,
+                                                           @messenger,
+                                                           @loop)
+  end
+
+  def teardown_handler
+    @handler = nil
+  end
+
+  def setup_catalog_json
+    catalog_path = Droonga::Path.catalog
+    FileUtils.mkdir_p(catalog_path.parent.to_s)
+    catalog_path.open("w") do |file|
+      file.puts(JSON.generate(catalog))
+    end
+  end
+
+  def teardown_catalog_json
+    FileUtils.rm_f(Droonga::Path.catalog)
+  end
+
+  def catalog
+    {
+      "version" => 2,
+    }
+  end
+
+  def process(request)
+    message = Droonga::Test::StubHandlerMessage.new(request)
+    @handler.handle(message)
+  end
+
+  public
+  def test_request
+    request = {}
+    response = process(request)
+    assert_equal(catalog, response)
+  end
+end

data/test/unit/test_catalog_generator.rb

@@ -40,6 +40,10 @@ class CatalogGeneratorTest < Test::Unit::TestCase
     end
   end
 
+  def default_plugins
+    ["groonga", "search", "crud", "dump", "system", "catalog"]
+  end
+
   def test_default
     catalog = {
       "version" => 2,
@@ -55,7 +59,7 @@ class CatalogGeneratorTest < Test::Unit::TestCase
       @generator.add_dataset("Droonga", {})
       dataset = {
         "nWorkers" => 4,
-        "plugins" => ["groonga", "search", "crud", "dump", "system"],
+        "plugins" => default_plugins,
         "schema" => {},
         "replicas" => [
           {
@@ -94,7 +98,7 @@ class CatalogGeneratorTest < Test::Unit::TestCase
       def test_replicas
         dataset = {
           "nWorkers" => 4,
-          "plugins" => ["groonga", "search", "crud", "dump", "system"],
+          "plugins" => default_plugins,
           "schema" => [],
           "replicas" => [
             {
@@ -141,7 +145,7 @@ class CatalogGeneratorTest < Test::Unit::TestCase
       @generator.add_dataset("Droonga", :replicas => replicas)
       dataset = {
         "nWorkers" => 4,
-        "plugins" => ["groonga", "search", "crud", "dump", "system"],
+        "plugins" => default_plugins,
         "schema" => {},
         "replicas" => replicas,
       }

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: droonga-engine
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rroonga
+  name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: groonga-command-parser
+  name: cool.io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: drndump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,33 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cool.io
+  name: droonga-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: droonga-message-pack-packer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: groonga-command-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: archive-zip
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -122,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rroonga
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: sigdump
   requirement: !ruby/object:Gem::Requirement
@@ -137,21 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: droonga-client
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: drndump
+  name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -165,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -193,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -207,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -221,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -235,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -249,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -271,7 +299,7 @@ executables:
 - droonga-engine-absorb-data
 - droonga-engine-catalog-generate
 - droonga-engine-catalog-modify
-- droonga-engine-data-publisher
+- droonga-engine-configure
 - droonga-engine-join
 - droonga-engine-serf-event-handler
 - droonga-engine-service
@@ -298,7 +326,7 @@ files:
 - bin/droonga-engine-absorb-data
 - bin/droonga-engine-catalog-generate
 - bin/droonga-engine-catalog-modify
-- bin/droonga-engine-data-publisher
+- bin/droonga-engine-configure
 - bin/droonga-engine-join
 - bin/droonga-engine-serf-event-handler
 - bin/droonga-engine-service
@@ -306,6 +334,11 @@ files:
 - bin/droonga-engine-worker
 - doc/text/news.md
 - droonga-engine.gemspec
+- install.sh
+- install/centos/droonga-engine
+- install/centos/functions.sh
+- install/debian/droonga-engine
+- install/debian/functions.sh
 - lib/droonga/adapter.rb
 - lib/droonga/adapter_runner.rb
 - lib/droonga/address.rb
@@ -322,8 +355,10 @@ files:
 - lib/droonga/catalog/version2_validator.rb
 - lib/droonga/catalog/volume.rb
 - lib/droonga/catalog/volume_collection.rb
+- lib/droonga/catalog_fetcher.rb
 - lib/droonga/catalog_generator.rb
 - lib/droonga/catalog_loader.rb
+- lib/droonga/catalog_modifier.rb
 - lib/droonga/collector.rb
 - lib/droonga/collector_message.rb
 - lib/droonga/collector_runner.rb
@@ -334,6 +369,7 @@ files:
 - lib/droonga/command/droonga_engine.rb
 - lib/droonga/command/droonga_engine_service.rb
 - lib/droonga/command/droonga_engine_worker.rb
+- lib/droonga/command/remote.rb
 - lib/droonga/command/serf_event_handler.rb
 - lib/droonga/data_absorber.rb
 - lib/droonga/dispatcher.rb
@@ -364,6 +400,7 @@ files:
 - lib/droonga/loggable.rb
 - lib/droonga/logger.rb
 - lib/droonga/message_matcher.rb
+- lib/droonga/node_status.rb
 - lib/droonga/output_message.rb
 - lib/droonga/path.rb
 - lib/droonga/planner.rb
@@ -377,6 +414,7 @@ files:
 - lib/droonga/plugin_loader.rb
 - lib/droonga/plugin_registry.rb
 - lib/droonga/plugins/basic.rb
+- lib/droonga/plugins/catalog.rb
 - lib/droonga/plugins/crud.rb
 - lib/droonga/plugins/dump.rb
 - lib/droonga/plugins/error.rb
@@ -407,6 +445,7 @@ files:
 - lib/droonga/searcher/mecab_filter.rb
 - lib/droonga/serf.rb
 - lib/droonga/serf_downloader.rb
+- lib/droonga/service_installation.rb
 - lib/droonga/session.rb
 - lib/droonga/single_step.rb
 - lib/droonga/single_step_definition.rb
@@ -424,11 +463,13 @@ files:
 - lib/droonga/watcher.rb
 - lib/droonga/worker_process_agent.rb
 - sample/cluster/Rakefile
+- sample/droonga-engine.yaml
 - sample/mecab_filter/data.grn
 - sample/mecab_filter/ddl.grn
 - sample/mecab_filter/search_with_mecab_filter.json
 - sample/mecab_filter/search_without_mecab_filter.json
 - test/command/config/default/catalog.json
+- test/command/config/default/droonga-engine.yaml
 - test/command/config/version1/catalog.json
 - test/command/fixture/documents.jsons
 - test/command/fixture/event.jsons
@@ -462,6 +503,8 @@ files:
 - test/command/suite/add/with-values.test
 - test/command/suite/add/without-key.expected
 - test/command/suite/add/without-key.test
+- test/command/suite/catalog/fetch.expected
+- test/command/suite/catalog/fetch.test
 - test/command/suite/dump/column/index.catalog.json
 - test/command/suite/dump/column/index.expected
 - test/command/suite/dump/column/index.test
@@ -658,6 +701,7 @@ files:
 - test/unit/helper/sandbox.rb
 - test/unit/helper/stub_worker.rb
 - test/unit/helper/watch_helper.rb
+- test/unit/plugins/catalog/test_fetch.rb
 - test/unit/plugins/crud/test_add.rb
 - test/unit/plugins/groonga/select/test_adapter_input.rb
 - test/unit/plugins/groonga/select/test_adapter_output.rb
@@ -708,12 +752,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Droonga engine
 test_files:
 - test/command/config/default/catalog.json
+- test/command/config/default/droonga-engine.yaml
 - test/command/config/version1/catalog.json
 - test/command/fixture/documents.jsons
 - test/command/fixture/event.jsons
@@ -747,6 +792,8 @@ test_files:
 - test/command/suite/add/with-values.test
 - test/command/suite/add/without-key.expected
 - test/command/suite/add/without-key.test
+- test/command/suite/catalog/fetch.expected
+- test/command/suite/catalog/fetch.test
 - test/command/suite/dump/column/index.catalog.json
 - test/command/suite/dump/column/index.expected
 - test/command/suite/dump/column/index.test
@@ -943,6 +990,7 @@ test_files:
 - test/unit/helper/sandbox.rb
 - test/unit/helper/stub_worker.rb
 - test/unit/helper/watch_helper.rb
+- test/unit/plugins/catalog/test_fetch.rb
 - test/unit/plugins/crud/test_add.rb
 - test/unit/plugins/groonga/select/test_adapter_input.rb
 - test/unit/plugins/groonga/select/test_adapter_output.rb
@@ -974,4 +1022,3 @@ test_files:
 - test/unit/test_sweeper.rb
 - test/unit/test_watch_schema.rb
 - test/unit/test_watcher.rb
-has_rdoc: 

data/bin/droonga-engine-data-publisher

@@ -1,66 +0,0 @@
-#!/usr/bin/env ruby
-#
-# 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 "ostruct"
-require "optparse"
-require "pathname"
-require "fileutils"
-require "webrick"
-
-require "droonga/engine/version"
-require "droonga/path"
-
-options = OpenStruct.new
-options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd
-options.port = 10032
-
-parser = OptionParser.new
-parser.version = Droonga::Engine::VERSION
-
-parser.on("--base-dir=PATH",
-          "Path to the base directory the catalog.json is located in.",
-          "(#{options.base_dir})") do |path|
-  options.base_dir = path
-end
-parser.on("--port=PORT", Integer,
-          "Port number to listen.",
-          "(#{options.port})") do |port|
-  options.port = port
-end
-parser.on("--published-file=PATH",
-          "Path to the file to be published.") do |path|
-  options.published_file = path
-end
-
-parser.parse!(ARGV)
-
-include WEBrick
-
-published_dir = Droonga::Path.published(options.port)
-FileUtils.mkdir_p(published_dir.to_s)
-published_file = Pathname(options.published_file).expand_path
-FileUtils.copy(published_file.to_s, published_dir + published_file.basename)
-
-server = HTTPServer.new(:Port => options.port,
-                        :DocumentRoot => published_dir)
-
-trap("INT") do
-  server.shutdown
-  FileUtils.rm_rf(published_dir.to_s)
-end
-
-server.start