bmg 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381472a4bb34f2a614c0520261508fb2c6ff6032
-  data.tar.gz: 562ca2c457720e0b7a12a5e9b9ccd33e1609b778
+  metadata.gz: 8485745f67f9a5f3b481e8f8121e57c30f404661
+  data.tar.gz: 010a318d9896ae6514c96798230ab564540c788d
 SHA512:
-  metadata.gz: 195468c7f66d2aa11d49678effe9dc5122e67aec2fbe3161549f6a351835a11f8957aaca4004143bc00256c121d4638c68d466f6267623d35ac5288855e5d7df
-  data.tar.gz: 1590b7723bec6a826e88a0eef3e1e659c80c355f41de3d61c5d31d4a6c872398f6698290ac464ea795e8bd67e1e5a4eebaaa4052468e61933a6a36b79df81db7
+  metadata.gz: 5aae26e7caca19cf4ae627cde3eb8de7278b48f881d40b6ff72fcb7f67ff9f571246e5bc8220e4576b2e8f25cddfb4ae1cd92f7670fe856d9ef6399b3c0a679b
+  data.tar.gz: ff68734d5b561543224dc66c5731f0f89cd9456a3ff94891ce207f18799ceef5d27150b6c848301c0987f7a7a02488d0c9e270a47d01f60689744efc03393a47

data/Gemfile

@@ -1,4 +1,2 @@
 source "https://rubygems.org"
 gemspec
-
-gem 'predicate', path: '../predicate'

data/lib/bmg.rb

@@ -2,23 +2,45 @@ require 'path'
 require 'predicate'
 module Bmg
 
-  def csv(path, options = {})
-    Relation.new Reader::Csv.new path, options
+  def in_memory(enumerable, type = Type::ANY)
+    Relation::InMemory.new(type, enumerable).spied(main_spy)
+  end
+  module_function :in_memory
+
+  def csv(path, options = {}, type = Type::ANY)
+    Reader::Csv.new(type, path, options).spied(main_spy)
   end
   module_function :csv
 
-  def excel(path, options = {})
-    Relation.new Reader::Excel.new path, options
+  def excel(path, options = {}, type = Type::ANY)
+    Reader::Excel.new(type, path, options).spied(main_spy)
   end
   module_function :excel
 
+  def main_spy
+    @main_spy
+  end
+  module_function :main_spy
+
+  def main_spy=(spy)
+    @main_spy = spy
+  end
+  module_function :main_spy=
+
+  require_relative 'bmg/version'
+  require_relative 'bmg/error'
+  require_relative 'bmg/support'
+  require_relative 'bmg/algebra'
+  require_relative 'bmg/type'
+  require_relative 'bmg/relation'
+  require_relative 'bmg/operator'
+
+  require_relative 'bmg/reader'
+
+  require_relative 'bmg/relation/empty'
+  require_relative 'bmg/relation/in_memory'
+  require_relative 'bmg/relation/spied'
+
+  # Deprecated
+  Leaf = Relation::InMemory
 end
-require_relative 'bmg/version'
-require_relative 'bmg/error'
-require_relative 'bmg/support'
-require_relative 'bmg/algebra'
-require_relative 'bmg/type'
-require_relative 'bmg/relation'
-require_relative 'bmg/leaf'
-require_relative 'bmg/operator'
-require_relative 'bmg/reader'

data/lib/bmg/algebra.rb

@@ -1,6 +1,19 @@
 module Bmg
   module Algebra
 
+    METHODS = [
+      :allbut,
+      :autowrap,
+      :autosummarize,
+      :constants,
+      :extend,
+      :image,
+      :project,
+      :rename,
+      :restrict,
+      :union
+    ]
+
     def allbut(butlist = [])
       _allbut self.type.allbut(butlist), butlist
     end
@@ -82,7 +95,11 @@ module Bmg
         if predicate.contradiction?
           Relation.empty(type)
         else
