bmg 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b2153bc229ff1517982db773316de847812ac3
-  data.tar.gz: 9f9b558de99c868d0b8dd5d8e11eb649fca7e1bd
+  metadata.gz: cd47ac94bb3775d03bddef092ad532dc4c3463c5
+  data.tar.gz: 1a8fd964c8e074f1632cf1067050f1581efad8ef
 SHA512:
-  metadata.gz: b46d9fe457281dcee1cc202b341fc98a8dbb55a4b5a1c1fc8cf7163bc4c5694149d2697b55736c112d4583596cc8d1b353f8c4f1144475ef2fe7d7d79deb3047
-  data.tar.gz: 4ed985da29e10309920a3a8866aff6f2d21014e23ee023a695cc4105f6d740ab62c4b87cc72f9157aa98bfc06b0c5e2c1f8dd98f8554e1e605fe27e8b1f1ba43
+  metadata.gz: 95c27ba47fe64d1624b9dc8129f9b8071c8e313919e594dd7fa8e82958187d45dc4bebb8b6406029d70b728c29ca79d43add0bc323642270e279e2638d272ff7
+  data.tar.gz: 0eb469720408c4c38b0680c67504c9f1853387f7d09c5cd4d4d980af303ea482e9decdffee16c19247885e0ad9df8513b7bfbff9a2ce2cf84e9f9cdc8e737705

data/lib/bmg/algebra.rb

@@ -68,6 +68,15 @@ module Bmg
     end
     protected :_image
 
+    def matching(right, on = [])
+      _matching self.type.matching(right, on), right, on
+    end
+
+    def _matching(type, right, on)
+      Operator::Matching.new(type, self, right, on)
+    end
+    protected :_matching
+
     def project(attrlist = [])
       _project self.type.project(attrlist), attrlist
     end

data/lib/bmg/operator.rb

@@ -75,3 +75,4 @@ require_relative 'operator/project'
 require_relative 'operator/rename'
 require_relative 'operator/restrict'
 require_relative 'operator/union'
+require_relative 'operator/matching'

data/lib/bmg/operator/matching.rb

@@ -0,0 +1,80 @@
+module Bmg
+  module Operator
+    #
+    # Image operator.
+    #
+    # Extends each tuple with its image in right.
+    #
+    class Matching
+      include Operator::Binary
+
+      def initialize(type, left, right, on)
+        @type = type
+        @left = left
+        @right = right
+        @on = on
+      end
+
+    private
+
+      attr_reader :on
+
+    public
+
+      def each
+        index = Hash.new
+        right.each_with_object(index) do |t, index|
+          key = tuple_project(t, on)
+          index[key] = true
+        end
+        left.each do |tuple|
+          key = tuple_project(tuple, on)
+          yield tuple if index.has_key?(key)
+        end
+      end
+
+      def to_ast
+        [ :matching, left.to_ast, right.to_ast, on ]
+      end
+
+    protected ### optimization
+
+      def _restrict(type, predicate)
+        # Predicate can always be fully applied to left
+        new_left = left.restrict(predicate)
+
+        # regarding right... the predicate possibly makes references
+        # to the join key, but also to left attributes... let split
+        # on the join key attributes, to try to remove spurious
+        # attributes for right...
+        on_on_and_more, left_only = predicate.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
+
+        new_left.matching(new_right)
+      rescue Predicate::NotSupportedError
+        super
+      end
+
+    protected ### inspect
+
+      def args
+        [ on ]
+      end
+
+    private
+
+      def tuple_project(tuple, on)
+        TupleAlgebra.project(tuple, on)
+      end
+
+    end # class Project
+  end # module Operator
+end # module Bmg

data/lib/bmg/sequel/relation.rb

@@ -24,7 +24,16 @@ module Bmg
       end
 
       def insert(arg)
-        dataset.insert(arg.merge(type.predicate.constants))
+        case arg
+        when Hash then
+          dataset.insert(arg.merge(type.predicate.constants))
+        when Enumerable then
+          dataset.multi_insert(arg.map { |x|
+            x.merge(type.predicate.constants)
+          })
+        else
+          dataset.insert(arg.merge(type.predicate.constants))
+        end
       end
 
       def update(arg)

data/lib/bmg/type.rb

@@ -37,6 +37,10 @@ module Bmg
       ANY
     end
 
+    def matching(right, on)
+      ANY
+    end
+
     def project(attrlist)
       ANY
     end

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 6
-    TINY  = 1
+    MINOR = 7
+    TINY  = 0
   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.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: roo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +115,7 @@ files:
 - lib/bmg/operator/constants.rb
 - lib/bmg/operator/extend.rb
 - lib/bmg/operator/image.rb
+- lib/bmg/operator/matching.rb
 - lib/bmg/operator/project.rb
 - lib/bmg/operator/rename.rb
 - lib/bmg/operator/restrict.rb