veritas-optimizer 0.0.5 → 0.0.6

data/.travis.yml

@@ -3,8 +3,9 @@ script: "bundle exec rake spec"
 rvm:
   - 1.8.7
   - 1.9.2
-  - rbx
-  # - rbx-2.0
+  - 1.9.3
+  - ruby-head
   - ree
   - jruby
-  - ruby-head
+  - rbx
+  - rbx-2.0

data/Gemfile

@@ -2,7 +2,7 @@
 
 source :rubygems
 
-gem 'veritas', '~> 0.0.5', :git => 'git://github.com/dkubb/veritas.git'
+gem 'veritas', '~> 0.0.6', :git => 'git://github.com/dkubb/veritas.git'
 
 group :development do
   gem 'backports', '~> 2.3.0'
@@ -13,10 +13,9 @@ group :development do
 end
 
 group :guard do
-  gem 'guard',         '~> 0.5.1'
+  gem 'guard',         '~> 0.7.0'
   gem 'guard-bundler', '~> 0.1.3'
-  gem 'guard-ego',     '~> 0.0.1'
-  gem 'guard-rspec',   '~> 0.4.0'
+  gem 'guard-rspec',   '~> 0.4.5'
 end
 
 platform :jruby do
@@ -27,16 +26,19 @@ end
 
 platforms :mri_18 do
   group :metrics do
-    gem 'flay',      '~> 1.4.2'
-    gem 'flog',      '~> 2.5.1'
-    gem 'heckle',    '~> 1.4.3'
-    gem 'json',      '~> 1.5.3'
-    gem 'metric_fu', '~> 2.1.1'
-    gem 'mspec',     '~> 1.5.17'
-    gem 'rcov',      '~> 0.9.9'
-    gem 'reek',      '~> 1.2.8', :git => 'git://github.com/dkubb/reek.git'
-    gem 'roodi',     '~> 2.1.0'
-    gem 'ruby2ruby', '=  1.2.2'
-    gem 'yardstick', '~> 0.4.0'
+    gem 'arrayfields', '~> 4.7.4'
+    gem 'fattr',       '~> 2.2.0'
+    gem 'flay',        '~> 1.4.2'
+    gem 'flog',        '~> 2.5.3'
+    gem 'heckle',      '~> 1.4.3'
+    gem 'json',        '~> 1.6.1'
+    gem 'map',         '~> 4.4.0'
+    gem 'metric_fu',   '~> 2.1.1'
+    gem 'mspec',       '~> 1.5.17'
+    gem 'rcov',        '~> 0.9.9'
+    gem 'reek',        '~> 1.2.8', :git => 'git://github.com/dkubb/reek.git'
+    gem 'roodi',       '~> 2.1.0'
+    gem 'ruby2ruby',   '=  1.2.2'
+    gem 'yardstick',   '~> 0.4.0'
   end
 end

data/Guardfile

@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-guard 'ego' do
-  watch('Guardfile')
-end
-
 guard 'bundler' do
   watch('Gemfile')
 end

data/{README.rdoc → README.md}

@@ -1,26 +1,65 @@
-= Veritas Optimizer
+# Veritas Optimizer
 
 Relational algebra optimizer
 
-http://travis-ci.org/dkubb/veritas-optimizer.png
+[![Build Status](https://secure.travis-ci.org/dkubb/veritas-optimizer.png)](http://travis-ci.org/dkubb/veritas-optimizer)
 
-== Usage
+## Installation
 
-  # optimize a relation
-  new_relation = relation.optimize
-  new_relation = relation.optimize(optimizer)
+With Rubygems:
 
-  # optimize a scalar function
-  new_function = function.optimize
-  new_function = function.optimize(optimizer)
+```bash
+$ gem install veritas-optimizer
+$ irb -rubygems
+>> require 'veritas-optimizer'
+=> true
+```
 
-  # optimize an aggregate function
-  new_aggregate = function.aggregate
-  new_aggregate = function.aggregate(optimizer)
+With git and local working copy:
 
-== Description
+```bash
+$ git clone git://github.com/dkubb/veritas-optimizer.git
+$ cd veritas-optimizer
+$ rake install
+$ irb -rubygems
+>> require 'veritas-optimizer'
+=> true
+```
 
-The purpose of this gem is to provide a simple API that can be used to optimize a veritas[https://github.com/dkubb/veritas] relation, scalar or aggregate function. An optional optimizer can be passed in to the #optimize method and return an equivalent but simplified version of the object.
+NOTE: This gem works best with ruby 1.9, however if you are using ruby 1.8 you must also install [backports](https://rubygems.org/gems/backports), then require backports and backports/basic_object, eg:
+
+```bash
+$ ruby -e 'puts RUBY_VERSION'
+=> 1.8.7
+$ gem install backports
+$ irb -rubygems
+>> require 'backports'
+=> true
+>> require 'backports/basic_object'
+=> true
+>> require 'veritas-optimizer'  # assuming it was installed by one of the two methods above
+=> true
+```
+
+## Usage
+
+```ruby
+# optimize a relation
+new_relation = relation.optimize
+new_relation = relation.optimize(optimizer)
+
+# optimize a scalar function
+new_function = function.optimize
+new_function = function.optimize(optimizer)
+
+# optimize an aggregate function
+new_aggregate = function.aggregate
+new_aggregate = function.aggregate(optimizer)
+```
+
+## Description
+
+The purpose of this gem is to provide a simple API that can be used to optimize a [veritas](https://github.com/dkubb/veritas) relation, scalar or aggregate function. An optional optimizer can be passed in to the #optimize method and return an equivalent but simplified version of the object.
 
 One of the primary benefits of Relational Algebra is that it's based on logic, and the rules for simplifying logic are well known and studied. An optimizer can pass through user-generated objects and typically find ways to simplify or organize them in a way that will be more efficient when the operation is executed.
 
@@ -28,30 +67,32 @@ The goal is not to replace the advanced optimizers that are inside most database
 
 With the ability to provide custom optimizers we can even target output to a structure optimized for specific datastores. All operations in relational algebra can be transformed into other equivalent operations, ones that are more efficient for the target datastore to execute. The built-in optimizers included in this gem are only a starting point; the intention is to expand them as well as help others create custom optimizers that are optimized for each datastore.
 
-== Design
+## Design
 
 The contract for an optimizer instance is simple:
 
-  a) it must respond to #call, and accept an optimizable object as it's only argument
-  b) it must return an equivalent object
-  c) it must return the exact object when it cannot perform further optimizations
+1. it must respond to #call, and accept an optimizable object as it's only argument
+2. it must return an equivalent object
+3. it must return the exact object when it cannot perform further optimizations
 
-The optimizer can perform whatever logic it wishes on the object or any of it's contained objects as far down the tree as it likes as long as the requirements for (b) and (c) are met.
+The optimizer can perform whatever logic it wishes on the object or any of it's contained objects as far down the tree as it likes as long as the requirements for (2) and (3) are met.
 
 Inside this gem we have the concept of an optimizer chain. It's a chain of responsibility, which means it's a set of objects chained together to form a pipeline. The object is passed into the head of the pipeline and is either matched and returned by one of the optimizers, or it is already fully optimized and passes through to the end of the chain and is returned as-is. This chain organization has proven to be extremely effective, and it is trivial to re-order or add new optimizers into the middle of the chain as needed. Further work will be made to provide APIs to make this even simpler.
 
 Here is an example of an optimizer chain for the restriction operator (think WHERE clause in SQL):
 
-  Veritas::Algebra::Restriction.optimizer = chain(
-    Tautology,            # does the predicate match everything?
-    Contradiction,        # does the predicate match nothing?
-    RestrictionOperand,   # does the restriction contain another restriction?
-    SetOperand,           # does the restriction contain a set operation?
-    OrderOperand,         # does the restriction contain an order?
-    EmptyOperand,         # does the restriction contain an empty relation?
-    MaterializedOperand,  # does the restriction contain a materialized relation?
-    UnoptimizedOperand    # does the restriction contain an unoptimized relation?
-  )
+```ruby
+Veritas::Algebra::Restriction.optimizer = chain(
+  Tautology,            # does the predicate match everything?
+  Contradiction,        # does the predicate match nothing?
+  RestrictionOperand,   # does the restriction contain another restriction?
+  SetOperand,           # does the restriction contain a set operation?
+  OrderOperand,         # does the restriction contain an order?
+  EmptyOperand,         # does the restriction contain an empty relation?
+  MaterializedOperand,  # does the restriction contain a materialized relation?
+  UnoptimizedOperand    # does the restriction contain an unoptimized relation?
+)
+```
 
 The restriction operator enters this pipeline, and tests are made at each stage. If the test returns true, then an optimization is performed. Usually the goal is to eliminate work performed by the system or collapse the tree of operations down into something simpler. More aggressive optimizations are usually checked first because we would like to prune as much of the tree as possible up-front. In this case, the first test checks to see if the restriction matches everything, in which case it's pretty much a no-op, and we can drop it altogether. If that's not the case, we then test to see if it matches nothing, if that's the case then we can return an empty relation. Then we test if it's another restriction, in which case we can "AND" the predicates for both restrictions together and return a single restriction operation. And so on down the list with the first match winning.
 
@@ -59,26 +100,18 @@ We always perform at least two optimization passes on each object, because once
 
 Once the optimization passes are finished, and no further optimization is possible, the result of an #optimize call is memoized. Further calls to #optimize will always return the same object.
 
-== Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
 
-* If you want your code merged into the mainline, please discuss
-  the proposed changes with me before doing any work on it. This
-  library is still in early development, and it may not always be
-  clear the direction it is going. Some features may not be appropriate
-  yet, may need to be deferred until later when the foundation for
-  them is laid, or may be more applicable in a plugin.
+* If you want your code merged into the mainline, please discuss the proposed changes with me before doing any work on it. This library is still in early development, and it may not always be clear the direction it is going. Some features may not be appropriate yet, may need to be deferred until later when the foundation for them is laid, or may be more applicable in a plugin.
 * Fork the project.
 * Make your feature addition or bug fix.
-  * Follow this {style guide}[https://github.com/dkubb/styleguide].
-* Add specs for it. This is important so I don't break it in a
-  future version unintentionally. Tests must cover all branches
-  within the code, and code must be fully covered.
-* Commit, do not mess with Rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+  * Follow this [style guide](https://github.com/dkubb/styleguide).
+* Add specs for it. This is important so I don't break it in a future version unintentionally. Tests must cover all branches within the code, and code must be fully covered.
+* Commit, do not mess with Rakefile, version, or history.  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Run "rake ci". This must pass and not show any regressions in the
   metrics for the code to be merged.
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2011 Dan Kubb. See LICENSE for details.
+Copyright © 2011 Dan Kubb. See LICENSE for details.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake'
 require File.expand_path('../lib/veritas/optimizer/version', __FILE__)
 
 begin
-  gem('jeweler', '~> 1.6.2') if respond_to?(:gem, true)
+  gem('jeweler', '~> 1.6.4') if respond_to?(:gem, true)
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -23,5 +23,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.2'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4'
 end

data/TODO

@@ -10,15 +10,6 @@
   change the other relation to use a restriction to filter the records.
   * This will help optimize the fetching of the underlying records.
 
-* Convert all the direct Veritas class usage to use the corresponding
-  methods. So for example instead of Algebra::Join.new(left, right) I
-  would want left.join(right).
-  * The reason for this is that as the Relation Gateway is created
-    it will have operands that will not be directly joinable without
-    gateway specific processing. By using the method directly I give the
-    chance for the gateway to step in and perform other work before
-    delegating up to the built-in operators in veritas.
-
 * More optimizations:
   * Union
     * A Union of relations with the same base, header, and restrictions should

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 120
-total_score: 942
+threshold: 113
+total_score: 845

data/config/site.reek

@@ -46,7 +46,12 @@ UncommunicativeModuleName:
   - !ruby/regexp /[0-9]$/
 NestedIterators:
   ignore_iterators: []
-  exclude: []
+  exclude: [
+    # none of these use nested iterators, they use nested blocks only
+    Veritas::Optimizer::Algebra::Extension#wrap_operand,
+    Veritas::Optimizer::Algebra::Summarization#wrap_operand,
+    Veritas::Optimizer::Algebra::Summarization::EmptyOperand#optimize
+  ]
   enabled: true
   max_allowed_nesting: 1
 LongMethod:

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

@@ -17,7 +17,8 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(operation.header)
+            operation = self.operation
+            Veritas::Relation::Empty.new(operation.header, operation)
           end
 
         end # class EqualOperands

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

@@ -41,7 +41,11 @@ module Veritas
         #
         # @api private
         def wrap_operand(operand = operand.operand)
-          operation.class.new(operand, extensions)
+          operand.extend do |context|
+            extensions.each do |extension|
+              context.add(*extension)
+            end
+          end
         end
 
         # Optimize when the operand is an Order
@@ -79,7 +83,7 @@ module Veritas
           #
           # @api private
           def extensions_optimizable?
-            !extensions.eql?(operation.extensions)
+            ! extensions.eql?(operation.extensions)
           end
 
         end # class UnoptimizedOperand

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

@@ -49,7 +49,7 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Algebra::Intersection.new(left, right)
+            left.intersect(right)
           end
 
         end # class EqualHeaders
@@ -63,7 +63,7 @@ module Veritas
           #
           # @api private
           def optimizable?
-            left.materialized? && !right_matching_left?
+            left.materialized? && ! right_matching_left?
           end
 
           # Return the join of the left and right with the right restricted
@@ -72,7 +72,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(left, right.restrict { materialized_predicate })
+            left.join(right.restrict { materialized_predicate })
           end
 
         private
@@ -107,7 +107,7 @@ module Veritas
           #
           # @api private
           def optimizable?
-            right.materialized? && !left_matching_right?
+            right.materialized? && ! left_matching_right?
           end
 
           # Return the join of the left and right with the left restricted
@@ -116,7 +116,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operation.class.new(left.restrict { materialized_predicate }, right)
+            left.restrict { materialized_predicate }.join(right)
           end
 
         private

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

@@ -17,7 +17,7 @@ module Veritas
           # @api private
           def optimizable?
             left = self.left
-            left.header.empty? && !left.kind_of?(Veritas::Relation::Empty)
+            left.header.empty? && ! left.kind_of?(Veritas::Relation::Empty)
           end
 
           # A Product with a left TABLE DEE is equivalent to the right operand
@@ -41,7 +41,7 @@ module Veritas
           # @api private
           def optimizable?
             right = self.right
-            right.header.empty? && !right.kind_of?(Veritas::Relation::Empty)
+            right.header.empty? && ! right.kind_of?(Veritas::Relation::Empty)
           end
 
           # A Product with a right TABLE DEE is equivalent to the left operand

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

@@ -15,7 +15,7 @@ module Veritas
         #
         # @api private
         def wrap_operand(operand = operand.operand)
-          operation.class.new(operand, header)
+          operand.project(header)
         end
 
         # Optimize when the operand is a Projection
@@ -59,7 +59,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand.class.new(wrap_left, wrap_right)
+            wrap_left.union(wrap_right)
           end
 
         private
@@ -107,7 +107,7 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(header)
+            Veritas::Relation::Empty.new(header, operation)
           end
 
         end # class EmptyOperand

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

@@ -34,7 +34,7 @@ module Veritas
         #
         # @api private
         def wrap_operand(operand = operand.operand)
-          operation.class.new(operand, aliases)
+          operand.rename(aliases)
         end
 
         # Optimize when the operand is a Rename
@@ -112,7 +112,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand.class.new(wrap_operand, header)
+            wrap_operand.project(header)
           end
 
         private
@@ -124,7 +124,7 @@ module Veritas
           # @api private
           def distributive?
             names = alias_names
-            removed_attributes.all? { |attribute| !names.include?(attribute.name) }
+            removed_attributes.all? { |attribute| ! names.include?(attribute.name) }
           end
 
           # Return the aliases as an inverted Hash
@@ -166,7 +166,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand.class.new(wrap_operand, rename_predicate)
+            wrap_operand.restrict { rename_predicate }
           end
 
         private
@@ -243,7 +243,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand.class.new(wrap_operand)
+            wrap_operand.reverse
           end
 
         end # class ReverseOperand
@@ -258,7 +258,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand.class.new(wrap_operand, directions)
+            wrap_operand.sort_by { directions }
           end
 
         private
@@ -292,8 +292,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand = self.operand
-            operand.class.new(wrap_operand, operand.limit)
+            wrap_operand.take(operand.limit)
           end
 
         end # class LimitOperand
@@ -316,8 +315,7 @@ module Veritas
           #
           # @api private
           def optimize
-            operand = self.operand
-            operand.class.new(wrap_operand, operand.offset)
+            wrap_operand.drop(operand.offset)
           end
 
         end # class OffsetOperand
@@ -340,7 +338,7 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(header)
+            Veritas::Relation::Empty.new(header, operation)
           end
 
         end # class EmptyOperand

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

@@ -32,7 +32,7 @@ module Veritas
         #
         # @api private
         def wrap_operand(operand = operand.operand)
-          operation.class.new(operand, predicate)
+          operand.restrict { predicate }
         end
 
         # Return true if the predicate is a true value
@@ -52,7 +52,7 @@ module Veritas
         #
         # @api private
         def constant_false_predicate?
-          !(predicate.respond_to?(:call) || constant_true_predicate?)
+          ! (predicate.respond_to?(:call) || constant_true_predicate?)
         end
 
         # Optimize when the predicate is a tautology
@@ -98,7 +98,8 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(operation.header)
+            operation = self.operation
+            Veritas::Relation::Empty.new(operation.header, operation)
           end
 
         end # class Contradiction
@@ -132,7 +133,7 @@ module Veritas
           #
           # @api private
           def predicate
-            Veritas::Function::Connective::Conjunction.new(operand.predicate, super).optimize
+            operand.predicate.and(super).optimize
           end
 
         end # class RestrictionOperand
@@ -180,7 +181,7 @@ module Veritas
           #
           # @api private
           def restriction_commutative?
-            !(partition_left_tautology? && partition_right_tautology?)
+            ! (partition_left_tautology? && partition_right_tautology?)
           end
 
           # Test if the predicate for the left operand would match everything
@@ -341,7 +342,7 @@ module Veritas
           #
           # @api private
           def optimizable?
-            super || !predicate.equal?(operation.predicate)
+            super || ! predicate.equal?(operation.predicate)
           end
 
           # Return a Restriction with an optimized operand

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

@@ -58,7 +58,11 @@ module Veritas
         #
         # @api private
         def wrap_operand(operand = operand.operand)
-          operation.class.new(operand, summarize_per, summarizers)
+          operand.summarize(summarize_per) do |context|
+            summarizers.each do |summarizer|
+              context.add(*summarizer)
+            end
+          end
         end
 
         # Optimize when the operand is Empty
@@ -92,7 +96,11 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Algebra::Extension.new(summarize_per, extensions)
+            summarize_per.extend do |context|
+              extensions.each do |extension|
+                context.add(*extension)
+              end
+            end
           end
 
         private
@@ -130,7 +138,8 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(operation.header)
+            operation = self.operation
+            Veritas::Relation::Empty.new(operation.header, operation)
           end
 
         end # class EmptySummarizePer
@@ -172,7 +181,7 @@ module Veritas
           #
           # @api private
           def summarize_per_optimizable?
-            !summarize_per.equal?(operation.summarize_per)
+            ! summarize_per.equal?(operation.summarize_per)
           end
 
           # Test if the summarizers are optimizable
@@ -181,7 +190,7 @@ module Veritas
           #
           # @api private
           def summarizers_optimizable?
-            !summarizers.eql?(operation.summarizers)
+            ! summarizers.eql?(operation.summarizers)
           end
 
         end # class UnoptimizedOperand

data/lib/veritas/optimizer/function/binary.rb

@@ -105,7 +105,7 @@ module Veritas
           #
           # @api private
           def left_optimizable?
-            !left.equal?(operation.left)
+            ! left.equal?(operation.left)
           end
 
           # Test if the right operand is optimizable
@@ -114,7 +114,7 @@ module Veritas
           #
           # @api private
           def right_optimizable?
-            !right.equal?(operation.right)
+            ! right.equal?(operation.right)
           end
 
         end # module UnoptimizedOperands

data/lib/veritas/optimizer/function/connective/conjunction.rb

@@ -72,8 +72,7 @@ module Veritas
             #
             # @api private
             def optimize
-              left = self.left
-              Veritas::Function::Predicate::Exclusion.new(left.left, merged_right_enumerables).optimize
+              left.left.exclude(merged_right_enumerables).optimize
             end
 
           end # class OptimizableToExclusion

data/lib/veritas/optimizer/function/connective/disjunction.rb

@@ -72,8 +72,7 @@ module Veritas
             #
             # @api private
             def optimize
-              left = self.left
-              Veritas::Function::Predicate::Inclusion.new(left.left, merged_right_enumerables).optimize
+              left.left.include(merged_right_enumerables).optimize
             end
 
           end # class OptimizableToInclusion

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

@@ -45,7 +45,7 @@ module Veritas
               if    util.constant?(left)  then left_invalid_constant?
               elsif util.constant?(right) then right_invalid_constant?
               else
-                !joinable?
+                ! joinable?
               end
             end
 
@@ -57,7 +57,7 @@ module Veritas
             #
             # @api private
             def left_invalid_constant?
-              !right.valid_value?(left)
+              ! right.valid_value?(left)
             end
 
             # Test if the right operand is an invalid constant
@@ -66,7 +66,7 @@ module Veritas
             #
             # @api private
             def right_invalid_constant?
-              !left.valid_value?(right)
+              ! left.valid_value?(right)
             end
 
             # Test if the left and right operand are joinable
@@ -106,7 +106,7 @@ module Veritas
             #
             # @api private
             def left_invalid_constant?
-              !right.valid_primitive?(left)
+              ! right.valid_primitive?(left)
             end
 
             # Test if the right operand is an invalid constant
@@ -115,7 +115,7 @@ module Veritas
             #
             # @api private
             def right_invalid_constant?
-              !left.valid_primitive?(right)
+              ! left.valid_primitive?(right)
             end
 
             # Test if the left and right operand are not comparable
@@ -125,7 +125,7 @@ module Veritas
             # @api private
             def not_comparable?
               left = self.left
-              !(left.respond_to?(:comparable?) && left.comparable?(right))
+              ! (left.respond_to?(:comparable?) && left.comparable?(right))
             end
 
           end # module NeverComparable

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

@@ -17,10 +17,10 @@ module Veritas
           # @api private
           def self.sort_by_value(object)
             case object
-              when TrueClass  then 1
-              when FalseClass then 0
-              else
-                object
+            when TrueClass  then 1
+            when FalseClass then 0
+            else
+              object
             end
           end
 

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

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

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

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

data/lib/veritas/optimizer/function/unary.rb

@@ -67,7 +67,7 @@ module Veritas
           #
           # @api private
           def optimizable?
-            !operand.equal?(operation.operand)
+            ! operand.equal?(operation.operand)
           end
 
           # Return a Aggregate with an optimized operand

data/lib/veritas/optimizer/function.rb

@@ -41,7 +41,7 @@ module Veritas
         #
         # @api private
         def self.constant?(operand)
-          !operand.nil? && !operand.respond_to?(:call)
+          ! (operand.nil? || operand.respond_to?(:call))
         end
 
         # Test if the operand is an attribute
@@ -60,8 +60,8 @@ module Veritas
         # @api private
         def self.min(operand)
           case operand
-            when Attribute::String  then operand.min_length
-            when Attribute::Numeric then operand.range.first
+          when Attribute::String  then operand.min_length
+          when Attribute::Numeric then operand.range.first
           else
             operand
           end
@@ -74,8 +74,8 @@ module Veritas
         # @api private
         def self.max(operand)
           case operand
-            when Attribute::String  then operand.max_length
-            when Attribute::Numeric then operand.range.last
+          when Attribute::String  then operand.max_length
+          when Attribute::Numeric then operand.range.last
           else
             operand
           end

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

@@ -25,7 +25,8 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(operation.header)
+            operation = self.operation
+            Veritas::Relation::Empty.new(operation.header, operation)
           end
 
         end # class EmptyOperand

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

@@ -14,7 +14,8 @@ module Veritas
           #
           # @api private
           def optimize
-            Veritas::Relation::Empty.new(operation.header)
+            operation = self.operation
+            Veritas::Relation::Empty.new(operation.header, operation)
           end
 
           # Optimize when the left operand is Empty

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

@@ -37,7 +37,8 @@ module Veritas
             #
             # @api private
             def optimize
-              Veritas::Relation::Empty.new(operation.header)
+              operation = self.operation
+              Veritas::Relation::Empty.new(operation.header, operation)
             end
 
           end # class ZeroLimit
@@ -94,7 +95,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand.operand, min_limit)
+              operand.operand.take(min_limit)
             end
 
           private
@@ -120,7 +121,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand, limit)
+              operand.take(limit)
             end
 
           end # class UnoptimizedOperand

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

@@ -60,7 +60,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand.operand, sum_offset)
+              operand.operand.drop(sum_offset)
             end
 
           private
@@ -86,7 +86,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand, offset)
+              operand.drop(offset)
             end
 
           end # class UnoptimizedOperand

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