-          _restrict type, predicate
+          begin
+            _restrict type, predicate
+          rescue Predicate::NotSupportedError
+            Operator::Restrict.new(type, self, predicate)
+          end
         end
       end
     end
@@ -101,5 +118,14 @@ module Bmg
     end
     protected :_union
 
+    def spied(spy)
+      return self if spy.nil?
+      Relation::Spied.new(self, spy)
+    end
+
+    def unspied
+      self
+    end
+
   end # module Algebra
 end # module Bmg

data/lib/bmg/operator.rb

@@ -2,6 +2,67 @@ module Bmg
   module Operator
     include Relation
 
+    def to_s
+      str = "(#{self.class.name.split('::').last.downcase}\n"
+      str << operands.map{|op| op.to_s.gsub(/^/m, "  ") }.join("\n")
+      str << "\n"
+      str << args.map{|a| a.to_s.gsub(/^/m, "  ") }.join("\n")
+      str << ")"
+      str
+    end
+
+    def inspect
+      str = "(#{self.class.name.split('::').last.downcase}\n"
+      str << operands.map{|op| op.inspect.gsub(/^/m, "  ") }.join("\n")
+      str << "\n"
+      str << args.map{|a| a.inspect.gsub(/^/m, "  ") }.join("\n")
+      str << ")"
+      str
+    end
+
+    module Unary
+      include Operator
+
+      attr_reader :type, :operand
+
+      def _visit(parent, visitor)
+        visitor.call(self, parent)
+        operand._visit(self, visitor)
+      end
+
+      def operands
+        [operand]
+      end
+
+    end
+
+    module Binary
+      include Operator
+
+      attr_reader :type, :left, :right
+
+      def _visit(parent, visitor)
+        visitor.call(self, parent)
+        left._visit(self, visitor)
+        right._visit(self, visitor)
+      end
+
+      def operands
+        [left, right]
+      end
+    end
+
+    module Nary
+      include Operator
+
+      attr_reader :type, :operands
+
+      def _visit(parent, visitor)
+        visitor.call(self, parent)
+        operands.each{|op| op._visit(self, visitor) }
+      end
+    end
+
   end
 end
 require_relative 'operator/allbut'

data/lib/bmg/operator/allbut.rb

@@ -15,18 +15,17 @@ module Bmg
     # input tuples.
     #
     class Allbut
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, butlist)
         @type = type
         @operand = operand
         @butlist = butlist
       end
-      attr_reader :type
 
     protected
 
-      attr_reader :operand, :butlist
+      attr_reader :butlist
 
     public
 
@@ -68,6 +67,12 @@ module Bmg
         operand.restrict(predicate).allbut(butlist)
       end
 
+    protected ### inspect
+
+      def args
+        [ butlist ]
+      end
+
     private
 
       def tuple_allbut(tuple)

data/lib/bmg/operator/autosummarize.rb

@@ -9,7 +9,7 @@ module Bmg
     # care...
     #
     class Autosummarize
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, by, sums)
         @type = type
@@ -17,11 +17,10 @@ module Bmg
         @by = by
         @sums = sums.each_with_object({}){|(k,v),h| h[k] = to_summarizer(v) }
       end
-      attr_reader :type
 
     protected
 
-      attr_reader :operand, :by, :sums
+      attr_reader :by, :sums
 
     public
 
@@ -57,6 +56,12 @@ module Bmg
         end
       end
 
+    protected ### inspect
+
+      def args
+        [ by, sums ]
+      end
+
     private
 
       # Returns the tuple determinant.
@@ -118,6 +123,11 @@ module Bmg
           v
         end
 
+        def inspect
+          ":same"
+        end
+        alias :to_s :inspect
+
       end # class Same
 
       #
@@ -145,6 +155,11 @@ module Bmg
           v
         end
 
+        def inspect
+          ":group"
+        end
+        alias :to_s :inspect
+
       end # class DistinctList
 
       #
@@ -176,6 +191,11 @@ module Bmg
           h
         end
 
+        def inspect
+          ":#{y}_by_#{x}"
+        end
+        alias :to_s :inspect
+
       end # class YByX
 
       #
@@ -210,6 +230,11 @@ module Bmg
           h
         end
 
+        def inspect
+          ":#{y}s_by_#{x}"
+        end
+        alias :to_s :inspect
+
       end # class YsByX
 
     end # class Autosummarize

data/lib/bmg/operator/autowrap.rb

@@ -18,7 +18,7 @@ module Bmg
     # - `split: String` the seperator to use to split keys, defaults to `_`
     #
     class Autowrap
-      include Operator
+      include Operator::Unary
 
       DEFAULT_OPTIONS = {
         :postprocessor => :none,
@@ -32,11 +32,10 @@ module Bmg
         @options = DEFAULT_OPTIONS.merge(options)
         @options[:postprocessor] = NoLeftJoinNoise.new(@options[:postprocessor])
       end
-      attr_reader :type
 
     private
 
-      attr_reader :operand, :options
+      attr_reader :options
 
     public
 
@@ -50,6 +49,12 @@ module Bmg
         [ :autowrap, operand.to_ast, @original_options.dup ]
       end
 
+    protected ### inspect
+
+      def args
+        [ options ]
+      end
+
     private
 
       def autowrap(tuple)
@@ -93,6 +98,7 @@ module Bmg
         }
 
         def initialize(remover)
+          @remover_to_s = remover
           @remover = case remover
           when NilClass then REMOVERS[:none]
           when Proc     then remover
@@ -115,6 +121,11 @@ module Bmg
           tuple.all?{|(k,v)| v.nil? || all_nil?(tuple[k]) }
         end
 
+        def inspect
+          @remover_to_s.inspect
+        end
+        alias :to_s :inspect
+
       end # NoLeftJoinNoise
 
     end # class Autowrap

data/lib/bmg/operator/constants.rb

@@ -8,18 +8,17 @@ module Bmg
     # statically known.
     #
     class Constants
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, constants)
         @type = type
         @operand = operand
         @constants = constants
       end
-      attr_reader :type
 
     protected
 
-      attr_reader :operand, :constants
+      attr_reader :constants
 
     public
 
@@ -94,6 +93,12 @@ module Bmg
         super
       end
 
+    protected ### inspect
+
+      def args
+        [ constants ]
+      end
+
     private
 
       def extend_it(tuple)

data/lib/bmg/operator/extend.rb

@@ -11,18 +11,17 @@ module Bmg
     #   [{ a: 1 }] extend { b: ->(t){ 2 } } => [{ a: 1, b: 2 }]
     #
     class Extend
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, extension)
         @type = type
         @operand = operand
         @extension = extension
       end
-      attr_reader :type
 
     protected
 
-      attr_reader :operand, :extension
+      attr_reader :extension
 
     public
 
@@ -69,6 +68,12 @@ module Bmg
         end
       end
 
+    protected ### inspect
+
+      def args
+        [ extension ]
+      end
+
     private
 
       def extend_it(tuple)

data/lib/bmg/operator/image.rb

@@ -6,7 +6,7 @@ module Bmg
     # Extends each tuple with its image in right.
     #
     class Image
-      include Operator
+      include Operator::Binary
 
       DEFAULT_OPTIONS = {
 
@@ -24,11 +24,10 @@ module Bmg
         @on = on
         @options = DEFAULT_OPTIONS.merge(options)
       end
-      attr_reader :type
 
     private
 
-      attr_reader :left, :right, :as, :on, :options
+      attr_reader :as, :on, :options
 
     public
 
@@ -93,6 +92,12 @@ module Bmg
         super
       end
 
+    protected ### inspect
+
+      def args
+        [ as, on, options ]
+      end
+
     private
 
       def tuple_project(tuple, on)
@@ -108,7 +113,7 @@ module Bmg
       end
 
       def empty_image
-        Leaf.new(image_type, Set.new)
+        Relation::InMemory.new(image_type, Set.new)
       end
 
     end # class Project

data/lib/bmg/operator/project.rb

@@ -14,18 +14,17 @@ module Bmg
     # input tuples.
     #
     class Project
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, attrlist)
         @type = type
         @operand = operand
         @attrlist = attrlist
       end
