lhm 2.0.0 → 2.1.0

data/lib/lhm/printer.rb

@@ -0,0 +1,56 @@
+module Lhm
+  module Printer
+
+    class Output
+      def write(message)
+        print message
+      end
+    end
+
+    class Base
+
+      def initialize
+        @output = Output.new
+      end
+    end
+
+    class Percentage < Base
+
+      def initialize
+        super
+        @max_length = 0
+      end
+
+      def notify(lowest, highest)
+        return if !highest || highest == 0
+        message = "%.2f%% (#{lowest}/#{highest}) complete" % (lowest.to_f / highest * 100.0)
+        write(message)
+      end
+
+      def end
+        write("100% complete")
+        @output.write "\n"
+      end
+
+      private
+      def write(message)
+        if (extra = @max_length - message.length) < 0
+          @max_length = message.length
+          extra = 0
+        end
+
+        @output.write "\r#{message}" + (" " * extra)
+      end
+    end
+
+    class Dot < Base
+      def notify(lowest = nil, highest = nil)
+        @output.write "."
+      end
+
+      def end
+        @output.write "\n"
+      end
+    end
+  end
+end

data/lib/lhm/throttler.rb

@@ -0,0 +1,32 @@
+require 'lhm/throttler/time'
+
+module Lhm
+  module Throttler
+    CLASSES = { :time_throttler => Throttler::Time }
+
+    def throttler
+      @throttler ||= Throttler::Time.new
+    end
+
+    def setup_throttler(type, options = {})
+      @throttler = Factory.create_throttler(type, options)
+    end
+
+    class Factory
+      def self.create_throttler(type, options = {})
+        case type
+        when Lhm::Command
+          type
+        when Symbol
+          CLASSES[type].new(options)
+        when String
+          CLASSES[type.to_sym].new(options)
+        when Class
+          type.new(options)
+        else
+          raise ArgumentError, 'type argument must be a Symbol, String or Class'
+        end
+      end
+    end
+  end
+end

data/lib/lhm/throttler/time.rb

@@ -0,0 +1,29 @@
+module Lhm
+  module Throttler
+    class Time
+      include Command
+
+      DEFAULT_TIMEOUT = 0.1
+      DEFAULT_STRIDE = 40_000
+
+      attr_accessor :timeout_seconds
+      attr_accessor :stride
+
+      def initialize(options = {})
+        @timeout_seconds = options[:delay] || DEFAULT_TIMEOUT
+        @stride = options[:stride] || DEFAULT_STRIDE
+      end
+
+      def execute
+        sleep timeout_seconds
+      end
+    end
+
+    class LegacyTime < Time
+      def initialize(timeout, stride)
+        @timeout_seconds = timeout / 1000.0
+        @stride = stride
+      end
+    end
+  end
+end

data/lib/lhm/version.rb

@@ -2,5 +2,5 @@
 # Schmidt
 
 module Lhm
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/.lhm.example

@@ -1,4 +1,4 @@
 mysqldir=/usr/local/mysql
-basedir=/opt/lhm-cluster
+basedir=~/lhm-cluster
 master_port=3306
 slave_port=3307

data/spec/README.md

@@ -1,47 +1,54 @@
-Preparing for master slave integration tests
---------------------------------------------
+# Preparing for master slave integration tests
 
-# configuration
+## Configuration
 
 create ~/.lhm:
 
     mysqldir=/usr/local/mysql
-    basedir=/opt/lhm-cluster
+    basedir=~/lhm-cluster
     master_port=3306
     slave_port=3307
 
 mysqldir specifies the location of your mysql install. basedir is the
 directory master and slave databases will get installed into.
 
-# setup
+## Automatic setup
+
+### Run
+
+    bin/lhm-spec-clobber.sh
 
 You can set the integration specs up to run against a master slave setup by
-running the included `bin/lhm-spec-clobber.sh` script. this deletes the configured
-lhm master slave setup and reinstalls and configures a master slave setup.
+running the included that. This deletes the configured lhm master slave setup and reinstalls and configures a master slave setup.
 
 Follow the manual instructions if you want more control over this process.
 
-# manual setup
+## Manual setup
 
-## set up instances
+### set up instances
 
     bin/lhm-spec-setup-cluster.sh
 
-## start instances
+### start instances
 
     basedir=/opt/lhm-luster
     mysqld --defaults-file="$basedir/master/my.cnf"
     mysqld --defaults-file="$basedir/slave/my.cnf"
 
-## run the grants
+### run the grants
 
     bin/lhm-spec-grants.sh
 
 ## run specs
 
-To run specs in slave mode, set the SLAVE=1 when running tests:
+Setup the dependency gems
+
+    export BUNDLE_GEMFILE=gemfiles/ar-3.2_mysql2.gemfile
+    bundle install
+
+To run specs in slave mode, set the MASTER_SLAVE=1 when running tests:
 
-    MASTER_SLAVE=1 rake specs
+    MASTER_SLAVE=1 bundle exec rake specs
 
 # connecting
 

data/spec/fixtures/lines.ddl

@@ -0,0 +1,7 @@
+CREATE TABLE `lines` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `between` varchar(10),
+  `lines` int(11),
+  `key` varchar(10),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8

data/spec/integration/chunker_spec.rb

@@ -2,8 +2,6 @@
 # Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
-
-require 'lhm'
 require 'lhm/table'
 require 'lhm/migration'
 
@@ -22,11 +20,19 @@ describe Lhm::Chunker do
     it "should copy 23 rows from origin to destination" do
       23.times { |n| execute("insert into origin set id = '#{ n * n + 23 }'") }
 
-      Lhm::Chunker.new(@migration, connection, { :stride => 100 }).run
+      printer = MiniTest::Mock.new
+      5.times { printer.expect(:notify, :return_value, [Fixnum, Fixnum]) }
+      printer.expect(:end, :return_value, [])
+
+      Lhm::Chunker.new(
+        @migration, connection, { :throttler => Lhm::Throttler::Time.new(:stride => 100), :printer => printer }
+      ).run
 
       slave do
         count_all(@destination.name).must_equal(23)
       end
+
+     printer.verify
     end
   end
 end

data/spec/integration/cleanup_spec.rb

@@ -3,8 +3,6 @@
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
 
-require 'lhm'
-
 describe Lhm, "cleanup" do
   include IntegrationHelper
   before(:each) { connect_master! }
@@ -12,12 +10,18 @@ describe Lhm, "cleanup" do
   describe "changes" do
     before(:each) do
       table_create(:users)
-      Lhm.change_table(:users, :atomic_switch => false) do |t|
-        t.add_column(:logins, "INT(12) DEFAULT '0'")
-        t.add_index(:logins)
+      simulate_failed_migration do
+        Lhm.change_table(:users, :atomic_switch => false) do |t|
+          t.add_column(:logins, "INT(12) DEFAULT '0'")
+          t.add_index(:logins)
+        end
       end
     end
 
+    after(:each) do
+      Lhm.cleanup(true)
+    end
+
     it "should show temporary tables" do
       output = capture_stdout do
         Lhm.cleanup
@@ -26,6 +30,16 @@ describe Lhm, "cleanup" do
       output.must_match(/lhma_[0-9_]*_users/)
     end
 
+    it "should show temporary triggers" do
+      output = capture_stdout do
+        Lhm.cleanup
+      end
+      output.must_include("Existing LHM triggers")
+      output.must_include("lhmt_ins_users")
+      output.must_include("lhmt_del")
+      output.must_include("lhmt_upd_users")
+    end
+
     it "should delete temporary tables" do
       Lhm.cleanup(true).must_equal(true)
       Lhm.cleanup.must_equal(true)

data/spec/integration/integration_helper.rb

@@ -1,19 +1,9 @@
 # Copyright (c) 2011 - 2013, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
 # Schmidt
+require 'test_helper'
+require 'yaml'
+$password = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + "/database.yml")["password"] rescue nil
 
-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'
-  require 'dm-mysql-adapter'
-end
 require 'lhm/table'
 require 'lhm/sql_helper'
 require 'lhm/connection'
