bmg 0.18.0 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ce59d00b630f644e5716eaff17a83116c1342ea0b6ba7d9174b1f5f4eadd6e
-  data.tar.gz: 2156d1a8eb88999e749f434a8e94d2b4e70c636fadb10470493f19bb805a19a3
+  metadata.gz: 6569e9038c83dda887da734d97ef58f9ff6e94984c78e8eae993561cde3bbfcc
+  data.tar.gz: 85d65ca717992a132e94ae17dbdf2cc671a161c495eb5be240c3d4e342e90c3f
 SHA512:
-  metadata.gz: 8e3e714d698ff7c47c2f61b4056c73acaa39983306402eeb54d1957b90959af51fcf20a543c5c17242d260fe835b33c19dd960e3cd4920a66d49ea81a22ee4b0
-  data.tar.gz: 89fe1cc4c3157adf7373fb755e0cf7eb5dd8d93f7061558454d27649b44aca558f936f006e3238dce410ffdfe29821d59feac3b31b5d64241ffc76192bba149f
+  metadata.gz: fbeb5215e5942626dd5115d95c091602daa57128014bc0833c38c3460697ef9dbc59b4ccd7566d4d3604e8d7a8c5e7e4812159a5bb89d3dad477e6a7b75545d8
+  data.tar.gz: 9e8a9eaaf3699d28890cb15faef5b12360f9bf26c5bb0e9bf42ccedba0b7b5a3c8c2eb627f8b1a4e154c8d992426f47ed82153e9f110634f0ba6aa7ceddd1353

data/README.md

@@ -213,6 +213,7 @@ r.extend(x: ->(t){ ... }, ...)               # add computed attributes
 r.exclude(predicate)                         # shortcut for restrict(!predicate)
 r.group([:a, :b, ...], :x)                   # relation-valued attribute from attributes
 r.image(right, :x, [:a, :b, ...])            # relation-valued attribute from another relation
+r.images({:x => r1, :y => r2}, [:a, ...])    # shortcut over image(r1, :x, ...).image(r2, :y, ...)
 r.join(right, [:a, :b, ...])                 # natural join on a join key
 r.join(right, :a => :x, :b => :y, ...)       # natural join after right reversed renaming
 r.left_join(right, [:a, :b, ...], {...})     # left join with optional default right tuple

data/lib/bmg/algebra.rb

@@ -174,6 +174,7 @@ module Bmg
 
     def transform(transformation = nil, options = {}, &proc)
       transformation, options = proc, (transformation || {}) unless proc.nil?
+      return self if transformation.is_a?(Hash) && transformation.empty?
       _transform(self.type.transform(transformation, options), transformation, options)
     end
 

data/lib/bmg/algebra/shortcuts.rb

@@ -39,6 +39,12 @@ module Bmg
         self.image(right.rename(renaming), as, on.keys, options)
       end
 
+      def images(rights, on = [], options = {})
+        rights.each_pair.inject(self){|memo,(as,right)|
+          memo.image(right, as, on, options)
+        }
+      end
+
       def join(right, on = [])
         return super unless on.is_a?(Hash)
         renaming = Hash[on.map{|k,v| [v,k] }]

data/lib/bmg/error.rb

@@ -16,4 +16,7 @@ module Bmg
   # while unknown
   class UnknownAttributesError < Error; end
 
+  # Raised when an operator is badly used
+  class MisuseError < Error; end
+
 end

data/lib/bmg/operator/allbut.rb

@@ -30,6 +30,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         seen = {}
         @operand.each do |tuple|
           allbuted = tuple_allbut(tuple)
@@ -63,12 +64,38 @@ module Bmg
 
     protected ### optimization
 
+      def _allbut(type, butlist)
+        operand.allbut(self.butlist|butlist)
+      end
+
+      def _matching(type, right, on)
+        # Always possible to push the matching, since by construction
+        # `on` can only use attributes that have not been trown away,
+        # hence they exist on `operand` too.
+        operand.matching(right, on).allbut(butlist)
+      end
+
+      def _page(type, ordering, page_index, options)
+        return super unless self.preserving_key?
+        operand.page(ordering, page_index, options).allbut(butlist)
+      end
+
+      def _project(type, attrlist)
+        operand.project(attrlist)
+      end
+
       def _restrict(type, predicate)
         operand.restrict(predicate).allbut(butlist)
       end
 
     protected ### inspect
 
+      def preserving_key?
+        operand.type.knows_keys? && operand.type.keys.find{|k|
+          (k & butlist).empty?
+        }
+      end
+
       def args
         [ butlist ]
       end

data/lib/bmg/operator/autosummarize.rb

@@ -24,7 +24,24 @@ module Bmg
 
     public
 
+      def self.same(*args)
+        Same.new(*args)
+      end
+
+      def self.group(*args)
+        Group.new(*args)
+      end
+
+      def self.y_by_x(*args)
+        YByX.new(*args)
+      end
+
+      def self.ys_by_x(*args)
+        YsByX.new(*args)
+      end
+
       def each(&bl)
+        return to_enum unless block_given?
         h = {}
         @operand.each do |tuple|
           key = key(tuple)
@@ -41,6 +58,12 @@ module Bmg
         [:autosummarize, operand.to_ast, by.dup, sums.dup]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected
 
       def _restrict(type, predicate)
@@ -175,11 +198,11 @@ module Bmg
         end
 
         def init(v)
-          [v]
+          v.nil? ? [] : [v]
         end
 
         def sum(v1, v2)
-          v1 << v2
+          v2.nil? ? v1 : (v1 << v2)
         end
 
         def term(v)
@@ -211,11 +234,11 @@ module Bmg
         end
 
         def init(v)
-          [v]
+          v.nil? ? [] : [v]
         end
 
         def sum(v1, v2)
-          v1 << v2
+          v2.nil? ? v1 : (v1 << v2)
         end
 
         def term(v)

data/lib/bmg/operator/autowrap.rb

@@ -43,6 +43,7 @@ module Bmg
       end
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield autowrap_tuple(tuple)
         end
@@ -52,6 +53,12 @@ module Bmg
         [ :autowrap, operand.to_ast, @original_options.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _autowrap(type, opts)
@@ -86,6 +93,16 @@ module Bmg
         false
       end
 
+      def _matching(type, right, on)
+        if (wrapped_roots! & on).empty?
+          operand.matching(right, on).autowrap(options)
+        else
+          super
+        end
+      rescue UnknownAttributesError
+        super
+      end
+
       def _page(type, ordering, page_index, opts)
         attrs = ordering.map{|(a,d)| a }
         if (wrapped_roots! & attrs).empty?
@@ -97,6 +114,16 @@ module Bmg
         super
       end
 
+      def _project(type, attrlist)
+        if (wrapped_roots! & attrlist).empty?
+          operand.project(attrlist).autowrap(options)
+        else
+          super
+        end
+      rescue UnknownAttributesError
+        super
+      end
+
       def _rename(type, renaming)
         # 1. Can't optimize if renaming applies to a wrapped one
         return super unless (wrapped_roots! & renaming.keys).empty?

data/lib/bmg/operator/constants.rb

@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield extend_it(tuple)
         end
@@ -54,6 +55,12 @@ module Bmg
         [ :constants, operand.to_ast, constants.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _page(type, ordering, page_index, options)

data/lib/bmg/operator/extend.rb

@@ -26,6 +26,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield extend_it(tuple)
         end
@@ -53,6 +54,12 @@ module Bmg
         [ :extend, operand.to_ast, extension.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _allbut(type, butlist)

data/lib/bmg/operator/group.rb

@@ -32,6 +32,7 @@ module Bmg
     public
 
       def each(&bl)
+        return to_enum unless block_given?
         index = Hash.new{|h,k| h[k] = k.merge(as => empty_group) }
         operand.each do |tuple|
           key = TupleAlgebra.allbut(tuple, attrs)

data/lib/bmg/operator/image.rb

@@ -46,6 +46,7 @@ module Bmg
     public
 
       def each(*args, &bl)
+        return to_enum unless block_given?
         (options[:jit_optimized] ? self : jit_optimize)._each(*args, &bl)
       end
 
@@ -99,9 +100,10 @@ module Bmg
           key = tuple_project(t, on)
           index[key].operand << tuple_image(t, on)
         end
-        if options[:array]
+        if opt = options[:array]
+          sorter = to_sorter(opt)
           index = index.each_with_object({}) do |(k,v),ix|
-            ix[k] = v.to_a
+            ix[k] = sorter ? v.to_a.sort(&sorter) : v.to_a
           end
         end
         index
@@ -154,8 +156,32 @@ module Bmg
         end
       end
 
+    public ### for internal reasons
+
+      def _count
+        left._count
+      end
+
     protected ### optimization
 
+      def _allbut(type, butlist)
+        if butlist.include?(as)
+          left.allbut(butlist - [as])
+        elsif (butlist & on).empty?
+          left.allbut(butlist).image(right, as, on, options)
+        else
+          super
+        end
+      end
+
+      def _matching(type, m_right, m_on)
+        if m_on.include?(as)
+          super
+        else
+          left.matching(m_right, m_on).image(right, as, on, options)
+        end
+      end
+
       def _page(type, ordering, page_index, opts)
         if ordering.map{|(k,v)| k}.include?(as)
           super
@@ -166,6 +192,14 @@ module Bmg
         end
       end
 
+      def _project(type, attrlist)
+        if attrlist.include?(as)
+          super
+        else
+          left.project(attrlist)
+        end
+      end
+
       def _restrict(type, predicate)
         on_as, rest = predicate.and_split([as])
         if rest.tautology?
@@ -227,6 +261,11 @@ module Bmg
         Relation::InMemory.new(image_type, Set.new)
       end
 
+      def to_sorter(opt)
+        return nil unless opt.is_a?(Array)
+        Ordering.new(opt).comparator
+      end
+
     public
 
       def to_s

data/lib/bmg/operator/join.rb

@@ -25,6 +25,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         index = Hash.new
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)

data/lib/bmg/operator/matching.rb

@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         index = Hash.new
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)

data/lib/bmg/operator/not_matching.rb

@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         index = Hash.new
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)

