Navigation Menu

Skip to content

Commit

Permalink
Move CatalogGenerator to Catalog::Generator
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 15, 2015
1 parent be7210a commit a3d2c8b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
Expand Up @@ -19,7 +19,8 @@
require "droonga/catalog/dataset"

module Droonga
class CatalogGenerator
module Catalog
class Generator
DEFAULT_DATASET = Catalog::Dataset::DEFAULT_NAME
DEFAULT_HOSTS = [NodeName::DEFAULT_HOST]
DEFAULT_N_WORKERS = 4
Expand Down Expand Up @@ -240,4 +241,5 @@ def weight
end
end
end
end
end
4 changes: 2 additions & 2 deletions lib/droonga/catalog_modifier.rb
Expand Up @@ -16,13 +16,13 @@
require "json"

require "droonga/path"
require "droonga/catalog_generator"
require "droonga/catalog/generator"
require "droonga/safe_file_writer"

module Droonga
class CatalogModifier
def initialize(source_catalog)
@generator = CatalogGenerator.new
@generator = Catalog::Generator.new
@generator.load(source_catalog)
end

Expand Down
4 changes: 2 additions & 2 deletions lib/droonga/command/remote.rb
Expand Up @@ -19,7 +19,7 @@
require "droonga/serf"
require "droonga/node_name"
require "droonga/node_metadata"
require "droonga/catalog_generator"
require "droonga/catalog/generator"
require "droonga/catalog_modifier"
require "droonga/catalog_fetcher"
require "droonga/data_absorber"
Expand Down Expand Up @@ -208,7 +208,7 @@ def join_as_replica
end

def replica_hosts
generator = CatalogGenerator.new
generator = Catalog::Generator.new
generator.load(catalog)
dataset = generator.dataset_for_host(source_host) ||
generator.dataset_for_host(host)
Expand Down
4 changes: 2 additions & 2 deletions lib/droonga/data_absorber_client.rb
Expand Up @@ -17,7 +17,7 @@
require "droonga/node_name"
require "droonga/catalog/dataset"
require "droonga/client"
require "droonga/catalog_generator"
require "droonga/catalog/generator"
require "droonga/catalog_fetcher"

module Droonga
Expand Down Expand Up @@ -153,7 +153,7 @@ def source_replica_hosts
end

def get_source_replica_hosts
generator = CatalogGenerator.new
generator = Catalog::Generator.new
generator.load(source_catalog)
dataset = generator.dataset_for_host(@source_host)
return [] unless dataset
Expand Down

0 comments on commit a3d2c8b

Please sign in to comment.