veritas-optimizer 0.0.4 → 0.0.5

data/spec/unit/veritas/optimizer/relation/operation/order/unoptimized_operand/optimize_spec.rb

@@ -6,7 +6,7 @@ describe Optimizer::Relation::Operation::Order::UnoptimizedOperand, '#optimize'
   subject { object.optimize }
 
   let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each) }
-  let(:relation) { base.rename({}).order                              }
+  let(:relation) { base.rename({}).sort_by { |r| r.id }               }
   let(:object)   { described_class.new(relation)                      }
 
   before do

data/spec/unit/veritas/optimizer/relation/operation/reverse/order_operand/optimizable_spec.rb

@@ -14,13 +14,13 @@ describe Optimizer::Relation::Operation::Reverse::OrderOperand, '#optimizable?'
   end
 
   context 'when the operand is ordered' do
-    let(:operand) { base.order }
+    let(:operand) { base.sort_by { |r| r.id } }
 
     it { should be(true) }
   end
 
   context 'when the operand is not ordered' do
-    let(:operand) { base.order.take(2) }
+    let(:operand) { base.sort_by { |r| r.id }.take(2) }
 
     it { should be(false) }
   end

data/spec/unit/veritas/optimizer/relation/operation/reverse/order_operand/optimize_spec.rb

@@ -6,7 +6,7 @@ describe Optimizer::Relation::Operation::Reverse::OrderOperand, '#optimize' do
   subject { object.optimize }
 
   let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each) }
-  let(:operand)  { base.order                                         }
+  let(:operand)  { base.sort_by { |r| r.id }                          }
   let(:relation) { operand.reverse                                    }
   let(:object)   { described_class.new(relation)                      }
 

data/spec/unit/veritas/optimizer/relation/operation/reverse/reverse_operand/optimizable_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Optimizer::Relation::Operation::Reverse::ReverseOperand, '#optimizable?' do
   subject { object.optimizable? }
 
-  let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each).order }
-  let(:relation) { operand.reverse                                          }
-  let(:object)   { described_class.new(relation)                            }
+  let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each).sort_by { |r| r.id } }
+  let(:relation) { operand.reverse                                                         }
+  let(:object)   { described_class.new(relation)                                           }
 
   before do
     object.operation.should be_kind_of(Relation::Operation::Reverse)

data/spec/unit/veritas/optimizer/relation/operation/reverse/reverse_operand/optimize_spec.rb

@@ -6,7 +6,7 @@ describe Optimizer::Relation::Operation::Reverse::ReverseOperand, '#optimize' do
   subject { object.optimize }
 
   let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each) }
-  let(:limit)    { base.order.take(2)                                 }
+  let(:limit)    { base.sort_by { |r| r.id }.take(2)                  }
   let(:operand)  { limit.reverse                                      }
   let(:relation) { operand.reverse                                    }
   let(:object)   { described_class.new(relation)                      }

data/spec/unit/veritas/optimizer/relation/operation/reverse/unoptimized_operand/optimizable_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Optimizer::Relation::Operation::Reverse::UnoptimizedOperand, '#optimizable?' do
   subject { object.optimizable? }
 
-  let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each).order }
-  let(:relation) { operand.reverse                                          }
-  let(:object)   { described_class.new(relation)                            }
+  let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each).sort_by { |r| r.id } }
+  let(:relation) { operand.reverse                                                         }
+  let(:object)   { described_class.new(relation)                                           }
 
   before do
     object.operation.should be_kind_of(Relation::Operation::Reverse)

data/spec/unit/veritas/optimizer/relation/operation/reverse/unoptimized_operand/optimize_spec.rb

@@ -6,7 +6,7 @@ describe Optimizer::Relation::Operation::Reverse::UnoptimizedOperand, '#optimize
   subject { object.optimize }
 
   let(:base)     { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each) }
-  let(:order)    { base.order                                         }
+  let(:order)    { base.sort_by { |r| r.id }                          }
   let(:relation) { order.rename({}).reverse                           }
   let(:object)   { described_class.new(relation)                      }
 

data/spec/unit/veritas/optimizer/relation/operation/unary/order_operand/optimizable_spec.rb

@@ -15,7 +15,7 @@ describe Optimizer::Relation::Operation::Unary::OrderOperand, '#optimizable?' do
   end
 
   context 'when operand is an order' do
-    let(:operand) { base.order }
+    let(:operand) { base.sort_by { |r| r.id } }
 
     it { should be(true) }
   end

data/spec/unit/veritas/optimizer/relation/operation/unary/order_operand/optimize_spec.rb

@@ -7,7 +7,7 @@ describe Optimizer::Relation::Operation::Unary::OrderOperand, '#optimize' do
 
   let(:described_class) { Class.new(Optimizer::Relation::Operation::Unary) }
   let(:base)            { Relation.new([ [ :id, Integer ] ], [].each)      }
-  let(:operand)         { base.order                                       }
+  let(:operand)         { base.sort_by { |r| r.id }                        }
   let(:relation)        { operand.project([])                              }
   let(:object)          { described_class.new(relation)                    }
 

data/tasks/metrics/heckle.rake

@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(File.expand_path('../../../lib', __FILE__))
 begin
   require 'pathname'
   require 'backports'
+  require 'backports/basic_object'
   require 'active_support/inflector'
   require 'heckle'
   require 'mspec'

data/veritas-optimizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{veritas-optimizer}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Dan Kubb}]
-  s.date = %q{2011-06-01}
+  s.date = %q{2011-07-29}
   s.description = %q{Optimizes veritas relations}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -93,6 +93,7 @@ Gem::Specification.new do |s|
     "lib/veritas/optimizer/relation/operation/order.rb",
     "lib/veritas/optimizer/relation/operation/reverse.rb",
     "lib/veritas/optimizer/relation/operation/unary.rb",
+    "lib/veritas/optimizer/support/predicate_partition.rb",
     "lib/veritas/optimizer/version.rb",
     "spec/integration/veritas/algebra/difference/optimize_spec.rb",
     "spec/integration/veritas/algebra/intersection/optimize_spec.rb",
@@ -142,6 +143,10 @@ Gem::Specification.new do |s|
     "spec/unit/veritas/optimizer/algebra/intersection/equal_operands/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/join/equal_headers/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/algebra/join/equal_headers/optimize_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/join/left_materialized_operand/optimizable_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/join/left_materialized_operand/optimize_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/join/right_materialized_operand/optimizable_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/join/right_materialized_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/product/table_dee_left/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/algebra/product/table_dee_left/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/product/table_dee_right/optimizable_spec.rb",
@@ -177,11 +182,17 @@ Gem::Specification.new do |s|
     "spec/unit/veritas/optimizer/algebra/rename/set_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/rename/unoptimized_operand/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/algebra/rename/unoptimized_operand/optimize_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/restriction/combination_operand/optimizable_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/restriction/combination_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimize_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/restriction/join_operand/optimizable_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/restriction/join_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/order_operand/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/order_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/predicate_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/restriction/product_operand/optimizable_spec.rb",
+    "spec/unit/veritas/optimizer/algebra/restriction/product_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/restriction_operand/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/restriction_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/algebra/restriction/set_operand/optimizable_spec.rb",
@@ -282,6 +293,9 @@ Gem::Specification.new do |s|
     "spec/unit/veritas/optimizer/optimizable/optimize_spec.rb",
     "spec/unit/veritas/optimizer/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/optimize_spec.rb",
+    "spec/unit/veritas/optimizer/predicate_partition/left_spec.rb",
+    "spec/unit/veritas/optimizer/predicate_partition/remainder_spec.rb",
+    "spec/unit/veritas/optimizer/predicate_partition/right_spec.rb",
     "spec/unit/veritas/optimizer/relation/materialized/empty_operand/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/relation/materialized/empty_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/relation/operation/binary/empty_left/optimizable_spec.rb",
