[Groonga-commit] droonga/wikipedia-search at 5f16c76 [master] Don't use replicas.json

Back to archive index

Kouhei Sutou null+****@clear*****
Sat Jul 19 22:42:03 JST 2014


Kouhei Sutou	2014-07-19 22:42:03 +0900 (Sat, 19 Jul 2014)

  New Revision: 5f16c763900a0c69efb60c38ebe8a0d59950d88e
  https://github.com/droonga/wikipedia-search/commit/5f16c763900a0c69efb60c38ebe8a0d59950d88e

  Message:
    Don't use replicas.json
    
    Because the current droonga-engine-catalog-generate supports only
    replicas partially.

  Modified files:
    lib/wikipedia-search/task.rb

  Modified: lib/wikipedia-search/task.rb (+5 -18)
===================================================================
--- lib/wikipedia-search/task.rb    2014-07-17 23:22:21 +0900 (60d4313)
+++ lib/wikipedia-search/task.rb    2014-07-19 22:42:03 +0900 (032c19d)
@@ -234,30 +234,17 @@ module WikipediaSearch
     end
 
     def droonga_generate_catalog(node_id, node_ids)
-      replicas_path =****@path*****_working_dir(node_id) + "replicas.json"
-      replicas_path.open("w") do |replicas_file|
-        replicas = 2.times.collect do |i|
-          slices = node_ids.collect do |node_id|
-            host = droonga_host(node_id)
-            port = droonga_port
-            {
-              "volume" => {
-                "address" => "#{host}:#{port}/droonga.#{i}#{node_id}"
-              }
-            }
-          end
-          {
-            "slices" => slices,
-          }
-        end
-        replicas_file.puts(JSON.pretty_generate(replicas))
+      hosts = node_ids.collect do |node_id|
+        droonga_host(node_id)
       end
       sh("droonga-engine-catalog-generate",
          "--output", @path.droonga.catalog(node_id).to_s,
          "--n-workers", "3",
          "--schema", @path.droonga.schema.to_s,
          "--fact", "Pages",
-         "--replicas", replicas_path.to_s)
+         "--hosts", hosts.join(","),
+         "--port", droonga_port.to_s,
+         "--n-slices", "4")
     end
 
     def droonga_run_engine(node_id)
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index