@@ -26,8 +26,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation = self.operation
-              operation.class.new(operand.operand, operation.directions)
+              operand.operand.sort_by { operation.directions }
             end
 
           end # class OrderOperand
@@ -67,8 +66,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation = self.operation
-              operation.class.new(operand, operation.directions)
+              operand.sort_by { operation.directions }
             end
 
           end # class UnoptimizedOperand

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

@@ -49,8 +49,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operand = self.operand
-              operand.class.new(operand.operand, operation.directions)
+              operand.operand.sort_by { operation.directions }
             end
 
           end # class OrderOperand
@@ -65,7 +64,7 @@ module Veritas
             #
             # @api private
             def optimize
-              operation.class.new(operand)
+              operand.reverse
             end
 
           end # class UnoptimizedOperand

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

@@ -117,7 +117,6 @@ module Veritas
             end
 
           end # class MaterializedOperand
-
         end # class Unary
       end # module Operation
     end # module Relation

data/lib/veritas/optimizer/version.rb

@@ -2,6 +2,6 @@
 
 module Veritas
   class Optimizer
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end # class Optimizer
 end # module Veritas

data/spec/integration/veritas/relation/materialized/optimize_spec.rb

@@ -16,11 +16,6 @@ describe Relation::Materialized, '#optimize' do
       should == object
     end
 
