mysql_import 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7019a15ca8ae5846ef8014d300a886464a8ab02e
-  data.tar.gz: 2c8cf6cf654037eb44e047a7cf44874032a4f42d
+  metadata.gz: 609ba688e11734a17c9b421fd8cc6ff576a400bb
+  data.tar.gz: 6911371e8f1d12a06adfdb590911739f55cb2d62
 SHA512:
-  metadata.gz: 758364cd6d87430daff77c55734aa09e1e9273352138410f91c40352920eb56e5b1a7d3a3d0140269c2ae7cf3f218b481059abfe1ad784716680b33a4845c178
-  data.tar.gz: b251b30800e0a56517d8073faa8dae7b73a247e45f2909e91c2cac7c8cf96681fa9c39d1f1d3ebb615526863525d258482e3183c3eacc795329ecb7ab5a29dce
+  metadata.gz: 198bd007c859a481726fe34302242e79cbca316278094e033e1ac709fa9831a9a7ec66b7a0a1b4ed2b036acdf0a622f47c317dc3a9ba741698d20723c01b24cd
+  data.tar.gz: d87ca57f0955dfe6d1028441a8f88d3720d211ed927237fcbea13eaa28aeee364415cb8416e7976a0dc471b3c520007ba551f62fec04dc18a014aa03775a5142

data/.travis.yml

@@ -2,8 +2,7 @@ dist: trusty
 sudo: required
 language: ruby
 rvm:
-- 2.2.5
-- 2.3.1
+- 2.3.3
 before_install: gem install bundler
 cache:
 - bundler

data/lib/mysql_import/logger.rb

@@ -1,30 +1,26 @@
 require 'logger'
 
 class MysqlImport
-  class Logger < SimpleDelegator
+  class Logger < ::Logger
     def initialize(out, debug)
+      super(out)
+
+      @level = INFO unless debug
       case out
-      when String
-        obj = ::Logger.new(out)
-        obj.level = ::Logger::INFO
-      when NilClass
-        obj = ::Logger.new(nil)
       when STDOUT, STDERR
-        obj = ::Logger.new(out)
-        obj.formatter = ->(_, _, _, message) { "#{String === message ? message : message.inspect}\n" }
-        obj.level = ::Logger::INFO
-      else
-        obj = out
+        @formatter = ->(_, _, _, message) { "#{String === message ? message : message.inspect}\n" }
       end
-
-      obj.level = ::Logger::DEBUG if debug
-      super(obj)
     end
   end
 
   module Logging
     def initialize(config, opts = {})
-      @logger = Logger.new(opts[:log], opts.fetch(:debug, false))
+      @debug = opts.fetch(:debug, false)
+      @logger = if opts[:log].is_a?(::Logger)
+                  opts[:log]
+                else
+                  Logger.new(opts[:log], @debug)
+                end
       embed_logger
       super
     end
@@ -49,16 +45,20 @@ class MysqlImport
     private
 
     def parallel_opts
-      @parallel_opts ||= super.merge(
-        finish: proc do |item, index, _result|
-          @logger.debug("parallel_item: #{item.inspect}")
-          @logger.debug("parallel_index: #{index}")
-        end
-      )
+      @parallel_opts ||= if @debug
+                           super.merge(
+                             finish: proc do |item, index, _result|
+                               @logger.debug("parallel_item: #{item.inspect}")
+                               @logger.debug("parallel_index: #{index}")
+                             end
+                           )
+                         else
+                           super
+                         end
     end
 
     def embed_logger
-      unless LoadDataInfile2::Client.instance_methods.include?(:build_sql_with_logging)
+      if @debug && !LoadDataInfile2::Client.instance_methods.include?(:build_sql_with_logging)
         LoadDataInfile2::Client.class_exec(@logger) do |logger|
           define_method :build_sql_with_logging do |file, options = {}|
             build_sql_without_logging(file, options).tap {|sql| logger.debug("sql: #{sql}") }

data/lib/mysql_import/version.rb

@@ -1,3 +1,3 @@
 class MysqlImport
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/mysql_import.rb

@@ -7,6 +7,7 @@ require 'parallel'
 class MysqlImport
   def initialize(config, opts = {})
     @stash = []
+    @lock = opts.fetch(:lock, false)
     @concurrency = opts.has_key?(:concurrency) ? opts[:concurrency].to_i : 2
     pool = @concurrency.zero? ? 1 : @concurrency
     sql_opts = opts.fetch(:sql_opts, {})
@@ -44,32 +45,32 @@ class MysqlImport
 
   def run_import(cli, fpath, opts)
     t = Time.now
+    imported = false
 
-    sql_opts = Marshal.load(Marshal.dump(opts.reject {|k, _| %i(before after).include?(k) }))
+    sql_opts = opts.reject {|k, _| %i(before after).include?(k) }
     table = sql_opts[:table] || File.basename(fpath, '.*')
+    lock = opts.fetch(:lock, @lock)
 
-    if opts[:before]
-      begin
-        run_action(opts[:before], cli)
-      rescue Break
-        @result.add(:skipped, table)
-        return
-      end
-    end
+    begin
+      write_lock(cli, table) if lock
 
-    cli.import(fpath, sql_opts)
+      run_action(opts[:before], cli)
 
-    if opts[:after]
-      begin
-        run_action(opts[:after], cli)
-      rescue Break
-      end
-    end
+      cli.import(fpath, sql_opts)
+      imported = true
 
-    @result.add(:imported, [table, (Time.now - t)])
+      run_action(opts[:after], cli)
+    rescue Break
+      @result.skipped.push(table) unless imported
+    ensure
+      unlock(cli) if lock
+      @result.imported.push([table, (Time.now - t)]) if imported
+    end
   end
 
   def run_action(action, cli)
+    return unless action
+
     case action
     when Array
       action.each { |act| run_action(act, cli) }
@@ -80,6 +81,14 @@ class MysqlImport
     end
   end
 
+  def write_lock(cli, table)
+    cli.query("LOCK TABLE `#{table}` WRITE;")
+  end
+
+  def unlock(cli)
+    cli.query("UNLOCK TABLES;")
+  end
+
   class Result
     def imported
       @imported ||= []
@@ -89,14 +98,6 @@ class MysqlImport
       @skipped ||= []
     end
 
-    def mutex
-      @mutext ||= Mutex.new
-    end
-
-    def add(meth, res)
-      mutex.synchronize { __send__(meth).push(res) }
-    end
-
     def clear
       imported.clear
       skipped.clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_import
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - nalabjp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: load_data_infile2