axiom-optimizer 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bccd5f05e6c6803b863b3e5fa27e73d8a0d107dc
+  data.tar.gz: 14112805ecdd1e826d28e96e1696a32fb61afa6a
+SHA512:
+  metadata.gz: c30e128184f50585d4c00b145a56edf1c57d78aada4307a0af950b378456dc30aaed39d42b1efb004d69a07c553bb6f6b55016860fcfed61b5eccc7120bd7ba5
+  data.tar.gz: 1e577f725496d72bd354815d0f80681e3125993c82691c212c0192ebd879cfaa212a361ed9f5c94d2cb9c600bd53342322264d81c2475234bf7d6a333322bbe5

data/.rspec

@@ -1,5 +1,6 @@
+--backtrace
 --color
 --format progress
+--order random
 --profile
 --warnings
---order random

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+  Excludes:
+    - 'Gemfile.devtools'
+    - 'vendor/**'

data/.travis.yml

@@ -1,33 +1,29 @@
 language: ruby
 before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
-script: "bundle exec rake ci"
+script: "bundle exec rake ci:metrics"
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
-  - rbx-19mode
+  - rbx
+matrix:
+  include:
+    - rvm: jruby-19mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-20mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-21mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+    - rvm: jruby-head
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"  # for simplecov
+  allow_failures:
+    - rvm: 2.1.0  # buggy runtime
+  fast_finish: true
 notifications:
   irc:
     channels:
       - irc.freenode.org#rom-rb
     on_success: never
     on_failure: change
-  email:
-    recipients:
-      - dan.kubb@gmail.com
-    on_success: never
-    on_failure: change
-matrix:
-  include:
-    - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-    - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-  allow_failures:
-    # mutant fails
-    - rvm: 1.9.3
-    - rvm: 2.0.0
-    - rvm: rbx-19mode
-    # broken on travis
-    - rvm: ruby-head

data/CONTRIBUTING.md

@@ -1,5 +1,4 @@
-Contributing
-------------
+# Contributing
 
 * 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 the direction it is going may not always be clear. 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.

data/Gemfile

@@ -4,7 +4,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'axiom', '~> 0.1.1', git: 'https://github.com/dkubb/axiom.git'
+platform :rbx do
+  gem 'rubysl-bigdecimal', '~> 2.0.2'
+end
 
 group :development, :test do
   gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'

data/Gemfile.devtools

@@ -3,22 +3,25 @@
 group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.6.2'
+  gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.1.0'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-  gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard',         '~> 2.3.0'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.0'
+  gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'listen',     '~> 1.2.2'
+  gem 'listen',     '~> 2.4.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -30,21 +33,28 @@ group :guard do
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.6.7'
-  gem 'flay',      '~> 2.3.1'
-  gem 'flog',      '~> 4.1.1'
-  gem 'reek',      '~> 1.3.1',  git: 'https://github.com/troessner/reek.git'
-  gem 'rubocop',   '~> 0.10.0', git: 'https://github.com/bbatsov/rubocop.git'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.6'
+  gem 'coveralls', '~> 0.7.0'
+  gem 'flay',      '~> 2.4.0'
+  gem 'flog',      '~> 4.2.0'
+  gem 'reek',      '~> 1.3.2'
+  gem 'rubocop',   '~> 0.16.0'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.9'
+
+  platforms :mri do
+    gem 'mutant', '~> 0.3.4'
+  end
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.2'
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
   end
 end
 

data/README.md

@@ -1,5 +1,4 @@
-axiom-optimizer
-===============
+# axiom-optimizer
 
 Relational algebra optimizer
 
@@ -15,8 +14,7 @@ Relational algebra optimizer
 [codeclimate]: https://codeclimate.com/github/dkubb/axiom-optimizer
 [coveralls]: https://coveralls.io/r/dkubb/axiom-optimizer
 
-Examples
---------
+## Examples
 
 ```ruby
 # optimize a relation
@@ -32,8 +30,7 @@ new_aggregate = function.aggregate
 new_aggregate = function.aggregate(optimizer)
 ```
 
