axiom-optimizer 0.1.1 → 0.2.0

data/lib/axiom/optimizer/relation/operation/reverse.rb

@@ -6,7 +6,7 @@ module Axiom
       module Operation
 
         # Abstract base class representing Reverse optimizations
-        class Reverse < Order
+        class Reverse < Sorted
 
           # Optimize when the operand is a Reverse
           class ReverseOperand < self
@@ -31,28 +31,28 @@ module Axiom
 
           end # class ReverseOperand
 
-          # Optimize when the operand is an Order
-          class OrderOperand < self
+          # Optimize when the operand is an Sorted
+          class SortedOperand < self
 
-            # Test if the operand is an Order
+            # Test if the operand is an Sorted
             #
             # @return [Boolean]
             #
             # @api private
             def optimizable?
-              operand.kind_of?(Axiom::Relation::Operation::Order)
+              operand.kind_of?(Axiom::Relation::Operation::Sorted)
             end
 
-            # Flatten Reverse operation and Order operand into an Order
+            # Flatten Reverse operation and Sorted operand into an Sorted
             #
-            # @return [Order]
+            # @return [Sorted]
             #
             # @api private
             def optimize
               operand.operand.sort_by { operation.directions }
             end
 
-          end # class OrderOperand
+          end # class SortedOperand
 
           # Optimize when operand is optimizable
           class UnoptimizedOperand < self
