bmg 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cdd3816b79a6f29c387456d9ffdc12d9ae7872e
-  data.tar.gz: 4c30157082a6474c76a156efc7fcdb510f2f2d44
+  metadata.gz: 7b43a1cda1c1650f7678db8e4a9213e7065d26a5
+  data.tar.gz: 6f130fa599d6d24b4eaa0450883cfef539b95e6f
 SHA512:
-  metadata.gz: 95290af1dba5768f4a4bfee0357d53ddd70063a6fb6a34ee8c6b329805f44ec1ac49ba0fd5baea0b6946d4e81bf3250b30a954f2b1288c53e0eaa4019687e6d8
-  data.tar.gz: 95fb7f28fbaf62b2f12286857bd04ccc0849d397f085bd366f303572e21a01d6baeb023d4226f56b8223182f075f0c455a3ef06aa7433c677fa5390404c4b9d9
+  metadata.gz: 0ac9c79f0c348dbd7685a5c922a28a315192a72ce6b42da708b3233f1fb53da1b64da97659ddb3935aad39a4bdf3141d06be24ff102d202be0e7d8677fbb9f8a
+  data.tar.gz: 40aea311e6e4d372ca07ffd91fd5c6ad102f3dd67da5443287121233848e3470ccded49eea97ef4e1f9d4a01afebeb4b43425e7426081ee2472cb0b8a95833ed

data/lib/bmg/algebra.rb

@@ -74,7 +74,17 @@ module Bmg
     protected :_rename
 
     def restrict(predicate)
-      _restrict self.type.restrict(predicate), Predicate.coerce(predicate)
+      predicate = Predicate.coerce(predicate)
+      if predicate.tautology?
+        self
+      else
+        type = self.type.restrict(predicate)
+        if predicate.contradiction?
+          Relation.empty(type)
+        else
+          _restrict type, predicate
+        end
+      end
     end
 
     def _restrict(type, predicate)

data/lib/bmg/operator/constants.rb

@@ -36,18 +36,20 @@ module Bmg
     protected ### optimization
 
       def _restrict(type, predicate)
+        # bottom_p makes no reference to constants, top_p possibly
+        # does...
         top_p, bottom_p = predicate.and_split(constants.keys)
         if top_p.tautology?
-          # push all situation
+          # push all situation: predicate made no reference to constants
           result = operand
-          result = result.restrict(bottom_p) unless bottom_p.tautology?
+          result = result.restrict(bottom_p)
           result = result.constants(constants)
           result
         elsif (top_p.free_variables - constants.keys).empty?
           # top_p applies to constants only
           if eval = top_p.evaluate(constants)
             result = operand
-            result = result.restrict(bottom_p) unless bottom_p.tautology?
+            result = result.restrict(bottom_p)
             result = result.constants(constants)
             result
           else

data/lib/bmg/operator/image.rb

@@ -58,14 +58,35 @@ module Bmg
 
       def _restrict(type, predicate)
         on_as, rest = predicate.and_split([as])
-        if on_as == predicate
+        if rest.tautology?
+          # push none situation: on_as is still the full predicate
           super
         else
-          shared, left_only = rest.and_split(on)
-          new_left  = left.restrict(rest)
-          new_right = shared.tautology? ? right : right.restrict(shared)
+          # rest makes no reference to `as` and can be pushed
+          # down...
+          new_left = left.restrict(rest)
+
+          # regarding right... rest possibly makes references to the
+          # join key, but also to left attributes... let split again
+          # on the join key attributes, to try to remove spurious
+          # attributes for right...
+          on_on_and_more, left_only = rest.and_split(on)
+
+          # it's not guaranteed! let now check whether the split led
+          # to a situation where the predicate on `on` attributes
+          # actually refers to no other ones...
+          if !on_on_and_more.tautology? and (on_on_and_more.free_variables - on).empty?
+            new_right = right.restrict(on_on_and_more)
+          else
+            new_right = right
+          end
+
+          # This is the image itself
           opt = new_left.image(new_right, as, on, options)
-          opt = opt.restrict(on_as) unless on_as.tautology?
+
+          # finaly, it still needs to be kept on the final node
+          opt = opt.restrict(on_as)
+
           opt
         end
       rescue Predicate::NotSupportedError

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement