veritas 0.0.1 → 0.0.2

data/lib/veritas/logic/predicate/exclusion.rb

@@ -22,7 +22,7 @@ module Veritas
         #
         # @api public
         def self.call(left, right)
-          !right.include?(left)
+          !right.send(Enumerable.compare_method(right), left)
         end
 
         # Return the inverse predicate class

data/lib/veritas/logic/predicate/inclusion.rb

@@ -22,7 +22,7 @@ module Veritas
         #
         # @api public
         def self.call(left, right)
-          right.include?(left)
+          right.send(Enumerable.compare_method(right), left)
         end
 
         # Return the inverse predicate class
@@ -54,11 +54,11 @@ module Veritas
           # Compare the left to see if it is included in the right
           #
           # @example
-          #   exclusion = attribute.exclude([ 1, 2, 3 ])
+          #   inclusion = attribute.include([ 1, 2, 3 ])
           #
           # @param [Expression] other
           #
-          # @return [Exclusion]
+          # @return [Inclusion]
           #
           # @api public
           def include(other)

data/lib/veritas/logic/predicate/inequality.rb

@@ -62,7 +62,7 @@ module Veritas
           # Compare the left to see if it is not equal to the right
           #
           # @example
-          #   inequality = expression.eq(other)
+          #   inequality = expression.ne(other)
           #
           # @param [Expression] other
           #

data/lib/veritas/logic/proposition.rb

@@ -79,13 +79,13 @@ module Veritas
       # Return the hash of the proposition
       #
       # @example
-      #   numeric_hash = proposition.hash
+      #   hash = proposition.hash
       #
-      # @return [Integer]
+      # @return [Fixnum]
       #
       # @api public
       def hash
-        call.hash
+        self.class.hash
       end
 
       # Return a string representing the proposition

data/lib/veritas/optimizer/algebra/extension.rb

@@ -24,7 +24,7 @@ module Veritas
           # @api private
           def optimize
             operation = self.operation
-            operation.class.new(operand, operation.extensions)
+            operation.class.new(operand, operation.extensions).optimize
           end
 
         end # class UnoptimizedOperand

data/lib/veritas/optimizer/algebra/join.rb

@@ -3,7 +3,7 @@ module Veritas
     module Algebra
 
       # Abstract base class representing Join optimizations
-      class Join < Relation::Operation::Combine
+      class Join < Relation::Operation::Combination
 
         # Optimize when operand headers are equivalent
         class EqualHeaders < self
@@ -23,7 +23,7 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Algebra::Intersection.new(left, right)
+            Veritas::Algebra::Intersection.new(left, right).optimize
           end
 
         end # class EqualHeaders

data/lib/veritas/optimizer/algebra/product.rb

@@ -3,7 +3,7 @@ module Veritas
     module Algebra
 
       # Abstract base class representing Product optimizations
-      class Product < Relation::Operation::Combine
+      class Product < Relation::Operation::Combination
 
         # Optimize when left operand is a TABLE DEE
         class TableDeeLeft < self
@@ -18,7 +18,7 @@ module Veritas
             left.header.empty? && !left.kind_of?(Veritas::Relation::Empty)
           end
 
-          # A Product wih a left TABLE DEE is equivalent to the right operand
+          # A Product with a left TABLE DEE is equivalent to the right operand
           #
           # @return [Relation]
           #
@@ -42,7 +42,7 @@ module Veritas
             right.header.empty? && !right.kind_of?(Veritas::Relation::Empty)
           end
 
-          # A Product wih a right TABLE DEE is equivalent to the left operand
+          # A Product with a right TABLE DEE is equivalent to the left operand
           #
           # @return [Relation]
           #

data/lib/veritas/optimizer/algebra/projection.rb

@@ -63,7 +63,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(operand.operand, header)
+            operation.class.new(operand.operand, header).optimize
           end
 
         end # class ProjectionOperand
@@ -97,7 +97,7 @@ module Veritas
           #
           # @api private
           def wrap_left
-            operation.class.new(operand.left, header)
+            operation.class.new(operand.left, header).optimize
           end
 
           # Utility method to wrap the right operand in a Projection
@@ -106,7 +106,7 @@ module Veritas
           #
           # @api private
           def wrap_right
-            operation.class.new(operand.right, header)
+            operation.class.new(operand.right, header).optimize
           end
 
         end # class SetOperand
@@ -152,7 +152,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(operand, header)
+            operation.class.new(operand, header).optimize
           end
 
         end # class UnoptimizedOperand

data/lib/veritas/optimizer/algebra/rename.rb

@@ -40,10 +40,10 @@ module Veritas
         #
         # @api private
         def wrap_operand
-          operation.class.new(operand.operand, aliases)
+          operation.class.new(operand.operand, aliases).optimize
         end
 
-        # Union the operaation aliases with any operand aliases
+        # Union the operation aliases with any operand aliases
         #
         # @param [Rename::Aliases]
         #   the original aliases
@@ -61,6 +61,29 @@ module Veritas
           end
         end
 
+        # Optimize when the headers are not changed
+        class UnchangedHeader < self
+
+          # Test if the renamed headers are the same as the operand's
+          #
+          # @return [Boolean]
+          #
+          # @api private
+          def optimizable?
+            header.to_a == operand.header.to_a
+          end
+
+          # A Rename with unchanged headers is a noop
+          #
+          # @return [Relation]
+          #
+          # @api private
+          def optimize
+            operand
+          end
+
+        end # class UnchangedHeader
+
         # Optimize when the operand is a Rename with aliases that cancel out
         class RenameOperandAndEmptyAliases < self
 
@@ -85,7 +108,7 @@ module Veritas
         end # class RenameOperandAndEmptyAliases
 
         # Optimize when the operand is a Rename
-        class RenameOperandAndAnyAliases < self
+        class RenameOperand < self
 
           # Test if the operand is a Rename
           #
@@ -93,7 +116,7 @@ module Veritas
           #
           # @api private
           def optimizable?
-            operand.kind_of?(operation.class) && aliases.any?
+            operand.kind_of?(operation.class)
           end
 
           # Flatten nested Renames into a single Rename
@@ -102,10 +125,10 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(operand.operand, aliases)
+            operation.class.new(operand.operand, aliases).optimize
           end
 
-        end # class RenameOperandAndAnyAliases
+        end # class RenameOperand
 
         # Optimize when the operand is a Projection
         class ProjectionOperand < self
@@ -193,7 +216,7 @@ module Veritas
           #
           # @api private
           def wrap_left
-            operation.class.new(operand.left, aliases)
+            operation.class.new(operand.left, aliases).optimize
           end
 
           # Utility method to wrap the right operand in a Rename
@@ -202,7 +225,7 @@ module Veritas
           #
           # @api private
           def wrap_right
-            operation.class.new(operand.right, aliases)
+            operation.class.new(operand.right, aliases).optimize
           end
 
         end # class SetOperand
@@ -272,7 +295,7 @@ module Veritas
           # @api private
           def optimize
             operand = self.operand
-            operand.class.new(wrap_operand, operand.to_i).optimize
+            operand.class.new(wrap_operand, operand.limit).optimize
           end
 
         end # class LimitOperand
@@ -296,7 +319,7 @@ module Veritas
           # @api private
           def optimize
             operand = self.operand
-            operand.class.new(wrap_operand, operand.to_i).optimize
+            operand.class.new(wrap_operand, operand.offset).optimize
           end
 
         end # class OffsetOperand
@@ -344,14 +367,15 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(operand, aliases)
+            operation.class.new(operand, aliases).optimize
           end
 
         end # class UnoptimizedOperand
 
         Veritas::Algebra::Rename.optimizer = chain(
+          UnchangedHeader,
           RenameOperandAndEmptyAliases,
-          RenameOperandAndAnyAliases,
+          RenameOperand,
           ProjectionOperand,
           RestrictionOperand,
           SetOperand,

data/lib/veritas/optimizer/algebra/restriction.rb

@@ -30,7 +30,7 @@ module Veritas
         #
         # @api private
         def wrap_operand
-          operation.class.new(operand.operand, predicate)
+          operation.class.new(operand.operand, predicate).optimize
         end
 
         # Optimize the predicate if possible
@@ -108,7 +108,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(operand.operand, optimized_predicate)
+            operation.class.new(operand.operand, optimized_predicate).optimize
           end
 
         private
@@ -153,7 +153,7 @@ module Veritas
           #
           # @api private
           def wrap_left
-            operation.class.new(operand.left, predicate)
+            operation.class.new(operand.left, predicate).optimize
           end
 
           # Utility method to wrap the right operand in a Restriction
@@ -162,7 +162,7 @@ module Veritas
           #
           # @api private
           def wrap_right
-            operation.class.new(operand.right, predicate)
+            operation.class.new(operand.right, predicate).optimize
           end
 
         end # class SetOperand
@@ -234,7 +234,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(operand, predicate)
+            operation.class.new(operand, predicate).optimize
           end
 
         end # class UnoptimizedOperand

data/lib/veritas/optimizer/algebra/summarization.rb

@@ -24,7 +24,7 @@ module Veritas
           # @api private
           def optimize
             operation = self.operation
-            operation.class.new(operand, operation.summarize_by, operation.summarizers)
+            operation.class.new(operand, operation.summarize_by, operation.summarizers).optimize
           end
 
         end # class UnoptimizedOperand

data/lib/veritas/optimizer/logic/connective/binary.rb

@@ -221,7 +221,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(left, right)
+              operation.class.new(left, right).optimize
             end
 
           private

data/lib/veritas/optimizer/logic/connective/negation.rb

@@ -35,7 +35,7 @@ module Veritas
             Predicate.optimize_operand(operation.operand)
           end
 
-          # Optimzie when the operand can be inverted
+          # Optimize when the operand can be inverted
           class InvertibleOperand < self
 
             # Test if the operand can be inverted

data/lib/veritas/optimizer/logic/predicate/comparable.rb

@@ -25,7 +25,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.reverse.new(right, left)
+              operation.class.reverse.new(right, left).optimize
             end
 
           end # class NormalizableOperands

data/lib/veritas/optimizer/logic/predicate/enumerable.rb

@@ -128,7 +128,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(left, right)
+              operation.class.new(left, right).optimize
             end
 
           end # class UnoptimizedOperand

data/lib/veritas/optimizer/logic/predicate/exclusion.rb

@@ -32,7 +32,7 @@ module Veritas
             #
             # @api private
             def optimize
-              Veritas::Logic::Predicate::Inequality.new(left, right.first)
+              Veritas::Logic::Predicate::Inequality.new(left, right.first).optimize
             end
 
           end # class OneRightOperand

data/lib/veritas/optimizer/logic/predicate/inclusion.rb

@@ -32,7 +32,7 @@ module Veritas
             #
             # @api private
             def optimize
-              Veritas::Logic::Predicate::Equality.new(left, right.first)
+              Veritas::Logic::Predicate::Equality.new(left, right.first).optimize
             end
 
           end # class OneRightOperand

data/lib/veritas/optimizer/relation/operation/binary.rb

@@ -135,7 +135,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(left, right)
+              operation.class.new(left, right).optimize
             end
 
           private

data/lib/veritas/optimizer/relation/operation/{combine.rb → combination.rb}

@@ -4,7 +4,7 @@ module Veritas
       module Operation
 
         # Abstract base class representing combinations of relations
-        class Combine < Binary
+        class Combination < Binary
 
           # Any relation combined with an empty relation is an empty relation
           #
@@ -24,7 +24,7 @@ module Veritas
           class EmptyRight < self
             include Binary::EmptyRight
           end # class EmptyRight
-        end # class Combine
+        end # class Combination
       end # module Operation
     end # module Relation
   end # class Optimizer

data/lib/veritas/optimizer/relation/operation/limit.rb

@@ -14,7 +14,7 @@ module Veritas
           #
           # @api private
           def limit
-            operation.to_i
+            operation.limit
           end
 
           # Optimize when the limit is zero
@@ -69,13 +69,13 @@ module Veritas
             #
             # @api private
             def equal_limit?
-              limit == operand.to_i
+              limit == operand.limit
             end
 
           end # class EqualLimitOperand
 
           # Optimize when the operand is a Limit
-          class InequalLimitOperand < self
+          class LimitOperand < self
 
             # Test if the operand is a Limit
             #
@@ -83,7 +83,7 @@ module Veritas
             #
             # @api private
             def optimizable?
-              operand.kind_of?(operation.class) && inequal_limit?
+              operand.kind_of?(operation.class)
             end
 
             # Flatten Limit operations using the minimum limit
@@ -92,30 +92,21 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand.operand, min_limit)
+              operation.class.new(operand.operand, min_limit).optimize
             end
 
           private
 
-            # Test if the operation and operand limits are not equal
-            #
-            # @return [Boolean]
-            #
-            # @api private
-            def inequal_limit?
-              limit != operand.to_i
-            end
-
             # Return the minimum limit between the operation and operand
             #
             # @return [Integer]
             #
             # @api private
             def min_limit