-      attr_reader :type
 
     private
 
-      attr_reader :operand, :attrlist
+      attr_reader :attrlist
 
     public
 
@@ -67,6 +66,12 @@ module Bmg
         operand.restrict(predicate).project(attrlist)
       end
 
+    protected ### inspect
+
+      def args
+        [ attrlist ]
+      end
+
     private
 
       def project(tuple)

data/lib/bmg/operator/rename.rb

@@ -14,18 +14,17 @@ module Bmg
     # attributes of the input tuples.
     #
     class Rename
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, renaming)
         @type = type
         @operand = operand
         @renaming = renaming
       end
-      attr_reader :type
 
     private
 
-      attr_reader :operand, :renaming
+      attr_reader :renaming
 
     public
 
@@ -67,6 +66,12 @@ module Bmg
         operand.restrict(predicate.rename(reverse_renaming)).rename(renaming)
       end
 
+    protected ### inspect
+
+      def args
+        [ renaming ]
+      end
+
     private
 
       def rename(tuple, renaming)

data/lib/bmg/operator/restrict.rb

@@ -7,18 +7,17 @@ module Bmg
     # at construction.
     #
     class Restrict
-      include Operator
+      include Operator::Unary
 
       def initialize(type, operand, predicate)
         @type = type
         @operand = operand
         @predicate = predicate
       end
-      attr_reader :type
 
     protected
 
-      attr_reader :operand, :predicate
+      attr_reader :predicate
 
     public
 
@@ -38,6 +37,12 @@ module Bmg
         Restrict.new(type, @operand, @predicate & predicate)
       end
 
+    protected ### inspect
+
+      def args
+        [ predicate ]
+      end
+
     end # class Restrict
   end # module Operator
 end # module Bmg

data/lib/bmg/operator/union.rb

@@ -14,7 +14,7 @@ module Bmg
     # behavior and save execution time.
     #
     class Union
-      include Operator
+      include Operator::Nary
 
       DEFAULT_OPTIONS = {
         all: false
@@ -25,11 +25,10 @@ module Bmg
         @operands = operands
         @options = DEFAULT_OPTIONS.merge(options)
       end
-      attr_reader :type
 
     protected
 
-      attr_reader :operands, :options
+      attr_reader :options
 
     public
 
@@ -83,6 +82,12 @@ module Bmg
         end
       end
 
+    protected ### inspect
+
+      def args
+        [ options ]
+      end
+
     end # class Union
   end # module Operator
 end # module Bmg

data/lib/bmg/reader.rb

@@ -1,9 +1,8 @@
 module Bmg
   module Reader
+    include Relation
 
-    def to_a
-      to_enum(:each).to_a
-    end
+    attr_reader :type
 
   end
 end

data/lib/bmg/reader/csv.rb

@@ -8,7 +8,8 @@ module Bmg
         :return_headers => false
       }
 
-      def initialize(path, options = {})
+      def initialize(type, path, options = {})
+        @type = type
         @path = path
         @options = DEFAULT_OPTIONS.merge(options)
         @options[:col_sep] ||= infer_col_sep
@@ -22,6 +23,15 @@ module Bmg
         end
       end
 
+      def to_ast
+        [ :csv, @path, @options ]
+      end
+
+      def to_s
+        "(csv #{path})"
+      end
+      alias :inspect :to_s
+
     private
 
       def tuple(row)

data/lib/bmg/reader/excel.rb