-Description
------------
+## Description
 
 The purpose of this gem is to provide a simple API that can be used to optimize a [axiom](https://github.com/dkubb/axiom) 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.
 
@@ -43,8 +40,7 @@ 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:
 
@@ -64,7 +60,7 @@ Axiom::Algebra::Restriction.optimizer = chain(
   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?
+  SortedOperand,        # does the restriction contain a sorted relation?
   EmptyOperand,         # does the restriction contain an empty relation?
   MaterializedOperand,  # does the restriction contain a materialized relation?
   UnoptimizedOperand    # does the restriction contain an unoptimized relation?
@@ -77,12 +73,10 @@ 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.
 
-Contributing
-------------
+## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
-Copyright
----------
+## Copyright
 
 Copyright © 2011-2013 Dan Kubb. See LICENSE for details.

data/TODO

@@ -54,11 +54,12 @@
       try to combine into a single relation with the restrictions using NOT.
 
   * Summarization
-    * Add OrderSummarizePer for factoring out Order objects inside a Summarization
+    * Add SortedSummarizePer for factoring out Sorted objects inside a
+      Summarization
     * When there are no aggregate functions, drop the Summarization and
       return the summarize_per (?)
       * Use the UnchangedHeader optimizer as a base class
-    * When summarize_per is an Order, the Order can be dropped.
+    * When summarize_per is an Sorted, the Sorted can be dropped.
 
   * Projection
     * When it contains a Restriction, if the removed attributes are *not*
@@ -110,10 +111,10 @@
      equality/conjunction between attributes from the left and right
      operands, then transform into a Join.
 
-  * Order
-    * When the operation is an instance of Order, and the operand is sorted in
+  * Sorted
+    * When the operation is an instance of Sorted, and the operand is sorted in
       reversed order, change to a Reverse operation. This should occur after the
-      Order optimization that collapses two Order objects into one; it would be
+      Sorted optimization that collapses two Sorted objects into one; it would be
       expected that the operand is a Limit or Offset, but it probably isn't
       necessary to test that.
 

data/axiom-optimizer.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |gem|
   gem.description = 'Optimizes axiom relations'
   gem.summary     = gem.description
   gem.homepage    = 'https://github.com/dkubb/axiom-optimizer'
-  gem.licenses    = %w[MIT]
+  gem.license     = 'MIT'
 
   gem.require_paths    = %w[lib]
   gem.files            = `git ls-files`.split($/)
   gem.test_files       = `git ls-files -- spec/{unit,integration}`.split($/)
   gem.extra_rdoc_files = %w[LICENSE README.md CONTRIBUTING.md TODO]
 
-  gem.add_runtime_dependency('axiom', '~> 0.1.0')
+  gem.add_runtime_dependency('axiom', '~> 0.2.0')
 
-  gem.add_development_dependency('bundler', '~> 1.3', '>= 1.3.5')
+  gem.add_development_dependency('bundler', '~> 1.5', '>= 1.5.2')
 end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 66
-total_score: 910
+total_score: 885

data/config/reek.yml

@@ -1,17 +1,7 @@
 ---
 Attribute:
-  enabled: true
-  exclude:
-  - Axiom::Optimizer
-  - Axiom::Optimizer::Algebra::Extension
-  - Axiom::Optimizer::Algebra::Rename
-  - Axiom::Optimizer::Algebra::Restriction
-  - Axiom::Optimizer::Algebra::Summarization
-  - Axiom::Optimizer::Function::Binary
-  - Axiom::Optimizer::Function::Unary
-  - Axiom::Optimizer::Optimizable::ClassMethods
-  - Axiom::Optimizer::PredicatePartition
-  - Axiom::Optimizer::Relation::Operation::Unary
+  enabled: false
+  exclude: []
 BooleanParameter:
   enabled: true
   exclude: []
@@ -54,7 +44,7 @@ DuplicateMethodCall:
   - Axiom::Optimizer::Relation::Materialized::EmptyOperand#optimize
   - Axiom::Optimizer::Relation::Operation::Combination#optimize
   - Axiom::Optimizer::Relation::Operation::Limit::ZeroLimit#optimize
-  - Axiom::Optimizer::Relation::Operation::Order::OneLimitOperand#optimizable?
+  - Axiom::Optimizer::Relation::Operation::Sorted::OneLimitOperand#optimizable?
   max_calls: 1
   allow_calls: []
 FeatureEnvy:
@@ -102,22 +92,8 @@ TooManyMethods:
 TooManyStatements:
   enabled: true
   exclude:
-  - Axiom::Optimizer#self.link_optimizers
-  - Axiom::Optimizer::Algebra::Projection::ExtensionOperand#new_extensions
-  - Axiom::Optimizer::Algebra::Summarization::EmptyOperand#extensions
-  - Axiom::Optimizer::Function#self.optimize_functions
-  - Axiom::Optimizer::Function::Predicate::Comparable::NeverComparable#optimizable?
-  - Axiom::Optimizer::Function::Predicate::Comparable::NeverEquivalent#optimizable?
-  - Axiom::Optimizer::Function::Predicate::Enumerable#normalized_right_enumerable
-  - Axiom::Optimizer::Function::Predicate::Enumerable#optimize_right
-  - Axiom::Optimizer::Function::Predicate::Enumerable#optimize_right_enumerable
-  - Axiom::Optimizer::Function::Predicate::Enumerable#optimize_right_range
-  - Axiom::Optimizer::Optimizable#optimize
-  - Axiom::Optimizer::PredicatePartition#partition!
-  - Axiom::Optimizer::PredicatePartition#partition_binary!
-  - Axiom::Optimizer::PredicatePartition#partition_proposition!
-  - Axiom::Optimizer::PredicatePartition#partition_unary!
-  max_statements: 2
+  - Axiom::Optimizer::PredicatePartition#partition_binary
+  max_statements: 5
 UncommunicativeMethodName:
   enabled: true
   exclude: []

data/config/rubocop.yml

@@ -1,10 +1,4 @@
-AllCops:
-  Includes:
-    - '**/*.rake'
-    - 'Gemfile'
-    - 'Gemfile.devtools'
-  Excludes:
-    - '**/vendor/**'
+inherit_from: ../.rubocop.yml
 
 # Avoid parameter lists longer than five parameters.
 ParameterLists:
@@ -29,7 +23,7 @@ CollectionMethods:
 # sections of code and visually separate them. When the keyword is at the same
 # level I think it sort of blends in with the def keywords and makes it harder
 # to scan the code and see where the sections are.
-AccessControl:
+AccessModifierIndentation:
   Enabled: false
 
 # Limit line length
@@ -40,14 +34,26 @@ LineLength:
 Documentation:
   Enabled: false
 
+# Do not always use &&/|| instead of and/or.
+AndOr:
+  Enabled: false
+
 # Do not favor modifier if/unless usage when you have a single-line body
 IfUnlessModifier:
   Enabled: false
 
+# Allow case equality operator (in limited use within the specs)
+CaseEquality:
+  Enabled: false
+
 # Constants do not always have to use SCREAMING_SNAKE_CASE
 ConstantName:
   Enabled: false
 
-# Do not check formatting of special comments like "TODO" or "OPTIMIZE"
-CommentAnnotation:
+# Not all trivial readers/writers can be defined with attr_* methods
+TrivialAccessors:
+  Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
   Enabled: false

data/lib/axiom/optimizer.rb

@@ -38,9 +38,7 @@ module Axiom
     # @return [Boolean]
     #
     # @api public
-    def optimizable?
-      raise NotImplementedError, "#{self.class}#optimizable? must be implemented"
-    end
+    abstract_method :optimizable?
 
     # Abstract method that executes the optimization for the operation
     #
@@ -50,9 +48,7 @@ module Axiom
     # @return [Optimizable]
     #
     # @api public
-    def optimize
-      raise NotImplementedError, "#{self.class}#optimize must be implemented"
-    end
+    abstract_method :optimize
 
     # Chain together a list of optimizer classes into a callable object
     #
@@ -110,7 +106,7 @@ require 'axiom/optimizer/relation/operation/unary'
 require 'axiom/optimizer/relation/operation/combination'
 require 'axiom/optimizer/relation/operation/limit'
 require 'axiom/optimizer/relation/operation/offset'
-require 'axiom/optimizer/relation/operation/order'
+require 'axiom/optimizer/relation/operation/sorted'
 require 'axiom/optimizer/relation/operation/reverse'
 
 require 'axiom/optimizer/algebra/difference'

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

@@ -56,8 +56,8 @@ module Axiom
           EqualOperands,
           EmptyLeft,
           EmptyRight,
-          OrderLeft,
-          OrderRight,
+          SortedLeft,
+          SortedRight,
           MaterializedOperands,
           UnoptimizedOperands
         )

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

@@ -44,10 +44,10 @@ module Axiom
           operand.extend(extensions)
         end
 
-        # Optimize when the operand is an Order
-        class OrderOperand < self
-          include Relation::Operation::Unary::OrderOperand
-        end # class OrderOperand
+        # Optimize when the operand is an Sorted
+        class SortedOperand < self
+          include Relation::Operation::Unary::SortedOperand
+        end # class SortedOperand
 
         # Optimize when operands are optimizable
         class UnoptimizedOperand < self
@@ -79,7 +79,7 @@ module Axiom
           #
           # @api private
           def extensions_optimizable?
-            ! extensions.eql?(operation.extensions)
+            !extensions.eql?(operation.extensions)
           end
 
         end # class UnoptimizedOperand
@@ -87,7 +87,7 @@ module Axiom
         Axiom::Algebra::Extension.optimizer = chain(
           UnchangedHeader,
           MaterializedOperand,
-          OrderOperand,
+          SortedOperand,
           UnoptimizedOperand
         )