-    it 'does not execute body#each' do
-      body.should_not_receive(:each)
-      subject
-    end
-
     it_should_behave_like 'an optimize method'
   end
 
@@ -29,11 +24,6 @@ describe Relation::Materialized, '#optimize' do
 
     it { should equal(object) }
 
-    it 'does not execute body#each' do
-      body.should_not_receive(:each)
-      subject
-    end
-
     it_should_behave_like 'an optimize method'
   end
 end

data/spec/shared/optimize_method_behavior.rb

@@ -5,12 +5,12 @@ shared_examples_for 'an optimize method' do
 
   it 'it memoizes itself for #optimize' do
     optimized = subject
-    optimized.memoized('optimize').should equal(optimized)
+    optimized.memoized(:optimize).should equal(optimized)
   end
 
   it 'does not optimize further' do
     optimized = subject
-    optimized.memoize('optimize', nil)  # clear memoized value
+    optimized.memoize(:optimize, nil)  # clear memoized value
     optimized.optimize.should eql(optimized)
   end
 end

data/spec/unit/veritas/optimizer/algebra/difference/equal_operands/optimize_spec.rb

@@ -18,4 +18,6 @@ describe Optimizer::Algebra::Difference::EqualOperands, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/algebra/projection/empty_operand/optimize_spec.rb