@@ -7,7 +7,8 @@ module Bmg
         skip: 0
       }
 
-      def initialize(path, options = {})
+      def initialize(type, path, options = {})
+        @type = type
         @path = path
         @options = DEFAULT_OPTIONS.merge(options)
       end
@@ -30,6 +31,15 @@ module Bmg
           end
       end
 
+      def to_ast
+        [ :excel, @path, @options ]
+      end
+
+      def to_s
+        "(excel #{path})"
+      end
+      alias :inspect :to_s
+
     end # class Excel
   end # module Reader
 end # module Bmg

data/lib/bmg/relation.rb

@@ -4,13 +4,19 @@ module Bmg
     include Algebra
 
     def self.new(operand, type = Type::ANY)
-      operand.is_a?(Relation) ? operand : Leaf.new(type, operand)
+      raise ArgumentError, "Missing type" if type.nil?
+      operand.is_a?(Relation) ? operand : Bmg.in_memory(operand, type)
     end
 
     def self.empty(type = Type::ANY)
       Relation::Empty.new(type)
     end
 
+    def empty?
+      each{|t| return false }
+      true
+    end
+
     # Private helper to implement `one` and `one_or_nil`
     def one_or_yield(&bl)
       first = nil
@@ -47,6 +53,30 @@ module Bmg
       raise InvalidUpdateError, "Cannot delete from this Relvar"
     end
 
+    def visit(&visitor)
+      _visit(nil, visitor)
+    end
+
+    def _visit(parent, visitor)
+      visitor.call(self, parent)
+    end
+    protected :_visit
+
+    def ys_by_x(y, x, options = {})
+      ordering = options[:order]
+      projection = [y, ordering].compact.uniq
+      by_x = each.each_with_object({}) do |tuple,h|
+        h[tuple[x]] ||= []
+        h[tuple[x]] << TupleAlgebra.project(tuple, projection)
+      end
+      by_x.each_with_object({}) do |(x,ys),h|
+        ys = ys.sort{|y1,y2| y1[ordering] <=> y2[ordering] } if ordering
+        ys = ys.map{|t| t[y] }
+        ys = ys.uniq if options[:distinct]
+        h[x] = ys
+      end
+    end
+
     # Returns a json representation
     def to_json(*args, &bl)
       to_a.to_json(*args, &bl)
@@ -59,24 +89,11 @@ module Bmg
 
     # Returns a String representing the query plan
     def debug(max_level = nil, on = STDERR)
-      on.puts _debug(to_ast, 1, max_level)
+      on.puts(self.inspect)
       self
     end
 
-  private
-
-    def _debug(ast, level = 1, max_level = nil)
-      return ast.inspect if ast.is_a?(Symbol)
-      return ast.to_s unless ast.is_a?(Array)
-      return ast.to_s unless ast.first.is_a?(Symbol)
-      if max_level && level>max_level
-        "(#{ast.first} ...)"
-      else
-        sep = "  " * level
-        "(#{ast.first}\n" + ast[1..-1].map{|a| _debug(a, 1+level, max_level) }.join("\n").gsub(/^/, sep) + ")"
-      end
-    end
-
   end # module Relation
 end # module Bmg
 require_relative 'relation/empty'
+require_relative 'relation/in_memory'

data/lib/bmg/relation/empty.rb

@@ -22,6 +22,14 @@ module Bmg
         [ :empty ]
       end
 
+      def to_s
+        "(empty)"
+      end
+
+      def inspect
+        "(empty)"
+      end
+
     protected ### optimization
 
       def _allbut(type, *args)

data/lib/bmg/relation/in_memory.rb

@@ -0,0 +1,32 @@
+module Bmg
+  module Relation
+    class InMemory
+      include Relation
+
+      def initialize(type, operand)
+        @operand = operand
+        @type = type
+      end
+      attr_reader :type, :operand
+
+    public
+
+      def each(&bl)
+        @operand.each(&bl)
+      end
+
+      def to_ast
+        [ :in_memory, operand ]
+      end
+
+      def to_s
+        "(in_memory ...)"
+      end
+
+      def inspect
+        "(in_memory #{operand.inspect})"
+      end
+
+    end # class InMemory
+  end # module Relation
+end # module Bmg

