mondrian_redis_segment_cache 0.0.4-java → 0.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5037596f5c1489481ba34ee7cdbdfefa8a5ae1b9
-  data.tar.gz: f5c3b7fd0c3d5f900d71274266f8c921cc2aca7d
+  metadata.gz: 4f9d1865c577a8c64f5d69abb17c1e20f85f26a6
+  data.tar.gz: fd0c08ed86a8d88a0843523fba32cb7f316e1ff2
 SHA512:
-  metadata.gz: 63618da9eb4cf34f3863e3d77611c518e9abb16bf6d912256ed924dd9a247287b900ed9acb2f92f606abefbcaece3c30c243c1faa50dac22d0151aaefd7b4ca5
-  data.tar.gz: 9267d27e4b9897c1f5bd657b626da7edaeb53b48120b5f5f3e9f8424c491b2aced2ada7e42c469f8fe78fc982cfc51831795e2bc73e770d6adf29a0cb849c09e
+  metadata.gz: b9412cfff753f5ff105ad6e89a2e0232c9253fa5a20bd182f031f88acaa30424b5b1a23d653134436cb2449a65f87d98e654d2041962fb9dcd28578c244f4c14
+  data.tar.gz: b1ab22bd6e88bb7b440fbe4acd5323607ab6ca5afcef2c5686560f62f1f498a21059253b4abc8b8e113a87de47debfffd33215dd05011839051e225099771596

data/lib/mondrian_redis_segment_cache/cache.rb

@@ -6,20 +6,22 @@ module MondrianRedisSegmentCache
   class Cache
     include Java::MondrianSpi::SegmentCache
 
-    attr_reader :mondrian_redis, :listeners, :created_listener_connection, :deleted_listener_connection
+    attr_reader :created_listener_connection, :deleted_listener_connection, :listeners, :mondrian_redis, :options
 
     SEGMENT_HEADERS_SET_KEY = "MONDRIAN_SEGMENT_HEADERS_SET"
 
     ##
     # Constructor
     #
-    def initialize(mondrian_redis_connection)
+    def initialize(mondrian_redis_connection, new_options = {})
       @mondrian_redis = mondrian_redis_connection
       @created_listener_connection = ::Redis.new(client_options)
       @deleted_listener_connection = ::Redis.new(client_options)
+      @options = Marshal.load(Marshal.dump(new_options))
 
       reset_listeners
       register_for_redis_events
+      reconcile_set_and_keys
     end
 
     ##
@@ -27,6 +29,7 @@ module MondrianRedisSegmentCache
     #
     def addListener(segment_cache_listener)
       listeners << segment_cache_listener
+      eager_load_listener(segment_cache_listener)
     end
 
     # returns boolean
@@ -50,6 +53,13 @@ module MondrianRedisSegmentCache
       @created_event_key ||= "__keyevent@#{client_options[:db]}__:del"
     end
 
+    def eager_load_listener(listener)
+      segment_headers_base64 = mondrian_redis.smembers(SEGMENT_HEADERS_SET_KEY)
+      segment_headers_base64.each do |segment_header_base64|
+        publish_created_to_listener(segment_header_base64, listener)
+      end
+    end
+
     # returns mondrian.spi.SegmentBody
     # takes mondrian.spi.SegmentHeader
     def get(segment_header)
@@ -79,25 +89,38 @@ module MondrianRedisSegmentCache
       return segment_headers
     end
 
-    def publish_created_to_listeners(message)
+    def publish_created_to_listener(message, listener)
       segment_header = segment_header_from_base64(message)
 
       if segment_header
-        listeners.each do |listener|
-          created_event = ::MondrianRedisSegmentCache::CreatedEvent.new(segment_header)
-          listener.handle(created_event)
-        end
+        created_event = ::MondrianRedisSegmentCache::CreatedEvent.new(segment_header)
+        listener.handle(created_event)
       end
     end
 
-    def publish_deleted_to_listeners(message)
+    def publish_created_to_listeners(message)
+      listeners.each do |listener|
+        publish_created_to_listener(message, listener)
+      end
+    end
+
+    def publish_deleted_to_listener(message, listener)
       segment_header = segment_header_from_base64(message)
 
       if segment_header
-        listeners.each do |listener|
-          deleted_event = ::MondrianRedisSegmentCache::DeletedEvent.new(segment_header)
-          listener.handle(deleted_event)
-        end
+        deleted_event = ::MondrianRedisSegmentCache::DeletedEvent.new(segment_header)
+        listener.handle(deleted_event)
+      end
+    end
+
+    def publish_deleted_to_listeners(message)
+      listeners.each do |listener|
+        publish_deleted_to_listener(message, listener)
+      end
+
+      # Each server can tell the Set to remove the key as it may be expired
+      if mondrian_redis.sismember(SEGMENT_HEADERS_SET_KEY, message)
+        mondrian_redis.srem(SEGMENT_HEADERS_SET_KEY, message)
       end
     end
 
@@ -106,9 +129,14 @@ module MondrianRedisSegmentCache
       header_base64 = segment_header_to_base64(segment_header)
       body_base64 = segment_body_to_base64(segment_body)
       mondrian_redis.sadd(SEGMENT_HEADERS_SET_KEY, header_base64)
-      set_success = mondrian_redis.set(header_base64, body_base64)
+      
+      if options[:ttl]
+        set_success = mondrian_redis.set(header_base64, body_base64, :ex => options[:ttl])
+      else
+        set_success = mondrian_redis.set(header_base64, body_base64)
+      end
 
-      return (set_success == "OK" || set_success == true) # weird polymorphic return ?
+      return ("#{set_success}".upcase == "OK" || set_success == true) # weird polymorphic return ?
     end
 
     def remove(segment_header)
@@ -133,13 +161,15 @@ module MondrianRedisSegmentCache
     end
 
     def tearDown()
-      # Remove all of the headers and the set that controls them
-      segment_headers_base64 = mondrian_redis.smembers(SEGMENT_HEADERS_SET_KEY)
-      segment_headers_base64.each do |segment_header_base64|
-        mondrian_redis.del(segment_header_base64)
-      end
+      if options[:delete_all_on_tear_down]
+        # Remove all of the headers and the set that controls them
+        segment_headers_base64 = mondrian_redis.smembers(SEGMENT_HEADERS_SET_KEY)
+        segment_headers_base64.each do |segment_header_base64|
+          mondrian_redis.del(segment_header_base64)
+        end
 
-      mondrian_redis.del(SEGMENT_HEADERS_SET_KEY)
+        mondrian_redis.del(SEGMENT_HEADERS_SET_KEY)
+      end
     end
 
     private
@@ -160,6 +190,17 @@ module MondrianRedisSegmentCache
       return mondrian_redis.client.options
     end
 
+    def reconcile_set_and_keys
+      segment_headers_base64 = mondrian_redis.smembers(SEGMENT_HEADERS_SET_KEY)
+
+      segment_headers_base64.each do |segment_header_base64|
+        # Spin through Header Set and remove any keys that are not in redis at all (they may have been deleted while offline)
+        unless mondrian_redis.exists(header_base64)
+          mondrian_redis.srem(SEGMENT_HEADERS_SET_KEY, message)
+        end
+      end
+    end
+
     def register_for_redis_events
       return if @listeners_registered
 

data/lib/mondrian_redis_segment_cache/version.rb

@@ -1,3 +1,3 @@
 module MondrianRedisSegmentCache
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mondrian_redis_segment_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: java
 authors:
 - Brandon Dewitt