bmg 0.14.6 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3742e9ea9283de5fe4df772ef02969a91ee0b3b4
-  data.tar.gz: 2e6f9c1a33f8d220937d47f867ba88f53b1f0bba
+  metadata.gz: 9962e2754e1fc6f09c4f041e49ca8aa3d37281dd
+  data.tar.gz: 2533b9118e9cd1a5e5f79cabeb2570823b5c1c20
 SHA512:
-  metadata.gz: fae75db6c9b264f53dc76bb0fcd7e978b56647e225544c5e0cf2f40e1932e82ab3070ff34e32edad8203975a6fc721cca0e0f71af8b6dd21a82a61efda3cd9a5
-  data.tar.gz: 40a759212f4261da1bfbf5cecc15dce5be3ee215aae5e4fcc15e7447a17846d3e53f98b00cc62553ab3acba74565ce4a3845e7034cfda45cb5e24f497d7ef86f
+  metadata.gz: '097cf9919f5cdef7d1475be3006410796025fa1ac93e009011531816d55d5c6366eeb00bdebdeeb53bf02a1224286d5fb83a46d0fe3985d39d518ab93f50b86d'
+  data.tar.gz: b8a2d75c371e620ca9784decaacf872c687748ca2c6d19dafbd19eccde242c7c1cafa8d8d4053e60faa7cad0cc9e988edf2144ead579257af50742330813f868

data/lib/bmg/algebra.rb

@@ -39,6 +39,7 @@ module Bmg
     protected :_constants
 
     def extend(extension = {})
+      return self if extension.empty?
       _extend self.type.extend(extension), extension
     end
 

data/lib/bmg/operator/extend.rb

@@ -55,6 +55,54 @@ module Bmg
 
     protected ### optimization
 
+      def _allbut(type, butlist)
+        ext_keys = extension.keys
+        if (ext_keys & butlist).empty?
+          # extension not touched, fully kept
+          # as it might use butlist attributes, we can't push anything down
+          super
+        else
+          # extension partly stripped away, simplify them
+          new_ext = TupleAlgebra.allbut(extension, butlist)
+          new_but = butlist - ext_keys
+          operand.extend(new_ext).allbut(new_but)
+        end
+      end
+
+      def _join(type, right, on)
+        ext_keys = extension.keys
+        if (ext_keys & on).empty?
+          operand.join(right, on).extend(extension)
+        else
+          super
+        end
+      end
+
+      def _matching(type, right, on = [])
+        ext_keys = extension.keys
+        if (ext_keys & on).empty?
+          operand.matching(right, on).extend(extension)
+        else
+          super
+        end
+      end
+
+      def _not_matching(type, right, on = [])
+        ext_keys = extension.keys
+        if (ext_keys & on).empty?
+          operand.not_matching(right, on).extend(extension)
+        else
+          super
+        end
+      end
+
+      def _rename(type, renaming)
+        shared = renaming.keys & extension.keys
+        new_ext = TupleAlgebra.rename(extension, renaming)
+        new_ren = TupleAlgebra.allbut(renaming, shared)
+        operand.rename(new_ren).extend(new_ext)
+      end
+
       def _restrict(type, predicate)
         top, bottom = predicate.and_split(extension.keys)
         if top == predicate
@@ -80,6 +128,21 @@ module Bmg
         end
       end
 
+      def _project(type, attrlist)
+        ext_keys = extension.keys
+        if (ext_keys - attrlist).empty?
+          # extension fully kept, no optimization
+          # (we can't push anything down, because the extension itself might
+          # use all attributes)
+          super
+        else
+          # extension partly or fully stripped away, simplify it
+          new_ext = TupleAlgebra.project(extension, attrlist)
+          operand.extend(new_ext).project(attrlist)
+        end
+      end
+
+
     protected ### inspect
 
       def args

data/lib/bmg/sql/processor/join.rb

@@ -14,8 +14,8 @@ module Bmg
         def call(sexpr)
           if unjoinable?(sexpr)
             call(builder.from_self(sexpr))
-          elsif unjoinable?(right)
-            Join.new(builder.from_self(right), builder).call(sexpr)
+          elsif unjoinable?(right) or right.join?
+            Join.new(builder.from_self(right), on, builder).call(sexpr)
           else
             super(sexpr)
           end
@@ -33,7 +33,7 @@ module Bmg
         end
 
         def unjoinable?(sexpr)
-          sexpr.set_operator? or sexpr.limit_or_offset? or sexpr.join?
+          sexpr.set_operator? or sexpr.limit_or_offset?
         end
 
         def join_set_quantifiers(left, right)

data/lib/bmg/support/tuple_algebra.rb

@@ -11,5 +11,13 @@ module Bmg
     end
     module_function :project
 
+    def rename(tuple, renaming)
+      tuple.each_with_object({}){|(k,v),m|
+        m[renaming[k] || k] = v
+        m
+      }
+    end
+    module_function :rename
+
   end # module TupleAlgebra
 end # module Bmg

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 14
-    TINY  = 6
+    MINOR = 15
+    TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.15.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate