mondrian_redis_segment_cache 0.4.3-java → 0.4.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88709a1d58722c160949477aa669a4dd4b44b2dc
-  data.tar.gz: 57329e543ccd6864700b83d01e7d3df21ba4f0fb
+  metadata.gz: 846739c7d8f7e615e241b6f87736edb84ff6389c
+  data.tar.gz: b85140550855920737f35be7b6c6e0148b0d5237
 SHA512:
-  metadata.gz: df69a5725f485e23119b0c878501a01e9bd98bacd744f972e6adc33cdb8def60b3c2ffe0693aebe20cb3b7626c8cf3b04f88788aa7fd3a2413bbea2ced7a215c
-  data.tar.gz: c9f30fec5cd3dbd0dc7eb906dee1279eb836ae341dc86e28ebff0bc54f97ebf110f261e067c51e5329e2b2b64176defd8fce6dfc9a3fc09af89bd15f5ed7fe59
+  metadata.gz: e82def47c87d8f0290a45b3106696d25a00e4ade0163916f95de5b0eff15eb120062f3d9ae1eb5921a81fb27a8ec9679aba9382cf0935ad54a4dd1177990e3ae
+  data.tar.gz: ce194dbc0961acd5bcec1a1e3a90a859216303386074fb8bb1e5091fa6a95840d95d4e07e71734076bef034873a0018db73d35865c0439ebe189326f0a4b0e7a

data/lib/mondrian_redis_segment_cache/cache.rb

@@ -104,8 +104,33 @@ module MondrianRedisSegmentCache
     end
 
     def reload
-      reconcile_set_and_keys
-      reconcile_local_set_with_redis
+      existing_hash_vals = ::Set.new
+
+      mondrian_redis.with do |connection|
+        connection.sscan_each(SEGMENT_HEADERS_SET_KEY) do |segment_header_base64|
+          unless connection.exists(segment_header_base64)
+            connection.srem(SEGMENT_HEADERS_SET_KEY, segment_header_base64)
+            next
+          end
+
+          existing_hash_vals << segment_header_base64.hash
+
+          unless local_cache_set.include?(segment_header_base64)
+            @local_cache_set << segment_header_base64
+            publish_created_to_listeners(segment_header_base64)
+          end
+        end
+      end
+
+      local_cache_set.select! do |segment|
+        unless existing_hash_vals.include?(segment.hash)
+          publish_deleted_to_listeners(segment)
+        end
+
+        existing_hash_vals.include?(segment.hash)
+      end
+
+      true
     end
 
     def remove(segment_header)
@@ -167,7 +192,7 @@ module MondrianRedisSegmentCache
     end
 
     def has_expiry?
-      options.has_key?(:ttl) || options.has_key?(:expires_at)
+      options.has_key?(:ttl) || options.has_key?(:expires_at) || options.has_key?(:expires) || options.has_key?(:expires_callback)
     end
 
     def publish_created_to_listener(message, listener)
@@ -200,49 +225,9 @@ module MondrianRedisSegmentCache
       end
     end
 
-    def reconcile_local_set_with_redis
-      remote_set = []
-
-      mondrian_redis.with do |connection|
-        connection.sscan_each(SEGMENT_HEADERS_SET_KEY) do |segment_header_base64|
-          remote_set << segment_header_base64
-        end
-      end
-
-      local_copy = []
-      local_cache_set.each { |value| local_copy << value }
-      remote_added_keys = remote_set - local_copy
-      remote_removed_keys = local_copy - remote_set
-
-      remote_added_keys.each do |remote_added_key|
-        @local_cache_set << remote_added_key
-        publish_created_to_listeners(remote_added_key)
-      end
-
-      remote_removed_keys.each do |remote_removed_key|
-        @local_cache_set.delete(remote_removed_key)
-        publish_deleted_to_listeners(remote_removed_key)
-      end
-    end
-
-    def reconcile_set_and_keys
-      headers = []
-      mondrian_redis.with do |connection|
-        connection.sscan_each(SEGMENT_HEADERS_SET_KEY) do |segment_header_base64|
-          headers << segment_header_base64
-        end
-      end
-
-      mondrian_redis.with do |connection|
-        headers.each do |header|
-          # Spin through Header Set and remove any keys that are not in redis at all (they may have been deleted while offline)
-          connection.srem(SEGMENT_HEADERS_SET_KEY, header) unless connection.exists(header)
-        end
-      end
-    end
-
     def segment_body_from_base64(segment_body_base64)
       return nil unless segment_body_base64
+      return nil if segment_body_base64.empty?
       return ::Java::MondrianSpi::SegmentBody.from_base64(segment_body_base64)
     rescue
       return nil
@@ -255,6 +240,7 @@ module MondrianRedisSegmentCache
 
     def segment_header_from_base64(segment_header_base64)
       return nil unless segment_header_base64
+      return nil if segment_header_base64.empty?
       return ::Java::MondrianSpi::SegmentHeader.from_base64(segment_header_base64)
     rescue
       return nil

data/lib/mondrian_redis_segment_cache/version.rb

@@ -1,3 +1,3 @@
 module MondrianRedisSegmentCache
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mondrian_redis_segment_cache
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: java
 authors:
 - Brandon Dewitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.9
 signing_key:
 specification_version: 4
 summary: Segment Cache for Mondrian written in JRuby with Redis as the cache store