lhm 1.0.0.rc2 → 1.0.0.rc3

data/spec/integration/locked_switcher_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
 
@@ -12,7 +10,7 @@ require 'lhm/locked_switcher'
 describe Lhm::LockedSwitcher do
   include IntegrationHelper
 
-  before(:each) { connect! }
+  before(:each) { connect_master! }
 
   describe "switching" do
     before(:each) do
@@ -25,17 +23,20 @@ describe Lhm::LockedSwitcher do
       switcher = Lhm::LockedSwitcher.new(@migration, connection)
       switcher.run
 
-      table_exists?(@origin).must_equal true
-      table_read(@migration.archive_name).columns.keys.must_include "origin"
+      slave do
+        table_exists?(@origin).must_equal true
+        table_read(@migration.archive_name).columns.keys.must_include "origin"
+      end
     end
 
     it "rename destination to origin" do
       switcher = Lhm::LockedSwitcher.new(@migration, connection)
       switcher.run
 
-      table_exists?(@destination).must_equal false
-      table_read(@origin.name).columns.keys.must_include "destination"
+      slave do
+        table_exists?(@destination).must_equal false
+        table_read(@origin.name).columns.keys.must_include "destination"
+      end
     end
   end
 end
-

data/spec/unit/chunker_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -16,7 +14,7 @@ describe Lhm::Chunker do
     @origin      = Lhm::Table.new("origin")
     @destination = Lhm::Table.new("destination")
     @migration   = Lhm::Migration.new(@origin, @destination)
-    @chunker     = Lhm::Chunker.new(@migration, 1, nil, { :stride => 100_000 })
+    @chunker     = Lhm::Chunker.new(@migration, nil, { :start => 1, :limit => 10 })
   end
 
   describe "copy into" do
@@ -34,9 +32,31 @@ describe Lhm::Chunker do
     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"
+      end
+    end
+  end
+
   describe "one" do
+    before do
+      @chunker = Lhm::Chunker.new(@migration, nil, {
+        :stride => 100_000, :start => 1, :limit => 300_000
+      })
+    end
+
     it "should have one chunk" do
-      @chunker.traversable_chunks_up_to(100).must_equal 1
+      @chunker.traversable_chunks_size.must_equal 3
     end
 
     it "should lower bound chunk on 1" do
@@ -44,36 +64,48 @@ describe Lhm::Chunker do
     end
 
     it "should upper bound chunk on 100" do
-      @chunker.top(chunk = 1, limit = 100).must_equal 100
+      @chunker.top(chunk = 1).must_equal 100_000
     end
   end
 
   describe "two" do
+    before do
+      @chunker = Lhm::Chunker.new(@migration, nil, {
+        :stride => 100_000, :start => 2, :limit => 150_000
+      })
+    end
+
     it "should have two chunks" do
-      @chunker.traversable_chunks_up_to(150_000).must_equal 2
+      @chunker.traversable_chunks_size.must_equal 2
     end
 
     it "should lower bound second chunk on 100_000" do
-      @chunker.bottom(chunk = 2).must_equal 100_001
+      @chunker.bottom(chunk = 2).must_equal 100_002
     end
 
     it "should upper bound second chunk on 150_000" do
-      @chunker.top(chunk = 2, limit = 150_000).must_equal 150_000
+      @chunker.top(chunk = 2).must_equal 150_000
     end
   end
 
   describe "iterating" do
