Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-engine at 95963bd [master] Use meaningful variable name instead of a generic name "data"

YUKI Hiroshi null+****@clear*****
Thu Dec 11 16:14:40 JST 2014

• Previous message: [Groonga-commit] groonga/grnxx at 1375d63 [master] Add a benchmark for incremental sorting. (#42)
• Next message: [Groonga-commit] droonga/droonga-engine at 869b4b5 [master] Unify and simplify methods to collect routes to "compute_routes"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

YUKI Hiroshi	2014-12-11 16:14:40 +0900 (Thu, 11 Dec 2014)

  New Revision: 95963bd977509dd6a40021aa89ffc9e5be0b9e1b
  https://github.com/droonga/droonga-engine/commit/95963bd977509dd6a40021aa89ffc9e5be0b9e1b

  Merged e0f9f34: Merge pull request #30 from piroor/replicas-in-a-branch

  Message:
    Use meaningful variable name instead of a generic name "data"

  Modified files:
    lib/droonga/catalog/base.rb
    lib/droonga/catalog/dataset.rb
    lib/droonga/catalog/replicas_volume.rb
    lib/droonga/catalog/single_volume.rb
    lib/droonga/catalog/slice.rb
    lib/droonga/catalog/slices_volume.rb
    lib/droonga/catalog/version1.rb
    lib/droonga/catalog/version2.rb
    lib/droonga/catalog/version2_validator.rb

  Modified: lib/droonga/catalog/base.rb (+2 -2)
===================================================================
--- lib/droonga/catalog/base.rb    2014-12-05 15:52:41 +0900 (8c05b60)
+++ lib/droonga/catalog/base.rb    2014-12-11 16:14:40 +0900 (c2dbdee)
@@ -24,8 +24,8 @@ module Droonga
   module Catalog
     class Base
       attr_reader :path, :base_path
-      def initialize(data, path)
-        @data = data
+      def initialize(raw_catalog, path)
+        @raw_catalog = raw_catalog
         @path = path
         @base_path = File.dirname(path)
       end

  Modified: lib/droonga/catalog/dataset.rb (+9 -9)
===================================================================
--- lib/droonga/catalog/dataset.rb    2014-12-05 15:52:41 +0900 (4c985f4)
+++ lib/droonga/catalog/dataset.rb    2014-12-11 16:14:40 +0900 (f74136c)
@@ -23,36 +23,36 @@ module Droonga
 
       attr_reader :name
 
-      def initialize(name, data)
+      def initialize(name, raw_dataset)
         @name = name
-        @data = data
+        @raw_dataset = raw_dataset
         @schema = nil
       end
 
       # provided for compatibility
       def [](key)
-        @data[key]
+        @raw_dataset[key]
       end
 
       # provided for compatibility
       def []=(key, value)
-        @data[key] = value
+        @raw_dataset[key] = value
       end
 
       def schema
-        @schema ||= Schema.new(@name, @data["schema"])
+        @schema ||= Schema.new(@name, @raw_dataset["schema"])
       end
 
       def plugins
-        @data["plugins"] || []
+        @raw_dataset["plugins"] || []
       end
 
       def fact
-        @data["fact"]
+        @raw_dataset["fact"]
       end
 
       def n_workers
-        @data["nWorkers"] || 0
+        @raw_dataset["nWorkers"] || 0
       end
 
       #XXX Currently, dataset has a property named "replicas" so
@@ -60,7 +60,7 @@ module Droonga
       #    We must introduce a new property "volume" to provide
       #    ReplicasVolume safely.
       def replicas
-        @replicas ||= ReplicasVolume.new(self, @data)
+        @replicas ||= ReplicasVolume.new(self, @raw_dataset)
       end
 
       def all_nodes

  Modified: lib/droonga/catalog/replicas_volume.rb (+7 -7)
===================================================================
--- lib/droonga/catalog/replicas_volume.rb    2014-12-05 15:52:41 +0900 (0fe2ded)
+++ lib/droonga/catalog/replicas_volume.rb    2014-12-11 16:14:40 +0900 (c952c3d)
@@ -18,18 +18,18 @@ module Droonga
     class ReplicasVolume
       include Enumerable
 
-      def initialize(dataset, data)
+      def initialize(dataset, raw_volume)
         @dataset = dataset
 
-        if data.is_a?(Hash) and data.key?("replicas")
-          @data     = data
-          @volumes = @data["replicas"].collect do |raw_volume|
+        if raw_volume.is_a?(Hash) and raw_volume.key?("replicas")
+          @raw_volume = raw_volume
+          @volumes = @raw_volume["replicas"].collect do |raw_volume|
             Catalog::Volume.create(dataset, raw_volume)
           end
-        elsif data.is_a?(Array)
-          @volumes = data
+        elsif raw_volume.is_a?(Array)
+          @volumes = raw_volume
         else
-          raise ArgumentError.new(data)
+          raise ArgumentError.new(raw_volume)
         end
       end
 

  Modified: lib/droonga/catalog/single_volume.rb (+3 -3)
===================================================================
--- lib/droonga/catalog/single_volume.rb    2014-12-05 15:52:41 +0900 (de26a20)
+++ lib/droonga/catalog/single_volume.rb    2014-12-11 16:14:40 +0900 (54bcc43)
@@ -19,9 +19,9 @@ module Droonga
   module Catalog
     class SingleVolume
       attr_reader :address
-      def initialize(data)
-        @data = data
-        @address = Address.parse(@data["address"])
+      def initialize(raw_volume)
+        @raw_volume = raw_volume
+        @address = Address.parse(@raw_volume["address"])
       end
 
       def node

  Modified: lib/droonga/catalog/slice.rb (+6 -6)
===================================================================
--- lib/droonga/catalog/slice.rb    2014-12-05 15:52:41 +0900 (2a558e3)
+++ lib/droonga/catalog/slice.rb    2014-12-11 16:14:40 +0900 (6785630)
@@ -16,25 +16,25 @@
 module Droonga
   module Catalog
     class Slice
-      def initialize(dataset, data)
+      def initialize(dataset, raw_slice)
         @dataset = dataset
-        @data = data
+        @raw_slice = raw_slice
       end
 
       def weight
-        @data["weight"] || 1
+        @raw_slice["weight"] || 1
       end
 
       def label
-        @data["label"]
+        @raw_slice["label"]
       end
 
       def boundary
-        @data["boundary"]
+        @raw_slice["boundary"]
       end
 
       def volume
-        @volume ||= Catalog::Volume.create(@dataset, @data["volume"])
+        @volume ||= Catalog::Volume.create(@dataset, @raw_slice["volume"])
       end
 
       def replicas

  Modified: lib/droonga/catalog/slices_volume.rb (+5 -5)
===================================================================
--- lib/droonga/catalog/slices_volume.rb    2014-12-05 15:52:41 +0900 (8c62207)
+++ lib/droonga/catalog/slices_volume.rb    2014-12-11 16:14:40 +0900 (8105a33)
@@ -21,18 +21,18 @@ require "droonga/catalog/slice"
 module Droonga
   module Catalog
     class SlicesVolume
-      def initialize(dataset, data)
+      def initialize(dataset, raw_volume)
         @dataset = dataset
-        @data = data
+        @raw_volume = raw_volume
         compute_continuum if ratio_scaled_slicer?
       end
 
       def dimension
-        @data["dimension"] || "_key"
+        @raw_volume["dimension"] || "_key"
       end
 
       def slicer
-        @data["slicer"] || "hash"
+        @raw_volume["slicer"] || "hash"
       end
 
       def slices
@@ -124,7 +124,7 @@ module Droonga
       end
 
       def create_slices
-        @data["slices"].collect do |raw_slice|
+        @raw_volume["slices"].collect do |raw_slice|
           Slice.new(@dataset, raw_slice)
         end
       end

  Modified: lib/droonga/catalog/version1.rb (+17 -17)
===================================================================
--- lib/droonga/catalog/version1.rb    2014-12-05 15:52:41 +0900 (87cadae)
+++ lib/droonga/catalog/version1.rb    2014-12-11 16:14:40 +0900 (32014c0)
@@ -23,7 +23,7 @@ require "droonga/catalog/dataset"
 module Droonga
   module Catalog
     class Version1 < Base
-      def initialize(data, path)
+      def initialize(raw_catalog, path)
         super
         @errors = []
 
@@ -42,10 +42,10 @@ module Droonga
       end
 
       def get_partitions(name)
-        device = @data["farms"][name]["device"]
+        device = @raw_catalog["farms"][name]["device"]
         pattern = Regexp.new("^#{name}\.")
         results = {}
-        @data["datasets"].each do |dataset_name, dataset_data|
+        @raw_catalog["datasets"].each do |dataset_name, dataset_data|
           dataset = Dataset.new(dataset_name, dataset_data)
           workers = dataset["workers"]
           plugins = dataset["plugins"]
@@ -79,7 +79,7 @@ module Droonga
       private
       def prepare_data
         @datasets = {}
-        @data["datasets"].each do |name, dataset|
+        @raw_catalog["datasets"].each do |name, dataset|
           @datasets[name] = Dataset.new(name, dataset)
           number_of_partitions = dataset["number_of_partitions"]
           next if number_of_partitions < 2
@@ -94,7 +94,7 @@ module Droonga
           end
           dataset["continuum"] = continuum.sort do |a, b| a[0] - b[0]; end
         end
-        @options = @data["options"] || {}
+        @options = @raw_catalog["options"] || {}
       end
 
       def compute_total_weight(dataset)
@@ -104,7 +104,7 @@ module Droonga
       end
 
       def collect_all_nodes
-        @data["zones"].sort
+        @raw_catalog["zones"].sort
       end
 
       def validate
@@ -190,13 +190,13 @@ module Droonga
       end
 
       def validate_effective_date
-        date = @data["effective_date"]
+        date = @raw_catalog["effective_date"]
         validate_required_parameter(date, "effective_date")
         validate_valid_datetime(date, "effective_date")
       end
 
       def validate_farms
-        farms = @data["farms"]
+        farms = @raw_catalog["farms"]
 
         validate_required_parameter(farms, "farms")
         validate_parameter_type(Hash, farms, "farms")
@@ -214,7 +214,7 @@ module Droonga
       end
 
       def validate_zones
-        zones = @data["zones"]
+        zones = @raw_catalog["zones"]
 
         validate_required_parameter(zones, "zones")
         validate_parameter_type(Array, zones, "zones")
@@ -236,7 +236,7 @@ module Droonga
       end
 
       def validate_datasets
-        datasets = @data["datasets"]
+        datasets = @raw_catalog["datasets"]
 
         validate_required_parameter(datasets, "datasets")
         validate_parameter_type(Hash, datasets, "datasets")
@@ -328,11 +328,11 @@ module Droonga
       end
 
       def validate_zone_relations
-        return unless @data["zones"].is_a?(Array)
-        return unless @data["farms"].is_a?(Hash)
+        return unless @raw_catalog["zones"].is_a?(Array)
+        return unless @raw_catalog["farms"].is_a?(Hash)
 
-        farms = @data["farms"]
-        zones = @data["zones"]
+        farms = @raw_catalog["farms"]
+        zones = @raw_catalog["zones"]
 
         all_farms = farms.keys
         all_zones = zones.flatten
@@ -351,14 +351,14 @@ module Droonga
       end
 
       def validate_database_relations
-        return unless @data["farms"]
+        return unless @raw_catalog["farms"]
 
-        farm_names = @data["farms"].keys.collect do |name|
+        farm_names = @raw_catalog["farms"].keys.collect do |name|
           Regexp.escape(name)
         end
         valid_farms_matcher = Regexp.new("^(#{farm_names.join("|")})\.")
 
-        @data["datasets"].each do |dataset_name, dataset|
+        @raw_catalog["datasets"].each do |dataset_name, dataset|
           ring = dataset["ring"]
           next if ring.nil? or !ring.is_a?(Hash)
           ring.each do |ring_key, part|

  Modified: lib/droonga/catalog/version2.rb (+3 -3)
===================================================================
--- lib/droonga/catalog/version2.rb    2014-12-05 15:52:41 +0900 (2561b65)
+++ lib/droonga/catalog/version2.rb    2014-12-11 16:14:40 +0900 (be46cba)
@@ -24,7 +24,7 @@ require "droonga/catalog/version2_validator"
 module Droonga
   module Catalog
     class Version2 < Base
-      def initialize(data, path)
+      def initialize(raw_catalog, path)
         super
         validate
         prepare_data
@@ -69,13 +69,13 @@ module Droonga
 
       private
       def validate
-        validator = Version2Validator.new(@data, @path)
+        validator = Version2Validator.new(@raw_catalog, @path)
         validator.validate
       end
 
       def prepare_data
         @datasets = {}
-        @data["datasets"].each do |name, dataset|
+        @raw_catalog["datasets"].each do |name, dataset|
           @datasets[name] = Dataset.new(name, dataset)
         end
       end

  Modified: lib/droonga/catalog/version2_validator.rb (+4 -4)
===================================================================
--- lib/droonga/catalog/version2_validator.rb    2014-12-05 15:52:41 +0900 (4ad1a72)
+++ lib/droonga/catalog/version2_validator.rb    2014-12-11 16:14:40 +0900 (ed6beae)
@@ -18,8 +18,8 @@ require "droonga/catalog/errors"
 module Droonga
   module Catalog
     class Version2Validator
-      def initialize(data, path)
-        @data = data
+      def initialize(raw_catalog, path)
+        @raw_catalog = raw_catalog
         @path = path
       end
 
@@ -35,11 +35,11 @@ module Droonga
 
       private
       def validate_datasets
-        unles****@data*****?("datasets")
+        unless @raw_catalog.key?("datasets")
           required_parameter_is_missing("datasets")
           return
         end
-        @data["datasets"].each do |name, dataset|
+        @raw_catalog["datasets"].each do |name, dataset|
           validate_dataset(name, dataset)
         end
       end
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/grnxx at 1375d63 [master] Add a benchmark for incremental sorting. (#42)
• Next message: [Groonga-commit] droonga/droonga-engine at 869b4b5 [master] Unify and simplify methods to collect routes to "compute_routes"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]