-              [ limit, operand.to_i ].min
+              [ limit, operand.limit ].min
             end
 
-          end # class InequalLimitOperand
+          end # class LimitOperand
 
           # Optimize when operand is optimizable
           class UnoptimizedOperand < self
@@ -135,7 +126,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand, limit)
+              operation.class.new(operand, limit).optimize
             end
 
           end # class UnoptimizedOperand
@@ -143,7 +134,7 @@ module Veritas
           Veritas::Relation::Operation::Limit.optimizer = chain(
             ZeroLimit,
             EqualLimitOperand,
-            InequalLimitOperand,
+            LimitOperand,
             EmptyOperand,
             MaterializedOperand,
             UnoptimizedOperand

data/lib/veritas/optimizer/relation/operation/offset.rb

@@ -14,7 +14,7 @@ module Veritas
           #
           # @api private
           def offset
-            operation.to_i
+            operation.offset
           end
 
           # Optimize when the offset is zero
@@ -58,7 +58,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand.operand, sum_offset)
+              operation.class.new(operand.operand, sum_offset).optimize
             end
 
           private
@@ -69,7 +69,7 @@ module Veritas
             #
             # @api private
             def sum_offset
-              offset + operand.to_i
+              offset + operand.offset
             end
 
           end # class OffsetOperand
@@ -92,7 +92,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand, offset)
+              operation.class.new(operand, offset).optimize
             end
 
           end # class UnoptimizedOperand

data/lib/veritas/optimizer/relation/operation/order.rb

@@ -25,7 +25,7 @@ module Veritas
             # @api private
             def optimize
               operation = self.operation
-              operation.class.new(operand.operand, operation.directions)
+              operation.class.new(operand.operand, operation.directions).optimize
             end
 
           end # class OrderOperand
@@ -41,7 +41,7 @@ module Veritas
             def optimizable?
               operand = self.operand
               operand.kind_of?(Veritas::Relation::Operation::Limit) &&
-              operand.to_i == 1
+              operand.limit == 1
             end
 
             # An Order of a Limit with a limit of 1 is a noop
@@ -74,7 +74,7 @@ module Veritas
             # @api private
             def optimize
               operation = self.operation
-              operation.class.new(operand, operation.directions)
+              operation.class.new(operand, operation.directions).optimize
             end
 
           end # class UnoptimizedOperand

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

@@ -48,7 +48,7 @@ module Veritas
             # @api private
             def optimize
               operand = self.operand
-              operand.class.new(operand.operand, operation.directions)
+              operand.class.new(operand.operand, operation.directions).optimize
             end
 
           end # class OrderOperand
@@ -71,7 +71,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand)
+              operation.class.new(operand).optimize
             end
 
           end # class UnoptimizedOperand

data/lib/veritas/optimizer/relation/operation.rb

@@ -1,6 +1,6 @@
 require 'veritas/optimizer/relation/operation/binary'
 require 'veritas/optimizer/relation/operation/unary'
-require 'veritas/optimizer/relation/operation/combine'
+require 'veritas/optimizer/relation/operation/combination'
 
 require 'veritas/optimizer/relation/operation/limit'
 require 'veritas/optimizer/relation/operation/offset'

data/lib/veritas/relation/header.rb

@@ -201,13 +201,13 @@ module Veritas
       # Return the hash of the header
       #
       # @example
-      #   numeric_hash = header.hash
+      #   hash = header.hash
       #
-      # @return [Integer]
+      # @return [Fixnum]
       #
       # @api public
       def hash
-        to_ary.hash
+        self.class.hash ^ to_ary.hash
       end
 
       # Test if there are no attributes

data/lib/veritas/relation/operation/binary.rb

@@ -29,8 +29,8 @@ module Veritas
         # @api private
         def initialize(left, right)
           super
-          @header     = left.header     | right.header
-          @directions = left.directions | right.directions
+          @header     = left.header | right.header
+          @directions = Relation::Operation::Order::DirectionSet::EMPTY
         end
 
         module ClassMethods

data/lib/veritas/relation/operation/{combine.rb → combination.rb}

@@ -3,7 +3,7 @@ module Veritas
     module Operation
 
       # A mixin for relations that combine their operands
-      module Combine
+      module Combination
         include Binary
 
         # Combine tuples together and yield the joined tuple
@@ -29,7 +29,7 @@ module Veritas
           end
         end
 
-      end # module Combine
+      end # module Combination
     end # module Operation
   end # class Relation
 end # module Veritas