@@ -42,11 +32,12 @@ module IntegrationHelper
         :host     => '127.0.0.1',
         :database => 'lhm',
         :username => 'root',
-        :port     => port
+        :port     => port,
+        :password => $password
       )
       adapter = ActiveRecord::Base.connection
     elsif defined?(DataMapper)
-      adapter = DataMapper.setup(:default, "mysql://root@localhost:#{port}/lhm")
+      adapter = DataMapper.setup(:default, "mysql://root:#{$password}@localhost:#{port}/lhm")
     end
 
     Lhm.setup(adapter)
@@ -131,7 +122,7 @@ module IntegrationHelper
   end
 
   def count_all(table)
-    query = "select count(*) from #{ table }"
+    query = "select count(*) from `#{ table }`"
     select_value(query).to_i
   end
 
@@ -145,7 +136,7 @@ module IntegrationHelper
     non_unique = type == :non_unique ? 1 : 0
 
     !!select_one(%Q<
-      show indexes in #{ table_name }
+      show indexes in `#{ table_name }`
      where key_name = '#{ key_name }'
        and non_unique = #{ non_unique }
     >)
@@ -162,7 +153,7 @@ module IntegrationHelper
   #
   # Misc
   #
-  
+
   def capture_stdout
     out = StringIO.new
     $stdout = out
@@ -171,4 +162,21 @@ module IntegrationHelper
   ensure
     $stdout = ::STDOUT
   end
+
+  def simulate_failed_migration
+    Lhm::Entangler.class_eval do
+      alias_method :old_after, :after
+      def after
+        true
+      end
+    end
+
+    yield
+  ensure
+    Lhm::Entangler.class_eval do
+      undef_method :after
+      alias_method :after, :old_after
+      undef_method :old_after
+    end
+  end
 end

data/spec/integration/lhm_spec.rb

@@ -3,8 +3,6 @@
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
 
-require 'lhm'
-
 describe Lhm do
   include IntegrationHelper
 
@@ -205,6 +203,28 @@ describe Lhm do
       end
     end
 
+    it "works when mysql reserved words are used" do
+      table_create(:lines)
+      execute("insert into `lines` set id = 1, `between` = 'foo'")
+      execute("insert into `lines` set id = 2, `between` = 'bar'")
+
+      Lhm.change_table(:lines) do |t|
+        t.add_column('by', 'varchar(10)')
+        t.remove_column('lines')
+        t.add_index('by')
+        t.add_unique_index('between')
+        t.remove_index('by')
+      end
+
+      slave do
+        table_read(:lines).columns.must_include 'by'
+        table_read(:lines).columns.wont_include 'lines'
+        index_on_columns?(:lines, ['between'], :unique).must_equal true
+        index_on_columns?(:lines, ['by']).must_equal false
+        count_all(:lines).must_equal(2)
+      end
+    end
+
     describe "parallel" do
       it "should perserve inserts during migration" do
         50.times { |n| execute("insert into users set reference = '#{ n }'") }

data/spec/integration/table_spec.rb

@@ -2,8 +2,6 @@
 # Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
-
-require 'lhm'
 require 'lhm/table'
 
 describe Lhm::Table do

data/spec/{bootstrap.rb → test_helper.rb}

@@ -1,13 +1,28 @@
 # Copyright (c) 2011 - 2013, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
 # Schmidt
 
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 require 'minitest/mock'
 require "pathname"
+require "lhm"
 
 $project = Pathname.new(File.dirname(__FILE__) + '/..').cleanpath
 $spec = $project.join("spec")
 $fixtures = $spec.join("fixtures")
 
-$: << $project.join("lib").to_s
+begin
+  require 'active_record'
+  begin
+    require 'mysql2'
+  rescue LoadError
+    require 'mysql'
+  end
+rescue LoadError
+  require 'dm-core'
+  require 'dm-mysql-adapter'
+end
+
+logger = Logger.new STDOUT
+logger.level = Logger::WARN
+Lhm.logger = logger