lhm 1.0.0.rc3 → 1.0.0.rc4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+
+# 1.0.0.rc4 (January 29, 2012)
+
+* added '-- lhm' to the end of statements for more visibility
+
 # 1.0.0.rc3 (January 19, 2012)
 
 * Speedup migrations for tables with large minimum id

data/lib/lhm/sql_helper.rb

@@ -21,14 +21,16 @@ module Lhm
     end
 
     def sql(statements)
-      [statements].flatten.each { |statement| connection.execute(statement) }
+      [statements].flatten.each do |statement|
+        connection.execute(tagged(statement))
+      end
     rescue ActiveRecord::StatementInvalid, Mysql::Error => e
       error e.message
     end
 
     def update(statements)
       [statements].flatten.inject(0) do |memo, statement|
-        memo += connection.update(statement)
+        memo += connection.update(tagged(statement))
       end
     rescue ActiveRecord::StatementInvalid, Mysql::Error => e
       error e.message
@@ -36,6 +38,10 @@ module Lhm
 
   private
 
+    def tagged(statement)
+      statement + " -- lhm"
+    end
+
     def column_definition(cols)
       Array(cols).map do |column|
         column.to_s.match(/`?([^\(]+)`?(\([^\)]+\))?/).captures

data/lib/lhm/version.rb

@@ -2,5 +2,5 @@
 # Schmidt
 
 module Lhm
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

data/spec/config/.config

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

data/spec/config/clobber

@@ -12,7 +12,7 @@ lhmkill() {
 
 echo stopping other running mysql instance
 launchctl remove com.mysql.mysqld || { echo launchctl did not remove mysqld; }
-mysqladmin shutdown || { echo mysqladmin did not shut down anything; }
+"$mysqldir"/bin/mysqladmin shutdown || { echo mysqladmin did not shut down anything; }
 
 echo killing lhm-cluster
 lhmkill
@@ -24,8 +24,8 @@ echo setting up cluster
 spec/config/setup-cluster
 
 echo staring instances
-mysqld --defaults-file="$basedir/master/my.cnf" 2>&1 >$basedir/master/lhm.log &
-mysqld --defaults-file="$basedir/slave/my.cnf" 2>&1 >$basedir/slave/lhm.log &
+"$mysqldir"/bin/mysqld --defaults-file="$basedir/master/my.cnf" 2>&1 >$basedir/master/lhm.log &
+"$mysqldir"/bin/mysqld --defaults-file="$basedir/slave/my.cnf" 2>&1 >$basedir/slave/lhm.log &
 sleep 5
 
 echo running grants

data/spec/config/grants

@@ -2,8 +2,8 @@
 
 source .config
 
-master() { mysql --protocol=TCP -P $master_port -uroot; }
-slave()  { mysql --protocol=TCP -P $slave_port -uroot; }
+master() { "$mysqldir"/bin/mysql --protocol=TCP -P $master_port -uroot; }
+slave()  { "$mysqldir"/bin/mysql --protocol=TCP -P $slave_port -uroot; }
 
 # set up master
 
@@ -22,4 +22,4 @@ echo "grant all privileges on *.* to ''@'localhost'" | master
 echo "grant all privileges on *.* to ''@'localhost'" | slave
 
 echo "create database lhm" | master
-echo "create database lhm" | slave
+echo "create database if not exists lhm" | slave

data/spec/config/setup-cluster

@@ -42,20 +42,24 @@ server-id = 2
 
 # replication (optional filters)
 
-replicate-do-table = lhm.users
-replicate-do-table = lhm.lhmn_users
-replicate-wild-do = lhm.lhma_%_users
+# replicate-do-table = lhm.users
+# replicate-do-table = lhm.lhmn_users
+# replicate-wild-do-table = lhm.lhma_%_users
 
-replicate-do-table = lhm.origin
-replicate-do-table = lhm.lhmn_origin
-replicate-wild-do = lhm.lhma_%_origin
+# replicate-do-table = lhm.origin
+# replicate-do-table = lhm.lhmn_origin
+# replicate-wild-do-table = lhm.lhma_%_origin
 
-replicate-do-table = lhm.destination
-replicate-do-table = lhm.lhmn_destination
-replicate-wild-do = lhm.lhma_%_destination
+# replicate-do-table = lhm.destination
+# replicate-do-table = lhm.lhmn_destination
+# replicate-wild-do-table = lhm.lhma_%_destination
 CNF
 
 # build system tables
 
-mysql_install_db --datadir="$basedir/master/data"
-mysql_install_db --datadir="$basedir/slave/data"
+(
+  cd "$mysqldir"
+  ./scripts/mysql_install_db --datadir="$basedir/master/data"
+  ./scripts/mysql_install_db --datadir="$basedir/slave/data"
+
+)

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lhm
 version: !ruby/object:Gem::Version 
-  hash: 15424051
-  prerelease: 6
+  prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc
-  - 3
-  version: 1.0.0.rc3
+  - rc4
+  version: 1.0.0.rc4
 platform: ruby
 authors: 
 - SoundCloud
@@ -20,7 +18,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 Z
+date: 2012-01-29 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mysql
@@ -30,7 +29,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 45
         segments: 
         - 2
         - 8
@@ -46,7 +44,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 2
         - 10
@@ -62,7 +59,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -76,7 +72,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -91,7 +86,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .config
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -136,6 +130,7 @@ files:
 - 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: []
 
@@ -149,7 +144,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -158,7 +152,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -167,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: online schema changer for mysql
@@ -195,4 +188,3 @@ test_files:
 - spec/unit/sql_helper_spec.rb
 - spec/unit/table_spec.rb
 - spec/unit/unit_helper.rb
-has_rdoc: 

data/.config

@@ -1,3 +0,0 @@
-basedir=/opt/lhm-cluster
-master_port=3306
-slave_port=3307