@@ -17,4 +17,6 @@ describe Optimizer::Algebra::Projection::EmptyOperand, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(relation.header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/algebra/rename/empty_operand/optimize_spec.rb

@@ -16,4 +16,6 @@ describe Optimizer::Algebra::Rename::EmptyOperand, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(relation.header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimize_spec.rb

@@ -18,4 +18,6 @@ describe Optimizer::Algebra::Restriction::Contradiction, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/algebra/summarization/empty_summarize_per/optimize_spec.rb

@@ -20,4 +20,6 @@ describe Optimizer::Algebra::Summarization::EmptySummarizePer, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should == [ [ :id, Integer ], [ :test, Object ] ] }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/algebra/summarization/unoptimized_operand/optimize_spec.rb

@@ -26,5 +26,5 @@ describe Optimizer::Algebra::Summarization::UnoptimizedOperand, '#optimize' do
 
   its(:summarize_per) { should equal(TABLE_DEE) }
 
-  its(:summarizers) { pending { should == { attribute => Aggregate::Sum.new(1) } } }
+  its(:summarizers) { should == { attribute => Aggregate::Sum.new(1) } }
 end

data/spec/unit/veritas/optimizer/relation/materialized/empty_operand/optimize_spec.rb

@@ -16,4 +16,6 @@ describe Optimizer::Relation::Materialized::EmptyOperand, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/relation/operation/combination/optimize_spec.rb

@@ -13,4 +13,6 @@ describe Optimizer::Relation::Operation::Combination, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(relation.header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/spec/unit/veritas/optimizer/relation/operation/limit/zero_limit/optimize_spec.rb

@@ -17,4 +17,6 @@ describe Optimizer::Relation::Operation::Limit::ZeroLimit, '#optimize' do
   it { should be_kind_of(Relation::Empty) }
 
   its(:header) { should equal(header) }
+
+  its(:tuples) { should equal(relation) }
 end

data/veritas-optimizer.gemspec

@@ -4,17 +4,17 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{veritas-optimizer}
-  s.version = "0.0.5"
+  s.name = "veritas-optimizer"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Dan Kubb}]
-  s.date = %q{2011-07-29}
-  s.description = %q{Optimizes veritas relations}
-  s.email = %q{dan.kubb@gmail.com}
+  s.authors = ["Dan Kubb"]
+  s.date = "2011-10-04"
+  s.description = "Optimizes veritas relations"
+  s.email = "dan.kubb@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "TODO"
   ]
   s.files = [
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Guardfile",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "TODO",
     "config/flay.yml",
@@ -360,23 +360,23 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "veritas-optimizer.gemspec"
   ]
