mysql_truck 0.6.2 → 0.6.4

data/lib/mysql_truck.rb

@@ -3,6 +3,7 @@ require "mysql"
 require "csv"
 require "fileutils"
 require "pathname"
+require "benchmark"
 
 require "mysql_truck/version"
 require "mysql_truck/helper"

data/lib/mysql_truck/dumper.rb

@@ -20,6 +20,18 @@ module MysqlTruck
     end
 
     def dump_data
+      mysql = Mysql.init
+      mysql.options(Mysql::SET_CHARSET_NAME, "utf8")
+      mysql.connect(
+        config[:host],
+        config[:username],
+        config[:password],
+        config[:database],
+        config[:port]
+      )
+      # mysql.query_with_result = false # Do not store result in memory
+      mysql.query("SET NAMES utf8")
+
       tables.each do |table|
         puts "Dumping #{table}..."
         next if compressed_files_exist?(table) && smartly?
@@ -32,26 +44,14 @@ module MysqlTruck
           schema_cmd += "#{db_connection_options} #{table}"
           schema_cmd += " > #{filename(table)[:schema_file]}"
           puts schema_cmd
-          `#{schema_cmd}`
+          benchmark { `#{schema_cmd}` }
 
           # Dump data
           puts "Writing data for #{table} ..."
-          mysql = Mysql.init
-          mysql.options(Mysql::SET_CHARSET_NAME, "utf8")
-          mysql.connect(
-            config[:host],
-            config[:username],
-            config[:password],
-            config[:database],
-            config[:port]
-          )
-          mysql.query_with_result = false # Do not store result in memory
-          mysql.query("SET NAMES utf8")
-          CSV.open(filename(table)[:data_file], 'wb', :col_sep => "\t") do |csv|
-            mysql.query("SELECT * FROM #{table}")
-            results = mysql.use_result # Stream the rows
-            results.each do |row|
-              csv << row.collect { |col| col && col.match(/\t/) ? "    " : col }
+          benchmark do
+            puts `mysql #{db_connection_options} --skip-column-names --batch -e "select * from #{table}" | lzop -6 > #{filename(table)[:compressed_data_file]} 2>/var/log/mysql_truck_dump.log`
+            if $?.exitstatus != 0
+              puts "Command did not execute successfully"
             end
           end
         end
@@ -79,14 +79,16 @@ module MysqlTruck
         if compress_files?(table)
           puts "compressing #{filename(table)[:no_index_schema_file]}."
 
-          compression_cmd = "lzop -8 -U"
-          `#{compression_cmd} #{filename(table)[:no_index_schema_file]}`
+          benchmark do
+            compression_cmd = "lzop -8 -U"
+            `#{compression_cmd} #{filename(table)[:no_index_schema_file]}`
 
-          puts "compressing #{filename(table)[:alter_table_file]}."
-          `#{compression_cmd} #{filename(table)[:alter_table_file]}`
+            puts "compressing #{filename(table)[:alter_table_file]}."
+            `#{compression_cmd} #{filename(table)[:alter_table_file]}`
 
-          puts "compressing #{filename(table)[:data_file]}."
-          `#{compression_cmd} #{filename(table)[:data_file]}`
+            puts "compressing #{filename(table)[:data_file]}."
+            `#{compression_cmd} #{filename(table)[:data_file]}`
+          end
         end
 
         puts "#{table} dumped.\n\n"

data/lib/mysql_truck/helper.rb

@@ -64,13 +64,14 @@ module MysqlTruck
     end
 
     def benchmark
-      Benchmark.realtime do
+      time = Benchmark.realtime do
         yield
       end
+      puts "Ran in #{formatted_time(time)}."
     end
 
     def formatted_time(time)
-      "#{"%0.5f" % time}ms"
+      "#{"%0.5f" % time}s"
     end
 
     def csv_options

data/lib/mysql_truck/loader.rb

@@ -43,8 +43,7 @@ module MysqlTruck
           else
             decompress_cmd = "gunzip -f"
           end
-          time = benchmark { `#{decompress_cmd} #{tmp_path.join(filename)}` }
-          print "complete (#{formatted_time time}).\n"
+          benchmark { `#{decompress_cmd} #{tmp_path.join(filename)}` }
         end
       end
 
@@ -127,10 +126,9 @@ module MysqlTruck
       sed2_cmd = config[:date_suffix] ? "sed 's/TABLE #{table}/TABLE #{table}_#{backup_date_str.gsub(/-/, "")}/g'" : nil
       import_cmd =  "mysql #{db_connection_options}"
 
-      time = benchmark do
+      benchmark do
         `#{[ cat_cmd, sed_cmd, sed2_cmd, import_cmd].compact.join(' | ')}`
       end
-      print "complete (#{formatted_time time}).\n"
     end
 
     def import_csv_file(table, backup_date_str, file_path)
@@ -141,12 +139,10 @@ module MysqlTruck
         `mv #{old_file_path} #{file_path}`
       end
 
-      time = benchmark do
+      benchmark do
         `mysqlimport --local --compress #{csv_options} #{db_connection_options} #{file_path}`
       end
 
-      print "complete (#{formatted_time time}).\n"
-
       file_path
     end
 
@@ -158,12 +154,10 @@ module MysqlTruck
         `mv #{old_file_path} #{file_path}`
       end
 
-      time = benchmark do
+      benchmark do
         `mysqlimport --local --compress #{db_connection_options} #{file_path}`
       end
 
-      print "complete (#{formatted_time time}).\n"
-
       file_path
     end
 
@@ -181,15 +175,13 @@ module MysqlTruck
       if !smartly? || (smartly? && !unzipped_file.exist?)
         print " - Downloading... "
 
-        time = benchmark do
+        benchmark do
           file.open("wb") do |f|
             @bucket.s3.interface.get(@bucket.name, key.name) do |chunk|
               f.write chunk
             end
           end
         end
-
-        puts "complete (#{formatted_time time})."
       else
         puts " already downloaded."
       end

data/lib/mysql_truck/version.rb

@@ -1,3 +1,3 @@
 module MysqlTruck
-  VERSION = "0.6.2"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_truck
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws