mondrian_redis_segment_cache 0.1.1-java → 0.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b62e31e45c942bb6005ee4fdd6b15c55f11374f
-  data.tar.gz: bb0ef55a4e73c6ad13f73a0aaf2d8350f573132f
+  metadata.gz: 896185519afb0d52f37a79e5025257bdf5dfbc5c
+  data.tar.gz: 1bb17d24bf9ff9b6e93a43ab6eea7b3d819bc937
 SHA512:
-  metadata.gz: 5ba18069f409a17f43d7f19d514534b89205af1ac5c68fe5dffc58687079805a047e8d4d0ca4dfc1cfe4d66beb82212f0d41f448383c8c32236c0b619bff0e0f
-  data.tar.gz: fc48d6c75ec2c253aca7aa4ba39428858fef4dd08afee56c6a2c9f290b1a5d7b8e0012b4fff7b2a59b2ca5ab4d04a9a0d775aec05b54067d22f2e6e38b4b9e97
+  metadata.gz: 800116baba8a0b27f294f247543e81a970f5d73926e68e98ae3e03c48f77dd3aa59667b3ccf49d7d0ea3feb68d13988fa67e8f883d429e02181f320e247ae412
+  data.tar.gz: 33828588996fb1ac33f1d7d598de0b8949c8ffe7f5845e1823556ab9c2db3bbcca0de964e65b8f52f9a6b43f845ae11341a9a44c82f51f4688c1b2209d9b868d

data/README.md

@@ -65,8 +65,9 @@ Cache expiry is handled by the options `:ttl` and `:expires_at`
 If you want a static ttl (time to live) then each key that is inserted will be set to expire after the ttl completes.  This is
 not always optimal for an analytics cache and you may want all keys to expire at the same time (potentially on a daily basis).
 
-If you want all keys to expire at the same time you should use `:expires_at` in the options hash. This should be the hour that
-you want all keys to expire on.  1 being 1am, 2 being 2am, 15 being 3pm and so on.
+If you want all keys to expire at the same time you should use `:expires_at` in the options hash. This should either be the hour
+that you want all keys to expire on, or a `Time` object with a custom time. If you use `:expires_at` as an hour of expiration then
+1 is 1am, 2 is 2am, 15 is 3pm and so on.
 
 
 ## Contributing

data/lib/mondrian_redis_segment_cache/cache.rb

@@ -7,12 +7,16 @@ module MondrianRedisSegmentCache
     include Java::MondrianSpi::SegmentCache
 
     attr_reader :created_listener_connection,
-                :deleted_listener_connection,
-                :evicted_listener_connection,
-                :expired_listener_connection,
-                :listeners,
-                :mondrian_redis,
-                :options
+      :deleted_listener_connection,
+      :evicted_listener_connection,
+      :expired_listener_connection,
+      :created_listener_thread,
+      :deleted_listener_thread,
+      :evicted_listener_thread,
+      :expired_listener_thread,
+      :listeners,
+      :mondrian_redis,
+      :options
 
     SEGMENT_HEADERS_SET_KEY = "MONDRIAN_SEGMENT_HEADERS_SET"
 
@@ -111,12 +115,16 @@ module MondrianRedisSegmentCache
         created_event = ::MondrianRedisSegmentCache::CreatedEvent.new(segment_header)
         listener.handle(created_event)
       end
+
+      check_listener_threads
     end
 
     def publish_created_to_listeners(message)
       listeners.each do |listener|
         publish_created_to_listener(message, listener)
       end
+
+      check_listener_threads
     end
 
     def publish_deleted_to_listener(message, listener)
@@ -126,6 +134,8 @@ module MondrianRedisSegmentCache
         deleted_event = ::MondrianRedisSegmentCache::DeletedEvent.new(segment_header)
         listener.handle(deleted_event)
       end
+
+      check_listener_threads
     end
 
     def publish_deleted_to_listeners(message)
@@ -137,6 +147,8 @@ module MondrianRedisSegmentCache
       if mondrian_redis.sismember(SEGMENT_HEADERS_SET_KEY, message)
         mondrian_redis.srem(SEGMENT_HEADERS_SET_KEY, message)
       end
+
+      check_listener_threads
     end
     alias_method :publish_evicted_to_listeners, :publish_deleted_to_listeners
     alias_method :publish_expired_to_listeners, :publish_deleted_to_listeners
@@ -175,11 +187,14 @@ module MondrianRedisSegmentCache
 
     def shutdown!
       # Ouch, why so harsh?
