sadie 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2491a41d00ecae062b1fc3b7c4d0ae719b6cfeb
-  data.tar.gz: e041a331e9cbaaa65927628590191188d913d906
+  metadata.gz: 1dfcdf40230ae04f9b2f48e4cb73aafd71fc8ac7
+  data.tar.gz: 7f6aaca2f1f58be905c70bb428d695c726f1b972
 SHA512:
-  metadata.gz: b884cc2dc571abb642daaf670dc264114d668b9799f108b32c1494e600f37f367fdb682872a48f999592ebc2a273f7cadefa789009dcfabc54e25eab7e42b919
-  data.tar.gz: 760fac48dbf4a93de8b9dc6d076c40e5219a1b5e68faa82ec59e05913adc5de888fdde220231b80397d9a33d0ed88234d51afdd46e6302bd0060201f4bf601fe
+  metadata.gz: e9668d2c48564497cabfa531bec49ae7178dd764fc897a1f24513c92c85b781fe3d18027e28f4007ecbd92e5eff7059be7c5d96470823a78bc05969c27c2191b
+  data.tar.gz: bf5835fdbcb385b8b3b6c7675908a0fcb1e78d91d921d2e0519ea27d6baef5e74a26ae172118d92e0309960fc8958496bf349e3f6e358b297ff03ddd6fbf88b3

data/CHANGELOG

@@ -27,4 +27,5 @@
 [0.0.52] code cleanup
 [0.1.01] ** ground-up rewrite, ignore everything before this line if you're not a historian **
 [0.1.8] new version now at capability pairing with old version.
-[0.1.9] added metadata for keys, abstracted expiry and refresh data structs into timestamp queues, abstracted various mutexes in session into lock manager object in preparation for distributed behavior
+[0.1.9] added metadata for keys, abstracted expiry and refresh data structs into timestamp queues, abstracted various mutexes in session into lock manager object in preparation for distributed behavior
+[0.1.10] added important lock to ensure that two threads (refresh and fetch, in this case, but will be more important in distributed case) cannot attempt to prime for the same key at the same time

data/README

@@ -60,8 +60,10 @@ Have a look at other primers in test/v2/test_installation/primers for more infor
 Now run the sadie server on whatever directory you set it up on:
 
   bin/sadie_server.rb --framework-dirpath=/var/sadie
+
+When the server starts up, because this primer is set to refresh automatically, it will prime this key and it will do so again every 300 seconds as long as the server is running.
   
-And you can make get requests on the keys,
+So now you can make GET requests on the keys,
 
   wget http://localhost:4567/test.expires.nsecs -O /tmp/outputfile
 
@@ -72,6 +74,20 @@ Or, you can use the sadie session in your Ruby code like this:
  
 That's it!
 
+==Caveat
+It's important to note that Sadie is going to be great for things like:
+* webscraping a pre-defined list of websites
+* digesting large datasets
+* log analysis
+
+but not so great for anything where you'd want to pass parameters to the querying function.
+
+So it'd be great for grabbing a list of all facebook users who've ever mentioned your name along with everything they've ever written, but it wouldn't be wonderful at grabbing everything some particular facebook user has ever written about you.
+
+Similarly, it'd be a wonderful tool for performing a statistical analysis on the game of baseball based on data from every baseball game ever played, but it's not well set up for you to ask it about a particular game (unless the game were of such interest that you took the time to write primers that were associated with that particular game).
+
+Of course, it is, at it's core, a key/value hash and, as such, you could use it to do such things as well as you could any other.  It is the primers that are limited, not the storage mechanism.
+
 ==Contribute
 Do it!  The github url for Sadie is at: [https://github.com/FredAtLandMetrics/sadie]
  

data/lib/lock_manager.rb

@@ -10,6 +10,9 @@ class LockManager
     systype = params[:systype].to_s
     locktype = params[:locktype].to_s
     lock_id = "#{systype}:#{locktype}"
+    if params.has_key?(:key)
+      lock_id += ":#{params[:key].to_s}"
+    end
     @locks[lock_id] = Mutex.new unless @locks.has_key?( lock_id )
     lock_id
   end
@@ -41,7 +44,7 @@ class LockManager
   def critical_section_try( lock_id )
     if block_given?
       if @locks.has_key?( lock_id )
-        if acquire( lock_id )
+        unless acquire( lock_id ).nil?
           yield
           release( lock_id )
         end

data/lib/sadie/version.rb

@@ -1,3 +1,3 @@
 class Sadie
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/sadie_session.rb

@@ -114,26 +114,47 @@ class SadieSession
   end
   
   def get( key )
+    ret = nil
     if @storage_manager.has_key?( key )
-      @storage_manager.get( key )
+      ret = @storage_manager.get( key )
     elsif primer_registered?( key )
-      p = Primer.new( :session => self )
-      p.decorate( @registered_key[ key ] )
-      if p.expire == :on_get
+      
+      @primer_lock = @lockmgr.create( :systype => :session,
+                                      :locktype => :primer,
+                                      :key => key )
+      p = nil
+      
+      @lockmgr.critical_section_try( @primer_lock ) do
+        p = _get_primed_primer( key )
         ret = @storage_manager.get( key )
-        @storage_manager.unset( key )
-        ret
-      elsif ( p.refreshes? )
-        _manage_refresh( key, p.refresh_rate )
-        @storage_manager.get( key )
-      else
-        @storage_manager.get( key )
+        if p.expire == :on_get
+          @storage_manager.unset( key )
+        end
+      end
+      if ! p.nil?
+        _manage_refresh( key, p.refresh_rate ) if ( p.refreshes? )
+      else 
+        @lockmgr.critical_section_insist( @primer_lock ) do
+          if @storage_manager.has_key?( key )
+            ret = @storage_manager.get( key )
+          else
+            ret = get( key )  # recurse should only happen if primer set to expire on get
+          end
+        end
       end
+      
     end
+    ret
   end
   
   private
   
+  def _get_primed_primer( key )
+    p = Primer.new( :session => self )
+    p.decorate( @registered_key[ key ] )
+    p
+  end
+  
   def _initialize_refresh_thread
     @refresh_thread = Thread.new do
       _refresh_loop

data/spec/sadie_session.rb

@@ -160,6 +160,13 @@ describe SadieSession do
     
   end
   
+  it "should not be possible to prime the same key more than once at the same time" do
+    val = @session.get("wait.primary")
+    sleep 1
+    val = @session.get("wait.primary")
+    ($max > 1).should be_false
+  end
+  
   # --- SLOW!
   if ENV.has_key?('SADIE_SESSION_TEST_TIMERS') && ENV['SADIE_SESSION_TEST_TIMERS'].to_i == 1
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadie
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Fred McDavid