bmg 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e47d2972990cc85ae0a3b99fa6a79caf97176e46c7d70cdbbbb35ffdb3df21a
-  data.tar.gz: dd7ddf0c123a9347f517da44cc923ec9664c8a1fd12b9e8f0ed08677be2dcdd4
+  metadata.gz: 2c9b490328160c9816102f7dd34b3ee46207ab4362cd2af6d8623c9fc5d4b87a
+  data.tar.gz: d113dc14ae1811f2b5565af9e84a0ffbc82b7842c46284af7fcad3bc9f3b7470
 SHA512:
-  metadata.gz: 929f4c67a01d756b484e9ae27e5465173a4a1850686a173a8ab293dbe1e1ba01899c1ab21a8e2f29251378d0354287e379e7573ae551d3aef0583a0690640375
-  data.tar.gz: 3a92ab6c7708badf0464a94c496000eb55d233fb979bfd7128b71f3229347fa56c38be381815dbbc7eb0f741b58138f89551080e7670b3b044dfbba6571ac892
+  metadata.gz: fd42b8787cc093c6452386760744d7480c64c8be186ab73b87a548a1b853643b46a6ad48cf019da9d77fddbb38c824eb0e0bef3ef5fa2f333f1d1240f5a0bd84
+  data.tar.gz: 7bd0cd32a28963123b03b59152fa03d6470bbdf1a3c6cfe0b17a6667a80d97e65d5309def4e31ec9cbb47353d409ad9ad2a6d1fbc9c2ec10797460852836ce35

data/lib/bmg/operator/allbut.rb

@@ -74,15 +74,19 @@ module Bmg
         operand.matching(right, on).allbut(butlist)
       end
 
-      def _restrict(type, predicate)
-        operand.restrict(predicate).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?

data/lib/bmg/operator/autosummarize.rb

@@ -57,6 +57,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)

data/lib/bmg/operator/autowrap.rb

@@ -52,6 +52,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)
@@ -92,6 +98,8 @@ module Bmg
         else
           super
         end
+      rescue UnknownAttributesError
+        super
       end
 
       def _page(type, ordering, page_index, opts)
@@ -105,6 +113,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

@@ -54,6 +54,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

@@ -53,6 +53,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/image.rb

@@ -155,6 +155,12 @@ module Bmg
         end
       end
 
+    public ### for internal reasons
+
+      def _count
+        left._count
+      end
+
     protected ### optimization
 
       def _allbut(type, butlist)
@@ -185,6 +191,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?

data/lib/bmg/operator/project.rb

@@ -31,7 +31,7 @@ module Bmg
       def each
         seen = {}
         @operand.each do |tuple|
-          projected = project(tuple)
+          projected = tuple_project(tuple)
           unless seen.has_key?(projected)
             yield(projected)
             seen[projected] = true
@@ -74,7 +74,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

@@ -60,6 +60,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)

data/lib/bmg/relation.rb

@@ -110,6 +110,18 @@ module Bmg
       end
     end
 
+    def count
+      if type.knows_keys?
+        project(type.keys.first)._count
+      else
+        self._count
+      end
+    end
+
+    def _count
+      to_a.size
+    end
+
     # Returns a json representation
     def to_json(*args, &bl)
       to_a.to_json(*args, &bl)

data/lib/bmg/relation/empty.rb

@@ -19,6 +19,10 @@ module Bmg
       def each(&bl)
       end
 
+      def _count
+        0
+      end
+
       def to_ast
         [ :empty ]
       end

data/lib/bmg/relation/in_memory.rb

@@ -17,6 +17,16 @@ module Bmg
         @operand.each(&bl)
       end
 
+      def _count
+        if operand.respond_to?(:count)
+          operand.count
+        elsif operand.respond_to?(:size)
+          operand.size
+        else
+          super
+        end
+      end
+
       def to_ast
         [ :in_memory, operand ]
       end

data/lib/bmg/relation/materialized.rb

@@ -16,6 +16,12 @@ module Bmg
       end
       protected :type=
 
+    public
+
+      def _count
+        operand._count
+      end
+
     public
 
       def each(&bl)

data/lib/bmg/relation/spied.rb

@@ -28,6 +28,11 @@ module Bmg
         operand.each(&bl)
       end
 
+      def count
+        spy.call(self) if bl
+        operand.count
+      end
+
       def to_ast
         [ :spied, operand.to_ast, spy ]
       end

data/lib/bmg/sequel/relation.rb

@@ -33,6 +33,10 @@ module Bmg
         base_table.update(arg)
       end
 
+      def _count
+        dataset.count
+      end
+
       def to_ast
         [:sequel, dataset.sql]
       end

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 1
+    TINY  = 2
   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.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate