fmcache 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3420398f6bb70d1972fe648bc4a880ac64bbc08d43cad850109b60a11cee4c38
-  data.tar.gz: 170a4ef45eaa1ebdb23b12abfa7d142792a33cbad1383c0470c2cabcfc202e2c
+  metadata.gz: 681a0559134840d7fb2a89c83adb8ccf2ab337d52ba3874da6a98b414ab8c90a
+  data.tar.gz: f4d2e887054ff80d5d72e75e29d8f4c945b6620f6fe35d4453a6a446705203ec
 SHA512:
-  metadata.gz: e633c361b62356812fcce2fcdab642b3678d444c063fe06497644146e3ad02fddfa5927664418c0bbdaf7b89c3835a8d8118bcca1b8e3cb92e9eeaeac823c739
-  data.tar.gz: 4ae7c3394bb79a1535f5eac8625b18ccbfd4f318a54e855e94dbe25584e46cb7e8d979beed88a06736d5131da73d4cebb481315e378217b5c74049d272d78ed0
+  metadata.gz: ad936f1afa79d39ae0b94c5eb64db9921e04888d5b84bd3a97e7e18a52a009960ce6601d8917a868eb6549fb867e0f5fee00b502a07870a6e2a965643b59a213
+  data.tar.gz: 8560db62119da8501bc671b900a06dc26fa600cb0cd8f5fc8cb304e0430ba894c14003002dff592b34da0da4d92ced535dc9476cae8b3615e19673896ba9c37a

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    fmcache (0.1.3)
-      field_mask_parser (~> 0.4.2)
+    fmcache (0.2.1)
+      field_mask_parser (~> 0.4.3)
 
 GEM
   remote: https://rubygems.org/
@@ -22,7 +22,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.3)
     diff-lcs (1.3)
-    field_mask_parser (0.4.2)
+    field_mask_parser (0.4.3)
     i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)

data/fmcache.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mock_redis", "~> 0.19"
   spec.add_development_dependency "redis", "~> 4.0"
   spec.add_development_dependency "activerecord", "~> 5.2"
-  spec.add_dependency "field_mask_parser", "~> 0.4.2"
+  spec.add_dependency "field_mask_parser", "~> 0.4.3"
 end

data/lib/fmcache/engine.rb

@@ -37,7 +37,12 @@ module FMCache
       keys   = Helper.to_keys(ids)
       fields = Helper.to_fields(field_mask)
       h = client.get(keys: keys, fields: fields)
-      decode(merge(@jsonizer.dejsonize(h), ids), field_mask)
+
+      with_id, with_no_id = split(h)
+      v, i_v, i_i = decode(@jsonizer.dejsonize(with_id), field_mask)
+      with_no_id_list = Helper.to_ids(with_no_id.keys)
+
+      return v, i_v, merge(i_i, with_no_id_list, field_mask)
     end
 
     # @param [<Integer | String>] ids
@@ -50,7 +55,7 @@ module FMCache
       normalize!(field_mask)
 
       values, incomplete_values, incomplete_info = read(ids: ids, field_mask: field_mask)
-      return values if incomplete_values.size == 0
+      return values if incomplete_info.ids.size == 0
 
       # NOTE: get new data
       d = block.call(incomplete_info.ids, incomplete_info.field_mask)
@@ -61,13 +66,16 @@ module FMCache
 
       v, i_v, i_i = decode(older.deep_merge(newer), field_mask)
 
-      # NOTE: Delete invalid data as read repair
-      client.hdel(
-        keys:   Helper.to_keys(i_i.ids),
-        fields: Helper.to_fields(i_i.field_mask),
-      )
+      if i_i.ids.size == 0
+        r = values + v + i_v
+      else
+        # NOTE: Fallback to block.call with full field_mask
+        d2 = block.call(i_i.ids, field_mask)
+        write(values: d2, field_mask: field_mask)
+        r = values + d2
+      end
 
-      Helper.sort(values + v + i_v, ids)
+      Helper.sort(r, ids)
     end
 
     # @param [<Integer | String>] ids
@@ -92,18 +100,6 @@ module FMCache
       encoder.encode(values, field_mask)
     end
 
-    # @param [{ String => { String => <Hash> } }] hash
-    # @param [<Integer>] ids
-    # @return [{ String => { String => <Hash> } }]
-    def merge(hash, ids)
-      # NOTE: Set `id` to list. json format must be consistent with Encoder and Decoder
-      ids.each do |id|
-        h = hash.fetch(Helper.to_key(id))
-        h.merge!({ "id" => [{ id: id, p_id: nil, value: id }] })
-      end
-      hash
-    end
-
     # @param [Proc] fm_parser
     # @return [Proc]
     def wrap(fm_parser)
@@ -123,5 +119,35 @@ module FMCache
         normalize!(a)
       end
     end
+
+    def split(h)
+      with_id    = {}
+      with_no_id = {}
+
+      h.each do |k, v|
+        if v.fetch("id").nil?
+          with_no_id[k] = v
+        else
+          with_id[k] = v
+        end
+      end
+
+      return with_id, with_no_id
+    end
+
+    # @param [IncompleteInfo] incomplete_info
+    # @param [<Integer>] with_no_id_list
+    # @param [FieldMaskParser::Node] field_mask
+    # @return [IncompleteInfo]
+    def merge(incomplete_info, with_no_id_list, field_mask)
+      if with_no_id_list.size == 0
+        return incomplete_info
+      end
+
+      ids = incomplete_info.ids + with_no_id_list
+      fields = Set.new(Helper.to_fields(incomplete_info.field_mask)) | Set.new(Helper.to_fields(field_mask))
+
+      IncompleteInfo.new(ids: ids, field_mask: fm_parser.call(fields))
+    end
   end
 end

data/lib/fmcache/helper.rb

@@ -1,5 +1,7 @@
 module FMCache
   class Helper
+    KEY_PREFIX = "fmcache:"
+
     class << self
       # @param [FieldMaskParser::Node] field_mask
       # @param [<Symbol>] prefix
@@ -17,7 +19,23 @@ module FMCache
       # @param [Integer] id
       # @return [String]
       def to_key(id)
-        "fmcache:#{id}"
+        "#{KEY_PREFIX}#{id}"
+      end
+
+      # @param [<String>] keys
+      # @return [<Integer>]
+      def to_ids(keys)
+        keys.map { |key| to_id(key) }
+      end
+
+      # @param [String] id
+      # @return [Integer]
+      def to_id(key)
+        if key[0..7] == KEY_PREFIX
+          key[8..-1].to_i
+        else
+          raise "invalid key: #{key}"
+        end
       end
 
       # @param [<Hash>] values

data/lib/fmcache/incomplete_info.rb

@@ -8,7 +8,8 @@ module FMCache
     attr_reader :ids, :field_mask
 
     def ==(other)
-      @ids == other.ids &&
+      self.class == other.class &&
+        @ids == other.ids &&
         @field_mask.to_paths == other.field_mask.to_paths
     end
 

data/lib/fmcache/version.rb

@@ -1,3 +1,3 @@
 module FMCache
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmcache
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 description: Library for caching json masked by FieldMask
 email:
 - south37777@gmail.com