-  s.homepage = %q{https://github.com/dkubb/veritas-optimizer}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Relational algebra optimizer}
+  s.homepage = "https://github.com/dkubb/veritas-optimizer"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Relational algebra optimizer"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<veritas>, ["~> 0.0.5"])
+      s.add_runtime_dependency(%q<veritas>, ["~> 0.0.6"])
       s.add_development_dependency(%q<backports>, ["~> 2.3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
     else
-      s.add_dependency(%q<veritas>, ["~> 0.0.5"])
+      s.add_dependency(%q<veritas>, ["~> 0.0.6"])
       s.add_dependency(%q<backports>, ["~> 2.3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
@@ -384,7 +384,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, ["~> 0.7.2"])
     end
   else
-    s.add_dependency(%q<veritas>, ["~> 0.0.5"])
+    s.add_dependency(%q<veritas>, ["~> 0.0.6"])
     s.add_dependency(%q<backports>, ["~> 2.3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veritas-optimizer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dan Kubb
@@ -15,26 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
         - 0
-        - 5
-        version: 0.0.5
-  type: :runtime
-  requirement: *id001
-  prerelease: false
+        - 6
+        version: 0.0.6
+  version_requirements: *id001
   name: veritas
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +47,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  type: :development
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
   name: backports
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +63,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  type: :development
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +79,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :development
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id004
   name: rake
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +95,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  type: :development
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id005
   name: rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,9 +111,7 @@ dependencies:
         - 7
         - 2
         version: 0.7.2
-  type: :development
-  requirement: *id006
-  prerelease: false
+  version_requirements: *id006
   name: yard
 description: Optimizes veritas relations
 email: dan.kubb@gmail.com
@@ -121,7 +121,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 - TODO
 files: 
 - .gemtest
@@ -130,7 +130,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - TODO
 - config/flay.yml
@@ -494,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Relational algebra optimizer