-      @redis_events_threads.map(&:kill)
+      created_listener_thread.kill if created_listener_thread && created_listener_thread.alive?
+      deleted_listener_thread.kill if deleted_listener_thread && deleted_listener_thread.alive?
+      evicted_listener_thread.kill if evicted_listener_thread && evicted_listener_thread.alive?
+      expired_listener_thread.kill if expired_listener_thread && expired_listener_thread.alive?
     end
 
     def start
-      register_for_redis_events
+      check_listener_threads
     end
 
     def supportsRichIndex()
@@ -202,6 +217,13 @@ module MondrianRedisSegmentCache
     ##
     # Private Instance Methods
     #
+    def check_listener_threads
+      register_created_listener if !created_listener_thread.respond_to?(:alive?) || !created_listener_thread.alive?
+      register_deleted_listener if !deleted_listener_thread.respond_to?(:alive?) || !deleted_listener_thread.alive?
+      register_expired_listener if !expired_listener_thread.respond_to?(:alive?) || !expired_listener_thread.alive?
+      register_evicted_listener if !evicted_listener_thread.respond_to?(:alive?) || !evicted_listener_thread.alive?
+    end
+
     def client_options
       # Redis 3.0.4 does not have options where 3.1 does
       unless mondrian_redis.client.respond_to?(:options)
@@ -219,7 +241,14 @@ module MondrianRedisSegmentCache
       return options[:ttl] if options[:ttl]
 
       now = Time.now
-      difference_from_now = now.to_i - Time.new(now.year, now.month, now.day, options[:expires_at]).to_i
+
+      if options[:expires_at].is_a?(::Time)
+        expires_at = options[:expires_at]
+      else
+        expires_at = ::Time.new(now.year, now.month, now.day, options[:expires_at])
+      end
+
+      difference_from_now = now.to_i - expires_at.to_i
 
       until difference_from_now > 0 do
         difference_from_now = difference_from_now + 86_400 # already passed today, move to time tomorrow
@@ -241,48 +270,47 @@ module MondrianRedisSegmentCache
       end
     end
 
-    def register_for_redis_events
-      return if @listeners_registered
-
-      # Not the best multi-threaded code, but its something that "works" for now and we will
-      # worry about "best" later
-      @redis_events_threads = []
-
-      @redis_events_threads << Thread.new(created_listener_connection, self) do |created_redis_connection, mondrian_cache|
+    def register_created_listener
+      @created_listener_thread = Thread.new(created_listener_connection, self) do |created_redis_connection, mondrian_cache|
         created_redis_connection.subscribe(mondrian_cache.created_event_key) do |on|
           on.message do |channel, message|
             mondrian_cache.publish_created_to_listeners(message)
           end
         end
       end
+    end
 
-      @redis_events_threads << Thread.new(deleted_listener_connection, self) do |deleted_redis_connection, mondrian_cache|
+    def register_deleted_listener
+      @deleted_listener_thread = Thread.new(deleted_listener_connection, self) do |deleted_redis_connection, mondrian_cache|
         deleted_redis_connection.subscribe(mondrian_cache.deleted_event_key) do |on|
           on.message do |channel, message|
             mondrian_cache.publish_deleted_to_listeners(message)
           end
         end
       end
+    end
 
-      @redis_events_threads << Thread.new(expired_listener_connection, self) do |expired_redis_connection, mondrian_cache|
+    def register_expired_listener
+      @expired_listener_thread = Thread.new(expired_listener_connection, self) do |expired_redis_connection, mondrian_cache|
         expired_redis_connection.subscribe(mondrian_cache.expired_event_key) do |on|
           on.message do |channel, message|
             mondrian_cache.publish_expired_to_listeners(message)
           end
         end
       end
+    end
 
-      @redis_events_threads << Thread.new(evicted_listener_connection, self) do |evicted_redis_connection, mondrian_cache|
+    def register_evicted_listener
+      @evicted_listener_thread = Thread.new(evicted_listener_connection, self) do |evicted_redis_connection, mondrian_cache|
         evicted_redis_connection.subscribe(mondrian_cache.evicted_event_key) do |on|
           on.message do |channel, message|
             mondrian_cache.publish_evicted_to_listeners(message)
           end
         end
       end
-
-      @listeners_registered = true
     end
 
+
     def segment_body_from_base64(segment_body_base64)
       return nil unless segment_body_base64
       return ::Java::MondrianSpi::SegmentBody.from_base64(segment_body_base64)

data/lib/mondrian_redis_segment_cache/version.rb

@@ -1,3 +1,3 @@
 module MondrianRedisSegmentCache
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mondrian_redis_segment_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: java
 authors:
 - Brandon Dewitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis