bmg 0.18.9 → 0.18.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e287adcc94d2a0a5a88604e90cb34895ff801b137478c3cfa8b32d2093e7289c
-  data.tar.gz: 148775b4bdfbcb45099ed2587268243eef46b8a214d9bbf5f9f3abc9960764f2
+SHA1:
+  metadata.gz: 0ceadf8947aa041841941225e88396cc37ff7319
+  data.tar.gz: 9c695d3305101ff4a73bcdef5e3788648e9b2d27
 SHA512:
-  metadata.gz: ae86583f677f487bb3b6e71fa1a5ed07cc731bd927cf74716d68818d330809f86aaddb98c8a8c9848f68c3b0a8ba183996029ecf745db377d740b1c4da59b995
-  data.tar.gz: a0fca7d1f3fa2ecc8097a0167d5ec9767a047b61af54212b16030dfe23a46c05e3597641c0c125c40f0652fbdc15d593e7201cc9b430467e90216af0630e4c5d
+  metadata.gz: 70db4550decd609934e1d8d643983766b5b50b9f0354b2405dfdc710b9580a885e4754c907ed5011856e905308af9647c029f0dd612657e72b45af0465eaced2
+  data.tar.gz: 5ed5e7f6d1d9baa8070112a36229e8961e4b5a531acbdac808fcf1f5c008fc91ae3ceadc5c3b4c1d0ace22ca6f861074e79b6d957498740a8fba3d5e99875068

data/lib/bmg/algebra.rb

@@ -12,6 +12,7 @@ module Bmg
     protected :_allbut
 
     def autowrap(options = {})
+      return self if self.type.identity_autowrap?(options)
       _autowrap self.type.autowrap(options), options
     end
 
@@ -20,12 +21,12 @@ module Bmg
     end
     protected :_autowrap
 
-    def autosummarize(by = [], summarization = {})
-      _autosummarize type = self.type.autosummarize(by, summarization), by, summarization
+    def autosummarize(by = [], summarization = {}, options = {})
+      _autosummarize self.type.autosummarize(by, summarization, options), by, summarization, options
     end
 
-    def _autosummarize(type, by, summarization)
-      Operator::Autosummarize.new(type, self, by, summarization)
+    def _autosummarize(type, by, summarization, options)
+      Operator::Autosummarize.new(type, self, by, summarization, options)
     end
     protected :_autosummarize
 

data/lib/bmg/operator/autosummarize.rb

@@ -11,16 +11,22 @@ module Bmg
     class Autosummarize
       include Operator::Unary
 
-      def initialize(type, operand, by, sums)
+      DEFAULT_OPTIONS = {
+        default: :same
+      }
+
+      def initialize(type, operand, by, sums, options = {})
         @type = type
         @operand = operand
         @by = by
         @sums = sums.each_with_object({}){|(k,v),h| h[k] = to_summarizer(v) }
+        @options = DEFAULT_OPTIONS.merge(options)
+        @algo = build_algo
       end
 
     protected
 
-      attr_reader :by, :sums
+      attr_reader :by, :sums, :options
 
     public
 
@@ -45,17 +51,17 @@ module Bmg
         h = {}
         @operand.each do |tuple|
           key = key(tuple)
-          h[key] ||= init(key, tuple)
-          h[key] = sum(h[key], tuple)
+          h[key] ||= @algo.init(tuple)
+          h[key] = @algo.sum(h[key], tuple)
         end
         h.each_pair do |k,v|
-          h[k] = term(v)
+          h[k] = @algo.term(v)
         end
         h.values.each(&bl)
       end
 
       def to_ast
-        [:autosummarize, operand.to_ast, by.dup, sums.dup]
+        [:autosummarize, operand.to_ast, by.dup, sums.dup, options.dup]
       end
 
     public ### for internal reasons
@@ -73,7 +79,7 @@ module Bmg
         else
           op = operand
           op = op.restrict(bottom)
-          op = op.autosummarize(by, sums)
+          op = op.autosummarize(by, sums, options)
           op = op.restrict(top)
           op
         end
@@ -87,46 +93,86 @@ module Bmg
 
     private
 
+      def build_algo
+        case default = @options[:default]
+        when :same  then Check.new(sums)
+        when :first then Trust.new(sums)
+        else
+          raise ArgumentError, "Unknown default summarizer: `#{default}`"
+        end
+      end
+
       # Returns the tuple determinant.
       def key(tuple)
         @by.map{|by| tuple[by] }
       end
 
-      # Returns the initial tuple to use for a given determinant.
-      def init(key, tuple)
-        tuple.each_with_object({}){|(k,v),h|
-          h.merge!(k => summarizer(k).init(v))
-        }
-      end
-
-      # Returns the summarizer to use for a given key.
-      def summarizer(k)
-        @sums[k] || Same.new
-      end
-
-      # Sums `tuple` on `memo`, returning the new tuple to use as memo.
-      def sum(memo, tuple)
-        tuple.each_with_object(memo.dup){|(k,v),h|
-          h.merge!(k => summarizer(k).sum(h[k], v))
-        }
-      end
-
-      # Terminates the summarization of a given tuple.
-      def term(tuple)
-        tuple.each_with_object({}){|(k,v),h|
-          h.merge!(k => summarizer(k).term(v))
-        }
-      end
-
       def to_summarizer(x)
         case x
-        when :same  then Same.new
-        when :group then DistinctList.new
+        when :same  then Same::INSTANCE
+        when :group then DistinctList::INSTANCE
         else
           x
         end
       end
 
+      class Check
+        def initialize(sums)
+          @sums = sums
+        end
+        attr_reader :sums
+
+        def summarizer(k)
+          @sums[k] ||= Same::INSTANCE
+        end
+
+        def init(tuple)
+          tuple.each_with_object({}){|(k,v),h|
+            h.merge!(k => summarizer(k).init(v))
+          }
+        end
+
+        def sum(memo, tuple)
+          tuple.each_with_object(memo.dup){|(k,v),h|
+            h.merge!(k => summarizer(k).sum(h[k], v))
+          }
+        end
+
+        def term(tuple)
+          tuple.each_with_object({}){|(k,v),h|
+            h.merge!(k => summarizer(k).term(v))
+          }
+        end
+      end # class Check
+
+      class Trust
+        def initialize(sums)
+          @sums = sums
+        end
+        attr_reader :sums
+
+        # Returns the initial tuple to use for a given determinant.
+        def init(tuple)
+          sums.each_with_object(tuple.dup){|(attribute,summarizer),new_tuple|
+            new_tuple[attribute] = summarizer.init(tuple[attribute])
+          }
+        end
+
+        # Sums `tuple` on `memo`, returning the new tuple to use as memo.
+        def sum(memo, tuple)
+          sums.each_with_object(memo.dup){|(attribute,summarizer),new_tuple|
+            new_tuple[attribute] = summarizer.sum(memo[attribute], tuple[attribute])
+          }
+        end
+
+        # Terminates the summarization of a given tuple.
+        def term(tuple)
+          sums.each_with_object(tuple.dup){|(attribute,summarizer),new_tuple|
+            new_tuple[attribute] = summarizer.term(tuple[attribute])
+          }
+        end
+      end # class Trust
+
       #
       # Summarizes by enforcing that the same dependent is observed for a given
       # determinant, returning the dependent as summarization.
@@ -138,7 +184,7 @@ module Bmg
         end
 
         def sum(v1, v2)
-          raise "Same values expected, got `#{v1}` vs. `#{v2}`" unless v1 == v2
+          raise TypeError, "Same values expected, got `#{v1}` vs. `#{v2}`" unless v1 == v2
           v1
         end
 
@@ -151,6 +197,7 @@ module Bmg
         end
         alias :to_s :inspect
 
+        INSTANCE = new
       end # class Same
 
       #
@@ -183,6 +230,7 @@ module Bmg
         end
         alias :to_s :inspect
 
+        INSTANCE = new
       end # class DistinctList
 
       #

data/lib/bmg/operator/autowrap.rb

@@ -26,6 +26,12 @@ module Bmg
         :split => "_"
       }
 
+      class << self
+        def separator(options)
+          options[:split] || DEFAULT_OPTIONS[:split]
+        end
+      end
+
       def initialize(type, operand, options = {})
         @type = type
         @operand = operand

data/lib/bmg/operator/page.rb

@@ -32,7 +32,8 @@ module Bmg
       def each(&bl)
         return to_enum unless block_given?
         page_size = options[:page_size]
-        @operand.to_a
+        @operand
+          .to_a
           .sort(&comparator)
           .drop(page_size * (page_index-1))
           .take(page_size)
