litestack 0.1.6 → 0.1.8

data/lib/litestack/litequeue.rb

@@ -52,8 +52,11 @@ class Litequeue
   alias_method :"<<", :push
   
   # pop an item from the queue, optionally with a specific queue name (default queue name is 'default')
-  def pop(queue='default')
-    @queue.acquire {|q| q.stmts[:pop].execute!(queue)[0] }
+  def pop(queue='default', limit = 1)
+   res = @queue.acquire {|q| res = q.stmts[:pop].execute!(queue, limit) }
+   return res[0] if res.length == 1
+   return nil if res.empty?
+   res
   end
   
   # delete an item from the queue
@@ -62,7 +65,7 @@ class Litequeue
   #   queue.delete(id) # => "somevalue"
   #   queue.pop # => nil
   def delete(id, queue='default')
-    fire_at, id = id.split("_")
+    fire_at, id = id.split("-")
     result = @queue.acquire{|q| q.stmts[:delete].execute!(queue, fire_at.to_i, id)[0] } 
   end
   
@@ -80,6 +83,13 @@ class Litequeue
   def size
     @queue.acquire{|q| q.get_first_value("SELECT size.page_size * count.page_count FROM pragma_page_size() AS size, pragma_page_count() AS count") }
   end
+  
+  def close
+    @queue.acquire do |q| 
+      q.stmts.each_pair {|k, v| q.stmts[k].close }
+      q.close
+    end
+  end
 
   private  
   
@@ -90,7 +100,7 @@ class Litequeue
     db.mmap_size = @options[:mmap_size]
     db.execute("CREATE TABLE IF NOT EXISTS _ul_queue_(queue TEXT DEFAULT('default') NOT NULL ON CONFLICT REPLACE, fire_at INTEGER DEFAULT(unixepoch()) NOT NULL ON CONFLICT REPLACE, id TEXT DEFAULT(hex(randomblob(8)) || (strftime('%f') * 100)) NOT NULL ON CONFLICT REPLACE, value TEXT, created_at INTEGER DEFAULT(unixepoch()) NOT NULL ON CONFLICT REPLACE, PRIMARY KEY(queue, fire_at ASC, id) ) WITHOUT ROWID")
     db.stmts[:push] = db.prepare("INSERT INTO _ul_queue_(queue, fire_at, value) VALUES ($1, (strftime('%s') + $2), $3) RETURNING fire_at || '-' || id")
-    db.stmts[:pop] = db.prepare("DELETE FROM _ul_queue_ WHERE (queue, fire_at, id) = (SELECT queue, min(fire_at), id FROM _ul_queue_ WHERE queue = ifnull($1, 'default') AND fire_at <= (unixepoch()) limit 1) RETURNING fire_at || '-' || id, value")
+    db.stmts[:pop] = db.prepare("DELETE FROM _ul_queue_ WHERE (queue, fire_at, id) IN (SELECT queue, fire_at, id FROM _ul_queue_ WHERE queue = ifnull($1, 'default') AND fire_at <= (unixepoch()) ORDER BY fire_at ASC LIMIT ifnull($2, 1)) RETURNING fire_at || '-' || id, value")
     db.stmts[:delete] = db.prepare("DELETE FROM _ul_queue_ WHERE queue = ifnull($1, 'default') AND fire_at = $2 AND id = $3 RETURNING value")
     db
   end

data/lib/litestack/litesupport.rb

@@ -11,6 +11,11 @@ module Litesupport
     @env ||= detect_environment
   end
   
+  def self.max_contexts
+    return 50 if environment == :fiber || environment == :polyphony
+    5    
+  end
+    
   # identify which environment we are running in
   # we currently support :fiber, :polyphony, :iodine & :threaded
   # in the future we might want to expand to other environments
@@ -32,8 +37,8 @@ module Litesupport
     end
     # we should never reach here
   end
-  
-  def self.detect_context
+    
+  def self.context
     if environment == :fiber || environment == :poylphony
       Fiber.current.storage
     else
@@ -41,8 +46,12 @@ module Litesupport
     end
   end
   
-  def self.context
-    @ctx ||= detect_context
+  def self.current_context
+    if environment == :fiber || environment == :poylphony
+      Fiber.current
+    else
+      Thread.current
+    end
   end
   
   # switch the execution context to allow others to run
@@ -55,7 +64,7 @@ module Litesupport
       Thread.current.switch_fiber
       true
     else
-      # do nothing in case of thread, switching will auto-happen
+      #Thread.pass
       false
     end   
   end
@@ -105,6 +114,21 @@ module Litesupport
     end
   
   end
+   
+  module Forkable
+    
+    def _fork(*args)
+      ppid = Process.pid
+      result = super      
+      if Process.pid != ppid
+        # trigger a restart of all connections owned by Litesupport::Pool
+      end
+      result
+    end
+    
+  end
+
+  #::Process.singleton_class.prepend(::Litesupport::Forkable)
   
   class Pool
   
@@ -120,11 +144,12 @@ module Litesupport
     end
     
     def acquire
+      # check for pid changes
       acquired = false
       result = nil
       while !acquired do
         @mutex.synchronize do
-          if resource = @resources.find{|r| r[1] == :free}
+          if resource = @resources.find{|r| r[1] == :free }
             resource[1] = :busy
             begin
               result = yield resource[0]
@@ -133,11 +158,10 @@ module Litesupport
             ensure
               resource[1] = :free
               acquired = true
-              return nil              
             end
           end
         end
-        sleep 0.0001 unless acquired
+        sleep 0.001 unless acquired
       end
       result
     end

data/lib/litestack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Litestack
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end