data/lib/bmg/relation/spied.rb

@@ -0,0 +1,72 @@
+module Bmg
+  module Relation
+    class Spied
+      include Operator::Unary
+
+      def initialize(operand, spy)
+        @operand = operand
+        @spy = spy
+      end
+
+    protected
+
+      attr_reader :spy
+
+    public
+
+      def type
+        operand.type
+      end
+
+      def each(&bl)
+        spy.call(self)
+        operand.each(&bl)
+      end
+
+      def to_ast
+        [ :spied, operand.to_ast, spy ]
+      end
+
+    public ### algebra
+
+      Algebra::METHODS.each do |m|
+        define_method(m) do |*args, &bl|
+          operand.send(m, *args, &bl).spied(spy)
+        end
+      end
+
+      def image(right, *args)
+        operand.image(right.unspied, *args).spied(spy)
+      end
+
+      def union(right, *args)
+        operand.union(right.unspied, *args).spied(spy)
+      end
+
+      def unspied
+        operand
+      end
+
+    public ### update
+
+      def insert(*args, &bl)
+        operand.insert(*args, &bl)
+      end
+
+      def delete(*args, &bl)
+        operand.delete(*args, &bl)
+      end
+
+      def update(*args, &bl)
+        operand.update(*args, &bl)
+      end
+
+    protected ### inspect
+
+      def args
+        [ spy ]
+      end
+
+    end # class Spied
+  end # module Relation
+end # module Bmg

data/lib/bmg/sequel.rb

@@ -3,7 +3,7 @@ require 'predicate/sequel'
 module Bmg
 
   def sequel(dataset, type = Type::ANY)
-    Sequel::Relation.new(type, dataset)
+    Sequel::Relation.new(type, dataset).spied(main_spy)
   end
   module_function :sequel
 

data/lib/bmg/sequel/relation.rb

@@ -24,7 +24,7 @@ module Bmg
       end
 
       def insert(arg)
-        dataset.insert(arg)
+        dataset.insert(arg.merge(type.predicate.constants))
       end
 
       def update(arg)
@@ -32,9 +32,14 @@ module Bmg
       end
 
       def to_ast
-        [:sequel, @dataset.sql]
+        [:sequel, dataset.sql]
       end
 
+      def to_s
+        "(sequel #{dataset.sql})"
+      end
+      alias :inspect :to_s
+
     protected ### optimization
 
       def _restrict(type, predicate)

data/lib/bmg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -122,7 +122,6 @@ files:
 - lib/bmg.rb
 - lib/bmg/algebra.rb
 - lib/bmg/error.rb
-- lib/bmg/leaf.rb
 - lib/bmg/operator.rb
 - lib/bmg/operator/allbut.rb
 - lib/bmg/operator/autosummarize.rb
@@ -139,6 +138,8 @@ files:
 - lib/bmg/reader/excel.rb
 - lib/bmg/relation.rb
 - lib/bmg/relation/empty.rb
+- lib/bmg/relation/in_memory.rb
+- lib/bmg/relation/spied.rb
 - lib/bmg/sequel.rb
 - lib/bmg/sequel/relation.rb
 - lib/bmg/support.rb

data/lib/bmg/leaf.rb

@@ -1,22 +0,0 @@
-module Bmg
-  class Leaf
-    include Relation
-
-    def initialize(type, operand)
-      @operand = operand
-      @type = type
-    end
-    attr_reader :type, :operand
-
-  public
-
-    def each(&bl)
-      @operand.each(&bl)
-    end
-
-    def to_ast
-      [:leaf, operand]
-    end
-
-  end
-end