lhm 2.0.0 → 2.1.0

data/spec/unit/chunker_spec.rb

@@ -6,106 +6,115 @@ require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 require 'lhm/table'
 require 'lhm/migration'
 require 'lhm/chunker'
+require 'lhm/throttler'
 
 describe Lhm::Chunker do
   include UnitHelper
 
   before(:each) do
-    @origin      = Lhm::Table.new("origin")
-    @destination = Lhm::Table.new("destination")
-    @migration   = Lhm::Migration.new(@origin, @destination)
-    @chunker     = Lhm::Chunker.new(@migration, nil, { :start => 1, :limit => 10 })
+    @origin = Lhm::Table.new("foo")
+    @destination = Lhm::Table.new("bar")
+    @migration = Lhm::Migration.new(@origin, @destination)
+    @connection = MiniTest::Mock.new
+    # This is a poor man's stub
+    @throttler = Object.new
+    def @throttler.run
+      #noop
+    end
+    def @throttler.stride
+      1
+    end
+    @chunker = Lhm::Chunker.new(@migration, @connection, :throttler => @throttler,
+                                                         :start     => 1,
+                                                         :limit     => 10)
   end
 
-  describe "copy into" do
-    before(:each) do
-      @origin.columns["secret"] = { :metadata => "VARCHAR(255)"}
-      @destination.columns["secret"] = { :metadata => "VARCHAR(255)"}
-    end
-
-    it "should copy the correct range and column" do
-      @chunker.copy(from = 1, to = 100).must_equal(
-        "insert ignore into `destination` (`secret`) " +
-        "select origin.`secret` from `origin` " +
-        "where origin.`id` between 1 and 100"
-      )
-    end
-  end
-
-  describe "invalid" do
-    before do
-      @chunker = Lhm::Chunker.new(@migration, nil, { :start => 0, :limit => -1 })
-    end
-
-    it "should have zero chunks" do
-      @chunker.traversable_chunks_size.must_equal 0
-    end
-
-    it "should not iterate" do
-      @chunker.up_to do |bottom, top|
-        raise "should not iterate"
+  describe "#run" do
+    it "chunks the result set according to the stride size" do
+      def @throttler.stride
+        2
       end
-    end
-  end
 
-  describe "one" do
-    before do
-      @chunker = Lhm::Chunker.new(@migration, nil, {
-        :stride => 100_000, :start => 1, :limit => 300_000
-      })
-    end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 1 and 2/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 3 and 4/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 5 and 6/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 7 and 8/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 9 and 10/
+      end
 
-    it "should have one chunk" do
-      @chunker.traversable_chunks_size.must_equal 3
+      @chunker.run
+      @connection.verify
     end
 
-    it "should lower bound chunk on 1" do
-      @chunker.bottom(chunk = 1).must_equal 1
-    end
+    it "handles stride changes during execution" do
+      #roll our own stubbing
+      def @throttler.stride
+        @run_count ||= 0
+        @run_count = @run_count + 1
+        if @run_count > 1
+          3
+        else
+          2
+        end
+      end
 
-    it "should upper bound chunk on 100" do
-      @chunker.top(chunk = 1).must_equal 100_000
-    end
-  end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 1 and 2/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 3 and 5/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 6 and 8/
+      end
+      @connection.expect(:update, 2) do |stmt|
+        stmt.first =~ /between 9 and 10/
+      end
 
-  describe "two" do
-    before do
-      @chunker = Lhm::Chunker.new(@migration, nil, {
-        :stride => 100_000, :start => 2, :limit => 150_000
-      })
+      @chunker.run
+      @connection.verify
     end
 
-    it "should have two chunks" do
-      @chunker.traversable_chunks_size.must_equal 2
-    end
+    it "separates filter conditions from chunking conditions" do
+      @chunker = Lhm::Chunker.new(@migration, @connection, :throttler => @throttler,
+                                                           :start     => 1,
+                                                           :limit     => 2)
+      @connection.expect(:update, 1) do |stmt|
+        stmt.first =~ /where \(foo.created_at > '2013-07-10' or foo.baz = 'quux'\) and `foo`/
+      end
 
-    it "should lower bound second chunk on 100_000" do
-      @chunker.bottom(chunk = 2).must_equal 100_002
-    end
+      def @migration.conditions
+        "where foo.created_at > '2013-07-10' or foo.baz = 'quux'"
+      end
 
-    it "should upper bound second chunk on 150_000" do
-      @chunker.top(chunk = 2).must_equal 150_000
+      @chunker.run
+      @connection.verify
     end
-  end
 