data/lib/bmg/operator/page.rb

@@ -30,6 +30,7 @@ module Bmg
     public
 
       def each(&bl)
+        return to_enum unless block_given?
         page_size = options[:page_size]
         @operand.to_a
           .sort(&comparator)
@@ -45,13 +46,7 @@ module Bmg
     protected ### inspect
 
       def comparator
-        ->(t1, t2) {
-          ordering.each do |(attr,direction)|
-            c = t1[attr] <=> t2[attr]
-            return (direction == :desc ? -c : c) unless c==0
-          end
-          0
-        }
+        Ordering.new(@ordering).comparator
       end
 
       def args

data/lib/bmg/operator/project.rb

@@ -29,9 +29,10 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         seen = {}
         @operand.each do |tuple|
-          projected = project(tuple)
+          projected = tuple_project(tuple)
           unless seen.has_key?(projected)
             yield(projected)
             seen[projected] = true
@@ -74,7 +75,7 @@ module Bmg
 
     private
 
-      def project(tuple)
+      def tuple_project(tuple)
         tuple.dup.delete_if{|k,_| !@attrlist.include?(k) }
       end
 

data/lib/bmg/operator/rename.rb

@@ -29,16 +29,17 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
-          yield rename(tuple, renaming)
+          yield rename_tuple(tuple, renaming)
         end
       end
 
       def insert(arg)
         case arg
-        when Hash       then operand.insert(rename(arg, reverse_renaming))
+        when Hash       then operand.insert(rename_tuple(arg, reverse_renaming))
         when Relation   then operand.insert(arg.rename(reverse_renaming))
-        when Enumerable then operand.insert(arg.map{|t| rename(t, reverse_renaming) })
+        when Enumerable then operand.insert(arg.map{|t| rename_tuple(t, reverse_renaming) })
         else
           super
         end
@@ -46,7 +47,7 @@ module Bmg
 
       def update(arg)
         case arg
-        when Hash then operand.update(rename(arg, reverse_renaming))
+        when Hash then operand.update(rename_tuple(arg, reverse_renaming))
         else
           super
         end
@@ -60,6 +61,12 @@ module Bmg
         [ :rename, operand.to_ast, renaming.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _page(type, ordering, page_index, options)
@@ -82,7 +89,7 @@ module Bmg
 
     private
 
-      def rename(tuple, renaming)
+      def rename_tuple(tuple, renaming)
         tuple.each_with_object({}){|(k,v),h|
           h[renaming[k] || k] = v
           h