ohm 1.0.0.rc3 → 1.0.0.rc4

data/lib/ohm.rb

@@ -423,10 +423,9 @@ module Ohm
     #   set.find(:age => 30)
     #
     def find(dict)
-      keys = model.filters(dict)
-      keys.push(key)
+      filters = model.filters(dict).push(key)
 
-      MultiSet.new(keys, namespace, model)
+      MultiSet.new(namespace, model).append(:sinterstore, filters)
     end
 
     # Reduce the set using any number of filters.
@@ -440,7 +439,7 @@ module Ohm
     #   User.find(:name => "John").except(:country => "US")
     #
     def except(dict)
-      MultiSet.new([key], namespace, model).except(dict)
+      MultiSet.new(namespace, model).append(:sinterstore, key).except(dict)
     end
 
     # Do a union to the existing set using any number of filters.
@@ -454,7 +453,7 @@ module Ohm
     #   User.find(:name => "John").union(:name => "Jane")
     #
     def union(dict)
-      MultiSet.new([key], namespace, model).union(dict)
+      MultiSet.new(namespace, model).append(:sinterstore, key).union(dict)
     end
 
   private
@@ -516,7 +515,6 @@ module Ohm
     end
   end
 
-
   # Anytime you filter a set with more than one requirement, you
   # internally use a `MultiSet`. `MutiSet` is a bit slower than just
   # a `Set` because it has to `SINTERSTORE` all the keys prior to
@@ -533,9 +531,15 @@ module Ohm
   #   User.find(:name => "John", :age => 30).kind_of?(Ohm::MultiSet)
   #   # => true
   #
-  class MultiSet < Struct.new(:keys, :namespace, :model)
+  class MultiSet < Struct.new(:namespace, :model)
     include Collection
 
+    def append(operation, list)
+      filters.push([operation, list])
+
+      return self
+    end
+
     # Chain new fiters on an existing set.
     #
     # Example:
@@ -544,10 +548,9 @@ module Ohm
     #   set.find(:status => 'pending')
     #
     def find(dict)
-      keys = model.filters(dict)
-      keys.push(*self.keys)
+      filters.push([:sinterstore, model.filters(dict)])
 
-      MultiSet.new(keys, namespace, model)
+      return self
     end
 
     # Reduce the set using any number of filters.
@@ -561,7 +564,7 @@ module Ohm
     #   User.find(:name => "John").except(:country => "US")
     #
     def except(dict)
-      sdiff.push(*model.filters(dict)).uniq!
+      filters.push([:sdiffstore, model.filters(dict)])
 
       return self
     end
@@ -577,30 +580,71 @@ module Ohm
     #   User.find(:name => "John").union(:name => "Jane")
     #
     def union(dict)
-      sunion.push(*model.filters(dict)).uniq!
+      filters.push([:sunionstore, model.filters(dict)])
 
       return self
     end
 
   private
-    def sunion
-      @sunion ||= []
+    def filters
+      @filters ||= []
     end
 
-    def sdiff
-      @sdiff ||= []
+    def temp_keys
+      @temp_keys ||= []
     end
 
-    def execute
+    def clean_temp_keys
+      model.db.del(*temp_keys)
+      temp_keys.clear
+    end
+
+    def generate_temp_key
       key = namespace[:temp][SecureRandom.hex(32)]