@@ -290,8 +304,8 @@ Gem::Specification.new do |s|
     "spec/unit/veritas/optimizer/relation/operation/binary/left_order_operand/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/relation/operation/binary/left_order_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/relation/operation/binary/left_spec.rb",
-    "spec/unit/veritas/optimizer/relation/operation/binary/materialized_operand/optimizable_spec.rb",
-    "spec/unit/veritas/optimizer/relation/operation/binary/materialized_operand/optimize_spec.rb",
+    "spec/unit/veritas/optimizer/relation/operation/binary/materialized_operands/optimizable_spec.rb",
+    "spec/unit/veritas/optimizer/relation/operation/binary/materialized_operands/optimize_spec.rb",
     "spec/unit/veritas/optimizer/relation/operation/binary/right_order_operand/optimizable_spec.rb",
     "spec/unit/veritas/optimizer/relation/operation/binary/right_order_operand/optimize_spec.rb",
     "spec/unit/veritas/optimizer/relation/operation/binary/right_spec.rb",
@@ -355,27 +369,27 @@ Gem::Specification.new do |s|
     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.4"])
-      s.add_development_dependency(%q<backports>, ["~> 2.2.1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<rake>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<veritas>, ["~> 0.0.5"])
+      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.1"])
+      s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
     else
-      s.add_dependency(%q<veritas>, ["= 0.0.4"])
-      s.add_dependency(%q<backports>, ["~> 2.2.1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rake>, ["~> 0.9.0"])
+      s.add_dependency(%q<veritas>, ["~> 0.0.5"])
+      s.add_dependency(%q<backports>, ["~> 2.3.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_dependency(%q<rspec>, ["~> 1.3.2"])
-      s.add_dependency(%q<yard>, ["~> 0.7.1"])
+      s.add_dependency(%q<yard>, ["~> 0.7.2"])
     end
   else
-    s.add_dependency(%q<veritas>, ["= 0.0.4"])
-    s.add_dependency(%q<backports>, ["~> 2.2.1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rake>, ["~> 0.9.0"])
+    s.add_dependency(%q<veritas>, ["~> 0.0.5"])
+    s.add_dependency(%q<backports>, ["~> 2.3.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
     s.add_dependency(%q<rspec>, ["~> 1.3.2"])
-    s.add_dependency(%q<yard>, ["~> 0.7.1"])
+    s.add_dependency(%q<yard>, ["~> 0.7.2"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veritas-optimizer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dan Kubb
@@ -15,20 +15,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-07-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 0
-        - 4
-        version: 0.0.4
+        - 5
+        version: 0.0.5
   type: :runtime
   requirement: *id001
   prerelease: false
@@ -39,12 +39,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 2
-        - 2
-        - 1
-        version: 2.2.1
+        - 3
+        - 0
+        version: 2.3.0
   type: :development
   requirement: *id002
   prerelease: false
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
         - 1
         - 6
-        - 0
-        version: 1.6.0
+        - 4
+        version: 1.6.4
   type: :development
   requirement: *id003
   prerelease: false
@@ -71,12 +71,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 63
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 2
+        version: 0.9.2
   type: :development
   requirement: *id004
   prerelease: false
@@ -103,12 +103,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 0
         - 7
-        - 1
-        version: 0.7.1
+        - 2
+        version: 0.7.2
   type: :development
   requirement: *id006
   prerelease: false
@@ -199,6 +199,7 @@ files:
 - lib/veritas/optimizer/relation/operation/order.rb
 - lib/veritas/optimizer/relation/operation/reverse.rb
 - lib/veritas/optimizer/relation/operation/unary.rb
+- lib/veritas/optimizer/support/predicate_partition.rb
 - lib/veritas/optimizer/version.rb
 - spec/integration/veritas/algebra/difference/optimize_spec.rb
 - spec/integration/veritas/algebra/intersection/optimize_spec.rb
@@ -248,6 +249,10 @@ files:
 - spec/unit/veritas/optimizer/algebra/intersection/equal_operands/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/join/equal_headers/optimizable_spec.rb
 - spec/unit/veritas/optimizer/algebra/join/equal_headers/optimize_spec.rb
+- spec/unit/veritas/optimizer/algebra/join/left_materialized_operand/optimizable_spec.rb
+- spec/unit/veritas/optimizer/algebra/join/left_materialized_operand/optimize_spec.rb
+- spec/unit/veritas/optimizer/algebra/join/right_materialized_operand/optimizable_spec.rb
+- spec/unit/veritas/optimizer/algebra/join/right_materialized_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/product/table_dee_left/optimizable_spec.rb
 - spec/unit/veritas/optimizer/algebra/product/table_dee_left/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/product/table_dee_right/optimizable_spec.rb
@@ -283,11 +288,17 @@ files:
 - spec/unit/veritas/optimizer/algebra/rename/set_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/rename/unoptimized_operand/optimizable_spec.rb
 - spec/unit/veritas/optimizer/algebra/rename/unoptimized_operand/optimize_spec.rb
+- spec/unit/veritas/optimizer/algebra/restriction/combination_operand/optimizable_spec.rb
+- spec/unit/veritas/optimizer/algebra/restriction/combination_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimizable_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimize_spec.rb
+- spec/unit/veritas/optimizer/algebra/restriction/join_operand/optimizable_spec.rb
+- spec/unit/veritas/optimizer/algebra/restriction/join_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/order_operand/optimizable_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/order_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/predicate_spec.rb
+- spec/unit/veritas/optimizer/algebra/restriction/product_operand/optimizable_spec.rb
+- spec/unit/veritas/optimizer/algebra/restriction/product_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/restriction_operand/optimizable_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/restriction_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/algebra/restriction/set_operand/optimizable_spec.rb
@@ -388,6 +399,9 @@ files:
 - spec/unit/veritas/optimizer/optimizable/optimize_spec.rb
 - spec/unit/veritas/optimizer/optimizable_spec.rb
 - spec/unit/veritas/optimizer/optimize_spec.rb
+- spec/unit/veritas/optimizer/predicate_partition/left_spec.rb
+- spec/unit/veritas/optimizer/predicate_partition/remainder_spec.rb
+- spec/unit/veritas/optimizer/predicate_partition/right_spec.rb
 - spec/unit/veritas/optimizer/relation/materialized/empty_operand/optimizable_spec.rb
 - spec/unit/veritas/optimizer/relation/materialized/empty_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/relation/operation/binary/empty_left/optimizable_spec.rb
@@ -396,8 +410,8 @@ files:
 - spec/unit/veritas/optimizer/relation/operation/binary/left_order_operand/optimizable_spec.rb
 - spec/unit/veritas/optimizer/relation/operation/binary/left_order_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/relation/operation/binary/left_spec.rb
-- spec/unit/veritas/optimizer/relation/operation/binary/materialized_operand/optimizable_spec.rb
-- spec/unit/veritas/optimizer/relation/operation/binary/materialized_operand/optimize_spec.rb
+- spec/unit/veritas/optimizer/relation/operation/binary/materialized_operands/optimizable_spec.rb
+- spec/unit/veritas/optimizer/relation/operation/binary/materialized_operands/optimize_spec.rb
 - spec/unit/veritas/optimizer/relation/operation/binary/right_order_operand/optimizable_spec.rb
 - spec/unit/veritas/optimizer/relation/operation/binary/right_order_operand/optimize_spec.rb
 - spec/unit/veritas/optimizer/relation/operation/binary/right_spec.rb