-  describe "iterating" do
-    before do
-      @chunker = Lhm::Chunker.new(@migration, nil, {
-        :stride => 100, :start => 53, :limit => 121
-      })
-    end
+    it "doesn't mess with inner join filters" do
+      @chunker = Lhm::Chunker.new(@migration, @connection, :throttler => @throttler,
+                                                           :start     => 1,
+                                                           :limit     => 2)
+      @connection.expect(:update, 1) do |stmt|
+        puts stmt
+        stmt.first =~ /inner join bar on foo.id = bar.foo_id and/
+      end
 
-    it "should iterate" do
-      @chunker.up_to do |bottom, top|
-        bottom.must_equal 53
-        top.must_equal 121
+      def @migration.conditions
+        "inner join bar on foo.id = bar.foo_id"
       end
-    end
-  end
 
-  describe "throttling" do
-    it "should default to 100 milliseconds" do
-      @chunker.throttle_seconds.must_equal 0.1
+      @chunker.run
+      @connection.verify
     end
   end
 end

data/spec/unit/datamapper_connection_spec.rb

@@ -11,6 +11,7 @@ if defined?(DataMapper)
     before do
       data_mapper.expect :is_a?, true, [DataMapper::Adapters::AbstractAdapter]
       data_mapper.expect :options, options
+      data_mapper.expect :options, options
     end
 
     after do

data/spec/unit/lhm_spec.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2011 - 2013, SoundCloud Ltd.
+
+require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
+
+describe Lhm do
+
+  before(:each) do
+    Lhm.remove_class_variable :@@logger if Lhm.class_variable_defined? :@@logger
+  end
+
+  describe "logger" do
+
+    it "should use the default parameters if no logger explicitly set" do
+      Lhm.logger.must_be_kind_of Logger
+      Lhm.logger.level.must_equal Logger::INFO
+      Lhm.logger.instance_eval{ @logdev }.dev.must_equal STDOUT
+    end
+
+    it "should use s new logger if set" do
+      l = Logger.new('omg.ponies')
+      l.level = Logger::ERROR
+      Lhm.logger = l
+
+      Lhm.logger.level.must_equal Logger::ERROR
+      Lhm.logger.instance_eval{ @logdev }.dev.must_be_kind_of File
+      Lhm.logger.instance_eval{ @logdev }.dev.path.must_equal 'omg.ponies'
+    end
+  end
+end

data/spec/unit/printer_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
+
+require 'lhm/printer'
+
+describe Lhm::Printer do
+  include UnitHelper
+
+  describe "percentage printer" do
+
+    before(:each) do
+      @printer = Lhm::Printer::Percentage.new
+    end
+
+    it "prints the percentage" do
+      mock = MiniTest::Mock.new
+      10.times do |i|
+        mock.expect(:write, :return_value) do |message|
+          assert_match /^\r/, message.first
+          assert_match /#{i}\/10/, message.first
+        end
+      end
+
+      @printer.instance_variable_set(:@output, mock)
+      10.times { |i| @printer.notify(i, 10) }
+      mock.verify
+    end
+
+    it "always print a bigger message" do
+      @length = 0
+      mock = MiniTest::Mock.new
+      3.times do |i|
+        mock.expect(:write, :return_value) do |message|
+          assert message.first.length >= @length
+          @length = message.first.length
+        end
+      end
+
+      @printer.instance_variable_set(:@output, mock)
+      @printer.notify(10, 100)
+      @printer.notify(0, 100)
+      @printer.notify(1, 1000000)
+      @printer.notify(0, 0)
+      @printer.notify(0, nil)
+
+      mock.verify
+    end
+
+    it "prints the end message" do
+      mock = MiniTest::Mock.new
+      mock.expect(:write, :return_value, [String])
+      mock.expect(:write, :return_value, ["\n"])
+
+      @printer.instance_variable_set(:@output, mock)
+      @printer.end
+
+      mock.verify
+    end
+  end
+
+  describe "dot printer" do
+
+    before(:each) do
+      @printer = Lhm::Printer::Dot.new
+    end
+
+    it "prints the dots" do
+      mock  = MiniTest::Mock.new
+      10.times do
+        mock.expect(:write, :return_value, ["."])
+      end
+
+      @printer.instance_variable_set(:@output, mock)
+      10.times { @printer.notify }
+
+      mock.verify
+    end
+
+  end
+end