-    it "should iterate" do
-      @chunker = Lhm::Chunker.new(@migration, nil, nil, {
-        :stride => 150,
-        :throttle => 0
+    before do
+      @chunker = Lhm::Chunker.new(@migration, nil, {
+        :stride => 100, :start => 53, :limit => 121
       })
+    end
 
-      @chunker.up_to(limit = 100) do |bottom, top|
-        bottom.must_equal 1
-        top.must_equal 100
+    it "should iterate" do
+      @chunker.up_to do |bottom, top|
+        bottom.must_equal 53
+        top.must_equal 121
       end
     end
   end
-end
 
+  describe "throttling" do
+    it "should default to 100 milliseconds" do
+      @chunker.throttle_seconds.must_equal 0.1
+    end
+  end
+end

data/spec/unit/entangler_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -76,4 +74,3 @@ describe Lhm::Entangler do
     end
   end
 end
-

data/spec/unit/intersection_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -39,4 +37,3 @@ describe Lhm::Intersection do
     { :metadata => "VARCHAR(255)"}
   end
 end
-

data/spec/unit/locked_switcher_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -51,4 +49,3 @@ describe Lhm::LockedSwitcher do
     end
   end
 end
-

data/spec/unit/migration_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -23,4 +21,3 @@ describe Lhm::Migration do
     @migration.archive_name.must_equal "lhma_#{ @start.strftime(stamp) }_origin"
   end
 end
-

data/spec/unit/migrator_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -21,7 +19,7 @@ describe Lhm::Migrator do
       @creator.add_index(["a", "b"])
 
       @creator.statements.must_equal([
-        "create index `index_alt_on_a_and_b` on `lhmn_alt` (a, b)"
+        "create index `index_alt_on_a_and_b` on `lhmn_alt` (`a`, `b`)"
       ])
     end
 
@@ -29,15 +27,15 @@ describe Lhm::Migrator do
       @creator.add_index(["a(10)", "b"])
 
       @creator.statements.must_equal([
-        "create index `index_alt_on_a_and_b` on `lhmn_alt` (a(10), b)"
+        "create index `index_alt_on_a_and_b` on `lhmn_alt` (`a`(10), `b`)"
       ])
     end
 
     it "should add an unique index" do
-      @creator.add_unique_index(["a(10)", :b])
+      @creator.add_unique_index(["a(5)", :b])
 
       @creator.statements.must_equal([
-        "create unique index `index_alt_on_a_and_b` on `lhmn_alt` (a(10), b)"
+        "create unique index `index_alt_on_a_and_b` on `lhmn_alt` (`a`(5), `b`)"
       ])
     end
 
@@ -94,4 +92,3 @@ describe Lhm::Migrator do
     end
   end
 end
-

data/spec/unit/sql_helper_spec.rb

@@ -0,0 +1,32 @@
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
+
+require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
+
+require 'lhm/sql_helper'
+
+describe Lhm::SqlHelper do
+  it "should name index with a single column" do
+    Lhm::SqlHelper.
+      idx_name(:users, :name).
+      must_equal("index_users_on_name")
+  end
+
+  it "should name index with multiple columns" do
+    Lhm::SqlHelper.
+      idx_name(:users, [:name, :firstname]).
+      must_equal("index_users_on_name_and_firstname")
+  end
+
+  it "should name index with prefixed column" do
+    Lhm::SqlHelper.
+      idx_name(:tracks, ["title(10)", "album"]).
+      must_equal("index_tracks_on_title_and_album")
+  end
+
+  it "should quote column names in index specification" do
+    Lhm::SqlHelper.
+      idx_spec(["title(10)", "album"]).
+      must_equal("`title`(10), `album`")
+  end
+end

data/spec/unit/table_spec.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
@@ -18,30 +16,6 @@ describe Lhm::Table do
     it "should name destination" do
       @table.destination_name.must_equal "lhmn_users"
     end
-
-    it "should name index with a single column" do
-      @table.
-        idx_name(["name"]).
-        must_equal("index_users_on_name")
-    end
-
-    it "should name index with multiple columns" do
-      @table.
-        idx_name(["name", "firstname"]).
-        must_equal("index_users_on_name_and_firstname")
-    end
-
-    it "should name index with prefixed column" do
-      @table.
-        idx_name(["name(10)", "firstname"]).
-        must_equal("index_users_on_name_and_firstname")
-    end
-
-    it "should name index with column names given as symbol" do
-      @table.
-        idx_name([:name, :firstname]).
-        must_equal("index_users_on_name_and_firstname")
-    end
   end
 
   describe "constraints" do
@@ -97,4 +71,3 @@ describe Lhm::Table do
     end
   end
 end
-

data/spec/unit/unit_helper.rb

@@ -1,7 +1,5 @@
-#
-#  Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
-#  Schmidt
-#
+# Copyright (c) 2011, SoundCloud Ltd., Rany Keddo, Tobias Bielohlawek, Tobias
+# Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + "/../bootstrap"
 
@@ -14,4 +12,3 @@ module UnitHelper
     sql.strip.gsub(/\n */, "\n")
   end
 end
-

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: lhm
 version: !ruby/object:Gem::Version 
+  hash: 15424051
   prerelease: 6
-  version: 1.0.0.rc2
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc
+  - 3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - SoundCloud
@@ -13,8 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 +01:00
-default_executable: 
+date: 2012-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mysql
@@ -24,6 +30,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
         version: 2.8.1
   type: :development
   version_requirements: *id001
@@ -35,6 +46,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 2
+        - 10
+        - 0
         version: 2.10.0
   type: :development
   version_requirements: *id002
@@ -46,6 +62,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -57,6 +76,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -69,14 +91,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .config
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/ar-2.3.gemfile
+- gemfiles/ar-3.1.gemfile
 - lhm.gemspec
 - lib/lhm.rb
 - lib/lhm/chunker.rb
@@ -87,8 +110,15 @@ files:
 - lib/lhm/locked_switcher.rb
 - lib/lhm/migration.rb
 - lib/lhm/migrator.rb
+- lib/lhm/sql_helper.rb
 - lib/lhm/table.rb
+- lib/lhm/version.rb
+- spec/README.md
 - spec/bootstrap.rb
+- spec/config/.config
+- spec/config/clobber
+- spec/config/grants
+- spec/config/setup-cluster
 - spec/fixtures/destination.ddl
 - spec/fixtures/origin.ddl
 - spec/fixtures/users.ddl
@@ -103,9 +133,9 @@ files:
 - spec/unit/locked_switcher_spec.rb
 - spec/unit/migration_spec.rb
 - spec/unit/migrator_spec.rb
+- spec/unit/sql_helper_spec.rb
 - spec/unit/table_spec.rb
 - spec/unit/unit_helper.rb
-has_rdoc: true
 homepage: http://github.com/soundcloud/large-hadron-migrator
 licenses: []
 
@@ -119,22 +149,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: online schema changer for mysql
 test_files: 
+- spec/README.md
 - spec/bootstrap.rb
+- spec/config/.config
+- spec/config/clobber
+- spec/config/grants
+- spec/config/setup-cluster
 - spec/fixtures/destination.ddl
 - spec/fixtures/origin.ddl
 - spec/fixtures/users.ddl
@@ -149,5 +192,7 @@ test_files:
 - spec/unit/locked_switcher_spec.rb
 - spec/unit/migration_spec.rb
 - spec/unit/migrator_spec.rb
+- spec/unit/sql_helper_spec.rb
 - spec/unit/table_spec.rb
 - spec/unit/unit_helper.rb
+has_rdoc: