karait 0.0.3 → 0.0.4

data/.gitignore

@@ -11,3 +11,4 @@ nbproject
 *.swp
 *.pid
 *.log
+=*

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/karait.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{karait}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bcoe"]
-  s.date = %q{2011-08-31}
+  s.date = %q{2011-09-01}
   s.description = %q{A ridiculously simple cross-language queuing system, built on top of MongoDB.}
   s.email = %q{bencoe@gmail.com}
   s.extra_rdoc_files = [

data/lib/message.rb

@@ -15,6 +15,7 @@ module Karait
       @source = raw_message
       @queue_collection = queue_collection
       @variables_to_serialize = {}
+      set_expired
       add_accessors raw_message
     end
     
@@ -49,6 +50,19 @@ module Karait
     
     private
     
+    def set_expired
+      @expired = false
+      
+      current_time = Time.now().to_f
+      meta = @source.fetch('_meta', {})
+      
+      return if meta.fetch('expire', -1.0) == -1.0
+      
+      if current_time - meta.fetch('timestamp', 0.0) > meta.fetch('expire', -1.0)
+        @expired = true
+      end
+    end
+    
     def add_accessors(hash)
       hash.each do |k, v|
         if not Message::BLACKLIST.has_key? k

data/lib/queue.rb

@@ -6,6 +6,7 @@ module Karait
     include Karait
     
     MESSAGES_READ = 10
+    NO_OBJECT_FOUND_ERROR = 'No matching object found'
     
     def initialize(opts={})
       set_instance_variables opts
@@ -23,8 +24,7 @@ module Karait
         :expire => opts.fetch(:expire, -1.0),
         :timestamp => Time.now().to_f,
         :expired => false,
-        :visibility_timeout => -1.0,
-        :accessed => 0.0
+        :visible_after => -1.0
       }
       
       message_dict[:_meta][:routing_key] = opts.fetch(:routing_key) if opts[:routing_key]
@@ -33,28 +33,72 @@ module Karait
     end
     
     def read(opts={})
+      opts = {
+        :messages_read => 10,
+        :visibility_timeout => -1.0,
+        :routing_key => nil
+      }.update(opts)
+      
+      current_time = Time.new.to_f
       messages = []
       
-      conditions = {
-          '_meta.expired' => false
+      query = {
+          '_meta.expired' => false,
+          '_meta.visible_after' => {
+            '$lt' => current_time
+          }
       }
-      
-      if opts[:routing_key]
-        conditions['_meta.routing_key'] = opts[:routing_key]
+      if opts[:routing_key] != nil
+        query['_meta.routing_key'] = opts[:routing_key]
       else
-        conditions['_meta.routing_key'] = {
+        query['_meta.routing_key'] = {
           '$exists' => false
         }
       end
       
-      @database.eval(generate_find_with_timeouts_code({
-            'conditions' => conditions,
-            'limit' => opts.fetch(:messages_read, Queue::MESSAGES_READ),
-            'collection' => @queue,
-            'visibilityTimeout' => opts.fetch(:visibility_timeout, -1.0)
-      })).each do |raw_message|
+      update = false
+      if opts[:visibility_timeout] != -1.0
+        update = {
+            '$set' => {
+              '_meta.visible_after' => current_time + opts[:visibility_timeout]
+            }
+        }
+      end
+      
+      raw_messages = []
+      
+      if update
+        (0..opts[:messages_read]).each do
+          begin
+            
+            raw_message = @queue_collection.find_and_modify(:query => query, :update => update)
+            
+            if raw_message:
+              raw_messages << raw_message
+            else
+              break
+            end
+          
+          rescue Mongo::OperationFailure => operation_failure
+            if not  operation_failure.to_s.match(Queue::NO_OBJECT_FOUND_ERROR)
+              raise operation_failure
+            end
+          end
+          
+        end
+      else
+        @queue_collection.find(query).limit(opts[:messages_read]).each do |raw_message|
+          raw_messages << raw_message
+        end
+      end
+      
+      raw_messages.each do |raw_message|
         message = Karait::Message.new(raw_message=raw_message, queue_collection=@queue_collection)
-        messages << message
+        if message.expired?
+          message.delete()
+        else
+          messages << message
+        end
       end
       
       return messages
@@ -111,6 +155,8 @@ module Karait
       @queue_collection = @database[@queue]
       @queue_collection.create_index('_id')
       @queue_collection.create_index('_meta.routing_key')
+      @queue_collection.create_index('_meta.expired')
+      @queue_collection.create_index('_meta.visible_after')
     end
     
     def create_capped_collection
@@ -121,57 +167,5 @@ module Karait
         :max => @queue_size
       )
     end
-    
-    def generate_find_with_timeouts_code(variable_scope)
-      BSON::Code.new("
-            function() {
-                var results = [];
-                var currentTime = parseFloat(new Date().getTime()) / 1000.0;
-                
-                function hiddenByVisibilityTimeout(result) {
-                    if ( (currentTime - result._meta.accessed) < (result._meta.visibility_timeout) ) {
-                        return true;
-                    }
-                    return false;
-                }
-                
-                function expire(result) {
-                    if (result._meta.expire <= 0.0) {
-                        return false;
-                    } else if ( (currentTime - result._meta.timestamp) > result._meta.expire ) {
-                        db[collection].update({_id: result._id}, {$set: {'_meta.expired': true}})
-                        return true;
-                    }
-                }
-                
-                (function fetchResults() {
-                    var cursor = db[collection].find(conditions).limit(limit);
-                    var accessedIds = [];
-                    cursor.forEach(function(result) {
-                        if (!expire(result) && !hiddenByVisibilityTimeout(result)) {
-                            results.push(result);
-                            accessedIds.push(result._id);
-                        }
-                    });
-                    if (visibilityTimeout != -1.0) {
-                        db[collection].update({_id: {$in: accessedIds}},
-                            {
-                                $set: {
-                                    '_meta.accessed': currentTime,
-                                    '_meta.visibility_timeout': visibilityTimeout
-                                }
-                            },
-                            false,
-                            true
-                        );
-                    }
-                })();
-            
-                return results;
-            }
-        ",
-        variable_scope
-      )
-    end
   end
 end

data/test/test_queue.rb

@@ -226,12 +226,12 @@ class TestQueue < Test::Unit::TestCase
     queue.write Karait::Message.new({'foo' => 1})
     queue.write Karait::Message.new({:foo => 2})
     queue.write Karait::Message.new({'foo' => 3})
-    messages = queue.read(:visibility_timeout => 0.05)
+    messages = queue.read(:visibility_timeout => 0.4)
     assert_equal 3, messages.count
-    messages = queue.read(:visibility_timeout => 0.05)
+    messages = queue.read(:visibility_timeout => 0.4)
     assert_equal 0, messages.count
-    sleep(0.1)
-    messages = queue.read(:visibility_timeout => 0.05)
+    sleep(0.5)
+    messages = queue.read(:visibility_timeout => 0.4)
     assert_equal 3, messages.count
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: karait
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - bcoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -04:00
+date: 2011-09-01 00:00:00 -04:00
 default_executable: 
 dependencies: []