data/spec/unit/throttler_spec.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
+
+require 'lhm/throttler'
+
+describe Lhm::Throttler do
+  include UnitHelper
+
+  before :each do
+    @mock = Class.new do
+      extend Lhm::Throttler
+    end
+  end
+
+  describe "#setup_throttler" do
+    describe "when passing a key" do
+      before do
+        @mock.setup_throttler(:time_throttler, :delay => 2)
+      end
+
+      it "instantiates the time throttle" do
+        @mock.throttler.class.must_equal Lhm::Throttler::Time
+      end
+
+      it "returns 2 seconds as time" do
+        @mock.throttler.timeout_seconds.must_equal 2
+      end
+    end
+
+    describe "when passing an instance" do
+
+      before do
+        @instance = Class.new(Lhm::Throttler::Time) do
+          def timeout_seconds
+            0
+          end
+        end.new
+
+        @mock.setup_throttler(@instance)
+      end
+
+      it "returns the instace given" do
+        @mock.throttler.must_equal @instance
+      end
+
+      it "returns 0 seconds as time" do
+        @mock.throttler.timeout_seconds.must_equal 0
+      end
+    end
+
+    describe "when passing a class" do
+
+      before do
+        @klass = Class.new(Lhm::Throttler::Time)
+        @mock.setup_throttler(@klass)
+      end
+
+      it "has the same class as given" do
+        @mock.throttler.class.must_equal @klass
+      end
+    end
+  end
+
+  describe "#throttler" do
+
+    it "returns the default Time based" do
+      @mock.throttler.class.must_equal Lhm::Throttler::Time
+    end
+
+    it "should default to 100 milliseconds" do
+      @mock.throttler.timeout_seconds.must_equal 0.1
+    end
+  end
+end

data/spec/unit/unit_helper.rb

@@ -1,18 +1,6 @@
 # Copyright (c) 2011 - 2013, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
 # Schmidt
-
-require File.expand_path(File.dirname(__FILE__)) + "/../bootstrap"
-
-begin
-  require 'active_record'
-  begin
-    require 'mysql2'
-  rescue LoadError
-    require 'mysql'
-  end
-rescue LoadError
-  require 'dm-core'
-end
+require 'test_helper'
 
 module UnitHelper
   def fixture(name)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - SoundCloud
@@ -12,28 +11,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 5.0.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -82,13 +77,16 @@ files:
 - lib/lhm/locked_switcher.rb
 - lib/lhm/migration.rb
 - lib/lhm/migrator.rb
+- lib/lhm/printer.rb
 - lib/lhm/sql_helper.rb
 - lib/lhm/table.rb
+- lib/lhm/throttler.rb
+- lib/lhm/throttler/time.rb
 - lib/lhm/version.rb
 - spec/.lhm.example
 - spec/README.md
-- spec/bootstrap.rb
 - spec/fixtures/destination.ddl
+- spec/fixtures/lines.ddl
 - spec/fixtures/origin.ddl
 - spec/fixtures/permissions.ddl
 - spec/fixtures/small_table.ddl
@@ -102,6 +100,7 @@ files:
 - spec/integration/lhm_spec.rb
 - spec/integration/locked_switcher_spec.rb
 - spec/integration/table_spec.rb
+- spec/test_helper.rb
 - spec/unit/active_record_connection_spec.rb
 - spec/unit/atomic_switcher_spec.rb
 - spec/unit/chunker_spec.rb
@@ -109,40 +108,42 @@ files:
 - spec/unit/datamapper_connection_spec.rb
 - spec/unit/entangler_spec.rb
 - spec/unit/intersection_spec.rb
+- spec/unit/lhm_spec.rb
 - spec/unit/locked_switcher_spec.rb
 - spec/unit/migration_spec.rb
 - spec/unit/migrator_spec.rb
+- spec/unit/printer_spec.rb
 - spec/unit/sql_helper_spec.rb
 - spec/unit/table_spec.rb
+- spec/unit/throttler_spec.rb
 - spec/unit/unit_helper.rb
 homepage: http://github.com/soundcloud/lhm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: online schema changer for mysql
 test_files:
 - spec/README.md
-- spec/bootstrap.rb
 - spec/fixtures/destination.ddl
+- spec/fixtures/lines.ddl
 - spec/fixtures/origin.ddl
 - spec/fixtures/permissions.ddl
 - spec/fixtures/small_table.ddl
@@ -156,6 +157,7 @@ test_files:
 - spec/integration/lhm_spec.rb
 - spec/integration/locked_switcher_spec.rb
 - spec/integration/table_spec.rb
+- spec/test_helper.rb
 - spec/unit/active_record_connection_spec.rb
 - spec/unit/atomic_switcher_spec.rb
 - spec/unit/chunker_spec.rb
@@ -163,9 +165,12 @@ test_files:
 - spec/unit/datamapper_connection_spec.rb
 - spec/unit/entangler_spec.rb
 - spec/unit/intersection_spec.rb
+- spec/unit/lhm_spec.rb
 - spec/unit/locked_switcher_spec.rb
 - spec/unit/migration_spec.rb
 - spec/unit/migrator_spec.rb
+- spec/unit/printer_spec.rb
 - spec/unit/sql_helper_spec.rb
 - spec/unit/table_spec.rb
+- spec/unit/throttler_spec.rb
 - spec/unit/unit_helper.rb