@@ -46,7 +47,7 @@ module Bmg
     protected ### inspect
 
       def comparator
-        Ordering.new(@ordering).comparator
+        @comparator ||= Ordering.new(@ordering).comparator
       end
 
       def args

data/lib/bmg/relation/materialized.rb

@@ -19,14 +19,14 @@ module Bmg
     public
 
       def _count
-        operand._count
+        _materialize._count
       end
 
     public
 
       def each(&bl)
-        @operand = Relation::InMemory.new(operand.type, operand.to_a) unless @operand.is_a?(Relation::InMemory)
-        @operand.each(&bl)
+        return to_enum unless block_given?
+        _materialize.each(&bl)
       end
 
       def to_ast
@@ -37,6 +37,14 @@ module Bmg
         []
       end
 
+    private
+
+      def _materialize
+        return @operand if @operand.is_a?(Relation::InMemory)
+
+        @operand = Relation::InMemory.new(operand.type, operand.to_a)
+      end
+
     end # class Materialized
   end # module Relation
 end # module Bmg

data/lib/bmg/relation/spied.rb

@@ -24,13 +24,27 @@ module Bmg
       protected :type=
 
       def each(&bl)
-        spy.call(self) if bl
-        operand.each(&bl)
+        return enum_for(:each) unless bl
+
+        if spy.respond_to?(:measure)
+          spy.measure(self) do
+            operand.each(&bl)
+          end
+        else
+          spy.call(self)
+          operand.each(&bl)
+        end
       end
 
       def count
-        spy.call(self) if bl
-        operand.count
+        if spy.respond_to?(:measure)
+          spy.measure(self) do
+            operand.count
+          end
+        else
+          spy.call(self)
+          operand.count
+        end
       end
 
       def to_ast

data/lib/bmg/sql/support/from_clause_orderer.rb

@@ -213,8 +213,7 @@ module Bmg
         def _collect_joins(sexpr, joins)
           case sexpr.first
           when :and
-            _collect_joins(sexpr[1], joins)
-            _collect_joins(sexpr[2], joins)
+            sexpr[1..-1].each{ |term| _collect_joins(term, joins) }
           when :eq
             joins << sexpr
           else

data/lib/bmg/support/ordering.rb

@@ -11,13 +11,26 @@ module Bmg
     end
 
     def comparator
-      @comparator ||= ->(t1, t2) {
-        attrs.each do |(attr,direction)|
-          c = t1[attr] <=> t2[attr]
-          return (direction == :desc ? -c : c) unless c==0
+      @comparator ||= ->(t1, t2) { compare_attrs(t1, t2) }
+    end
+
+    def compare_attrs(t1, t2)
+      attrs.each do |(attr,direction)|
+        a1, a2 = t1[attr], t2[attr]
+        if a1.nil? && a2.nil?
+          0
+        elsif a1.nil?
+          return direction == :desc ? -1 : 1
+        elsif a2.nil?
+          return direction == :desc ? 1 : -1
+        elsif a1.respond_to?(:<=>)
+          c = a1 <=> a2
+          unless c.nil? || c==0
+            return direction == :desc ? -c : c
+          end
         end
-        0
-      }
+      end
+      0
     end
 
   end # class Ordering

data/lib/bmg/type.rb

@@ -103,8 +103,15 @@ module Bmg
       }
     end
 
+    def identity_autowrap?(options)
+      return false unless knows_attrlist?
+
+      sep = Operator::Autowrap.separator(options)
+      self.attrlist.all?{|a| a.to_s.index(sep).nil? }
+    end
+
     def autowrap(options)
-      sep = options[:split] || Operator::Autowrap::DEFAULT_OPTIONS[:split]
+      sep = Operator::Autowrap.separator(options)
       splitter = ->(a){ a.to_s.split(sep).first }
       is_split = ->(a){ a.to_s.split(sep).size > 1 }
       dup.tap{|x|
@@ -115,7 +122,7 @@ module Bmg
       }
     end
 
-    def autosummarize(by, summarization)
+    def autosummarize(by, summarization, options)
       known_attributes!(by + summarization.keys) if typechecked? && knows_attrlist?
       dup.tap{|x|
         x.attrlist = nil

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 9
+    TINY  = 13
   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.18.9
+  version: 0.18.13
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +317,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.