-      key.sinterstore(*keys)
-      key.sdiffstore(key, *sdiff)   if sdiff.any?
-      key.sunionstore(key, *sunion) if sunion.any?
+      temp_keys << key
+      key
+    end
+
+    def execute
+
+      # Hold the final result key for this MultiSet.
+      main = nil
+
+      filters.each do |operation, list|
+
+        # Operation can be sinterstore, sdiffstore, or sunionstore.
+        # each operation we do, i.e. `.union(...)`, will be considered
+        # one intersected set, hence we need to `sinterstore` all
+        # the filters in a temporary set.
+        temp = generate_temp_key
+        temp.sinterstore(*list)
+
+        # If this is the first set, we simply assign the generated
+        # set to main, which could possibly be the return value
+        # for simple filters like one `.find(...)`.
+        if main.nil?
+          main = temp
+        else
+
+          # Append the generated temporary set using the operation.
+          # i.e. if we have (mood=happy & book=1) and we have an
+          # `sunionstore`, we do (mood=happy & book=1) | (mood=sad & book=1)
+          main.send(operation, main, temp)
+        end
+      end
 
       begin
-        yield key
+
+        # At this point, we have the final aggregated set, which we yield
+        # to the caller. the caller can do all the normal set operations,
+        # i.e. SCARD, SMEMBERS, etc.
+        yield main
+
       ensure
-        key.del
+
+        # We have to make sure we clean up the temporary keys to avoid
+        # memory leaks and the unintended explosion of memory usage.
+        clean_temp_keys
       end
     end
   end
@@ -789,7 +833,7 @@ module Ohm
       if keys.size == 1
         Ohm::Set.new(keys.first, key, self)
       else
-        Ohm::MultiSet.new(keys, key, self)
+        Ohm::MultiSet.new(key, self).append(:sinterstore, keys)
       end
     end
 

data/test/filtering.rb

@@ -84,4 +84,73 @@ test "#union" do |john, jane|
   assert res.include?(john)
   assert res.include?(jane)
   assert res.include?(included)
+
+  res = User.find(:status => "active").union(:status => "inactive").find(:lname => "Doe")
+
+  assert res.any? { |e| e.status == "inactive" }
+end
+
+# book author thing via @myobie
+scope do
+  class Book < Ohm::Model
+    collection :authors, :Author
+  end
+
+  class Author < Ohm::Model
+    reference :book, :Book
+
+    attribute :mood
+    index :mood
+  end
+
+  setup do
+    book1 = Book.create
+    book2 = Book.create
+
+    auth1 = Author.create(:book => book1, :mood => "happy")
+    auth2 = Author.create(:book => book1, :mood => "sad")
+    auth3 = Author.create(:book => book2, :mood => "sad")
+
+    [book1, book2]
+  end
+
+  test "straight up intersection + union" do |book1, book2|
+    result = book1.authors.find(:mood => "happy").
+      union(:book_id => book1.id, :mood => "sad")
+
+    assert_equal 2, result.size
+  end
+
+  test "appending an empty set via union" do |book1, book2|
+    res = Author.find(:book_id => book1.id, :mood => "happy").
+      union(:book_id => book2.id, :mood => "sad").
+      union(:book_id => book2.id, :mood => "happy")
+
+    assert_equal 2, res.size
+  end
+
+  test "revert by applying the original intersection" do |book1, book2|
+    res = Author.find(:book_id => book1.id, :mood => "happy").
+      union(:book_id => book2.id, :mood => "sad").
+      find(:book_id => book1.id, :mood => "happy")
+
+    assert_equal 1, res.size
+  end
+
+  test "remove original intersection by doing diff" do |book1, book2|
+    res = Author.find(:book_id => book1.id, :mood => "happy").
+      union(:book_id => book2.id, :mood => "sad").
+      except(:book_id => book1.id, :mood => "happy")
+
+    assert_equal 1, res.size
+    assert res.map(&:mood).include?("sad")
+    assert res.map(&:book_id).include?(book2.id)
+  end
+
+  test "@myobie usecase" do |book1, book2|
+    res = book1.authors.find(:mood => "happy").
+      union(:mood => "sad", :book_id => book1.id)
+
+    assert_equal 2, res.size
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &70347702087860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70347702087860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: scrivener
-  requirement: &70347702087160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70347702087160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70347702086580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70347702086580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: batch
-  requirement: &70347702086060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +70,12 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70347702086060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.
@@ -117,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.