@@ -71,7 +71,7 @@ module Axiom
 
           Axiom::Relation::Operation::Reverse.optimizer = chain(
             ReverseOperand,
-            OrderOperand,
+            SortedOperand,
             OneLimitOperand,
             EmptyOperand,
             MaterializedOperand,

data/lib/axiom/optimizer/relation/operation/{order.rb → sorted.rb}

@@ -5,13 +5,13 @@ module Axiom
     module Relation
       module Operation
 
-        # Abstract base class representing Order optimizations
-        class Order < Unary
+        # Abstract base class representing Sorted optimizations
+        class Sorted < Unary
 
-          # Optimize when the operand is an Order
-          class OrderOperand < self
+          # Optimize when the operand is an Sorted
+          class SortedOperand < self
 
-            # Test if the operand is an Order
+            # Test if the operand is an Sorted
             #
             # @return [Boolean]
             #
@@ -20,16 +20,16 @@ module Axiom
               operand.kind_of?(operation.class)
             end
 
-            # Flatten Order operations using the operation directions
+            # Flatten Sorted operations using the operation directions
             #
-            # @return [Order]
+            # @return [Sorted]
             #
             # @api private
             def optimize
-              operand.operand.sort_by { operation.directions }
+              operand.operand.sort_by(operation.directions)
             end
 
-          end # class OrderOperand
+          end # class SortedOperand
 
           # Optimize when the operand is a Limit with a limit of 1
           class OneLimitOperand < self
@@ -44,7 +44,7 @@ module Axiom
               operand.limit == 1
             end
 
-            # An Order of a Limit with a limit of 1 is a noop
+            # An Sorted of a Limit with a limit of 1 is a noop
             #
             # @return [Limit]
             #
@@ -59,26 +59,26 @@ module Axiom
           class UnoptimizedOperand < self
             include Function::Unary::UnoptimizedOperand
 
-            # Return an Order with an optimized operand
+            # Return an Sorted with an optimized operand
             #
             # @return [Offset]
             #
             # @api private
             def optimize
-              operand.sort_by { operation.directions }
+              operand.sort_by(operation.directions)
             end
 
           end # class UnoptimizedOperand
 
-          Axiom::Relation::Operation::Order.optimizer = chain(
-            OrderOperand,
+          Axiom::Relation::Operation::Sorted.optimizer = chain(
+            SortedOperand,
             OneLimitOperand,
             EmptyOperand,
             MaterializedOperand,
             UnoptimizedOperand
           )
 
-        end # class Order
+        end # class Sorted
       end # module Operation
     end # module Relation
   end # class Optimizer

data/lib/axiom/optimizer/relation/operation/unary.rb

@@ -26,28 +26,28 @@ module Axiom
             @header = operation.header
           end
 
-          # Optimize when the operand is an Order
-          module OrderOperand
+          # Optimize when the operand is an Sorted
+          module SortedOperand
 
-            # Test if the operand is an Order
+            # Test if the operand is an Sorted
             #
             # @return [Boolean]
             #
             # @api private
             def optimizable?
-              operand.kind_of?(Axiom::Relation::Operation::Order)
+              operand.kind_of?(Axiom::Relation::Operation::Sorted)
             end
 
-            # Drop the Order and wrap the operand
+            # Drop the Sorted and wrap the operand
             #
-            # @return [Order]
+            # @return [Sorted]
             #
             # @api private
             def optimize
               wrap_operand
             end
 
-          end # module OrderOperand
+          end # module SortedOperand
 
           # Optimize when the header is not changed
           class UnchangedHeader < self

data/lib/axiom/optimizer/support/predicate_partition.rb

@@ -45,14 +45,12 @@ module Axiom
       #
       # @api private
       def initialize(predicate, left_header, right_header)
-        @left      = TAUTOLOGY
-        @right     = TAUTOLOGY
-        @remainder = TAUTOLOGY
+        @left = @right = @remainder = TAUTOLOGY
 
         @left_header  = left_header
         @right_header = right_header
 
-        partition!(predicate)
+        partition(predicate)
       end
 
     private
@@ -64,14 +62,14 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def partition!(predicate)
+      def partition(predicate)
         each_operand(predicate) do |operand|
           case operand
-          when Axiom::Function::Binary   then partition_binary!(operand)
-          when Axiom::Function::Unary    then partition_unary!(operand)
-          when Axiom::Attribute::Boolean then partition_attribute!(operand)
+          when Axiom::Function::Binary   then partition_binary(operand)
+          when Axiom::Function::Unary    then partition_unary(operand)
+          when Axiom::Attribute::Boolean then partition_attribute(operand)
           else
-            partition_proposition!(operand)
+            partition_proposition(operand)
           end
         end
       end
@@ -83,7 +81,7 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def partition_binary!(function)
+      def partition_binary(function)
         operands       = [function.left, function.right].grep(Axiom::Attribute)
         left_operands  = @left_header  & operands
         right_operands = @right_header & operands
@@ -103,7 +101,7 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def partition_unary!(function)
+      def partition_unary(function)
         operand = function.operand
         @left  &= function if @left_header.include?(operand)
         @right &= function if @right_header.include?(operand)
@@ -116,7 +114,7 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def partition_attribute!(attribute)
+      def partition_attribute(attribute)
         @left  &= attribute if @left_header.include?(attribute)
         @right &= attribute if @right_header.include?(attribute)
       end
@@ -128,7 +126,7 @@ module Axiom
       # @return [undefined]
       #
       # @api private
-      def partition_proposition!(proposition)
+      def partition_proposition(proposition)
         @remainder &= proposition
         @left      &= proposition
         @right     &= proposition

data/lib/axiom/optimizer/version.rb

@@ -4,7 +4,7 @@ module Axiom
   class Optimizer
 
     # Gem version
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
 
   end # class Optimizer
 end # module Axiom

data/spec/integration/axiom/algebra/difference/optimize_spec.rb

@@ -14,8 +14,8 @@ describe Algebra::Difference, '#optimize' do
 
   before do
     # skip dup of the left and right body to avoid clearing the method stubs
-    left_body.stub(:frozen?).and_return(true)
-    right_body.stub(:frozen?).and_return(true)
+    allow(left_body).to receive(:frozen?).and_return(true)
+    allow(right_body).to receive(:frozen?).and_return(true)
   end
 
   context 'left is an empty relation' do
@@ -29,7 +29,7 @@ describe Algebra::Difference, '#optimize' do
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -47,7 +47,7 @@ describe Algebra::Difference, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
@@ -65,12 +65,12 @@ describe Algebra::Difference, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -88,12 +88,12 @@ describe Algebra::Difference, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -113,12 +113,12 @@ describe Algebra::Difference, '#optimize' do
       end
 
       it 'executes left_body#each' do
-        left_body.should_receive(:each)
+        expect(left_body).to receive(:each)
         subject
       end
 
       it 'executes right_body#each' do
-        right_body.should_receive(:each)
+        expect(right_body).to receive(:each)
         subject
       end
 
@@ -133,12 +133,12 @@ describe Algebra::Difference, '#optimize' do
     it { should be(object) }
 
     it 'executes left_body#each' do
-      left_body.should_receive(:each)
+      expect(left_body).to receive(:each)
       subject
     end
 
     it 'executes right_body#each' do
-      right_body.should_receive(:each)
+      expect(right_body).to receive(:each)
       subject
     end
 

data/spec/integration/axiom/algebra/intersection/optimize_spec.rb

@@ -14,8 +14,8 @@ describe Algebra::Intersection, '#optimize' do
 
   before do
     # skip dup of the left and right body to avoid clearing the method stubs
-    left_body.stub(:frozen?).and_return(true)
-    right_body.stub(:frozen?).and_return(true)
+    allow(left_body).to receive(:frozen?).and_return(true)
+    allow(right_body).to receive(:frozen?).and_return(true)
   end
 
   context 'left is an empty relation' do
@@ -29,7 +29,7 @@ describe Algebra::Intersection, '#optimize' do
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -47,7 +47,7 @@ describe Algebra::Intersection, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
@@ -65,12 +65,12 @@ describe Algebra::Intersection, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -88,12 +88,12 @@ describe Algebra::Intersection, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -113,12 +113,12 @@ describe Algebra::Intersection, '#optimize' do
       end
 
       it 'executes left_body#each' do
-        left_body.should_receive(:each)
+        expect(left_body).to receive(:each)
         subject
       end
 
       it 'executes right_body#each' do
-        right_body.should_receive(:each)
+        expect(right_body).to receive(:each)
         subject
       end
 
@@ -133,12 +133,12 @@ describe Algebra::Intersection, '#optimize' do
     it { should be(object) }
 
     it 'executed left_body#each' do
-      left_body.should_receive(:each)
+      expect(left_body).to receive(:each)
       subject
     end
 
     it 'executed right_body#each' do
-      right_body.should_receive(:each)
+      expect(right_body).to receive(:each)
       subject
     end
 

data/spec/integration/axiom/algebra/join/optimize_spec.rb

@@ -23,7 +23,7 @@ describe Algebra::Join, '#optimize' do
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -40,7 +40,7 @@ describe Algebra::Join, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
@@ -57,7 +57,7 @@ describe Algebra::Join, '#optimize' do
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end
 
@@ -74,7 +74,7 @@ describe Algebra::Join, '#optimize' do
     end
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
@@ -85,12 +85,12 @@ describe Algebra::Join, '#optimize' do
     it { should be(object) }
 
     it 'does not execute left_body#each' do
-      left_body.should_not_receive(:each)
+      expect(left_body).not_to receive(:each)
       subject
     end
 
     it 'does not execute right_body#each' do
-      right_body.should_not_receive(:each)
+      expect(right_body).not_to receive(:each)
       subject
     end