mysql_isolated_server 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c86a7be139488f4c7980f150cb2df8d998730c3a
-  data.tar.gz: d90947e7b2e7bc90083bf7f63c93a00c56bfb661
+  metadata.gz: 5d8abd30d623ca6de6dc2bffdbda2a4a7b0bbbb5
+  data.tar.gz: 390239042496260846019bf0ee3ca7289b8c293c
 SHA512:
-  metadata.gz: e15d257eab67513a552482f2b58eb86ad89a65f1dff1032d1b40a2108db393dc4f8fc0be8dee8c8f0a2f2c0045cb2d983bdac0a424cb7a40a0fd7cd2c6a7d154
-  data.tar.gz: e15e5009dc2a940b3c547cfcb6bc817787d1d4b130c26f9510d3aa634c220efb5cfb41dedb95749bc95e6952c1806d8ceff6406c0a2cdbbb162f265147d445a5
+  metadata.gz: 14b04cc5b22b42c6b9020a3d991483871a67b19e4339ae71762e278e751352432080afce395f722ebbb639edd19f55c93d8dae7e18d5a2ff7de3bd11f6963aef
+  data.tar.gz: dc810674507fa907e24595314a238a150e7c05906c2d1a5d2b684e0c415170bf400f73d9df927ad948a81c43330962c1928db7b44f3e8330d4b2b2b59b15560e

data/bin/boot_isolated_server

@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+require 'rubygems'
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
+require 'mysql_isolated_server'
+require 'getoptlong'
+
+$stderr.puts ENV.inspect
+opts = GetoptLong.new(
+  [ '--log-bin', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--pid', GetoptLong::REQUIRED_ARGUMENT ]
+)
+
+options = {}
+opts.each do |opt, arg|
+  case opt
+    when '--log-bin'
+      options[:log_bin] = arg
+    when '--pid'
+      options[:pid] = arg.to_i
+    end
+end
+
+options[:params] = ARGV.join(' ')
+
+mysql_isolated_server = MysqlIsolatedServer.new(options)
+mysql_isolated_server.boot!
+
+puts "dir: " + mysql_isolated_server.base
+puts "port: " + mysql_isolated_server.port.to_s
+STDOUT.flush

data/lib/mysql_isolated_server.rb

@@ -1,23 +1,56 @@
 require 'tmpdir'
 require 'socket'
-require 'mysql2'
+
+if RUBY_PLATFORM == "java"
+  require 'mysql_isolated_server/jdbc_connection'
+else
+  require 'mysql_isolated_server/mysql2_connection'
+end
 
 class MysqlIsolatedServer
+  include DBConnection
   attr_reader :pid, :base, :port
   attr_accessor :params
   MYSQL_BASE_DIR="/usr"
 
   def initialize(options = {})
-    @base = Dir.mktmpdir("mysql_isolated", "/tmp")
+    @base = options[:base] || Dir.mktmpdir("mysql_isolated", "/tmp")
     @mysql_data_dir="#{@base}/mysqld"
     @mysql_socket="#{@mysql_data_dir}/mysqld.sock"
     @params = options[:params]
     @load_data_path = options[:data_path]
     @port = options[:port]
     @allow_output = options[:allow_output]
+    @log_bin = options[:log_bin] || "--log-bin"
+    @parent_pid = options[:pid]
     @server_id = rand(2**31)
   end
 
+  def self.thread_boot(*params)
+    bin = File.dirname(__FILE__) + "/../bin/boot_isolated_server"
+    mysql_dir, mysql_port = nil, nil
+    restore_env = {}
+
+    Thread.abort_on_exception = true
+    Thread.new do
+      ENV.keys.grep(/GEM|BUNDLE|RUBYOPT/).each do |k|
+        restore_env[k] = ENV.delete(k)
+      end
+      params = ["--pid", $$.to_s] + params
+
+      pipe = IO.popen(["#{bin}"].concat(params), "r") do |pipe|
+        mysql_dir = pipe.readline.split(' ').last
+        mysql_port = pipe.readline.split(' ').last.to_i
+        sleep
+      end
+    end
+
+    while mysql_port.nil?
+      sleep 1
+    end
+    new(:port => mysql_port, :base => mysql_dir)
+  end
+
   def make_slave_of(master)
     master_binlog_info = master.connection.query("show master status").first
     connection.query(<<-EOL
@@ -32,10 +65,6 @@ class MysqlIsolatedServer
     connection.query("SET GLOBAL READ_ONLY=1")
   end
 
-  def connection
-    @cx ||= Mysql2::Client.new(:host => "127.0.0.1", :port => @port, :username => "root", :password => "", :database => "mysql")
-  end
-
   def set_rw(rw)
     ro = rw ? 0 : 1
     connection.query("SET GLOBAL READ_ONLY=#{ro}")
@@ -54,7 +83,7 @@ class MysqlIsolatedServer
     exec_server <<-EOL
         #{mysqld} --no-defaults --default-storage-engine=innodb \
                 --datadir=#{@mysql_data_dir} --pid-file=#{@base}/mysqld.pid --port=#{@port} \
-                #{@params} --socket=#{@mysql_data_dir}/mysql.sock --log-bin --log-slave-updates
+                #{@params} --socket=#{@mysql_data_dir}/mysql.sock #{@log_bin} --log-slave-updates
     EOL
 
     while !system("mysql -h127.0.0.1 --port=#{@port} --database=mysql -u root -e 'select 1' >/dev/null 2>&1")
@@ -85,6 +114,19 @@ class MysqlIsolatedServer
       system("cp #{File.expand_path(File.dirname(__FILE__))}/tables/user.* #{@mysql_data_dir}/mysql")
     end
 
+    if !@log_bin
+      @log_bin = "--log-bin"
+    else
+      if @log_bin[0] != '/'
+        binlog_dir = "#{@mysql_data_dir}/#{@log_bin}"
+      else
+        binlog_dir = @log_bin
+      end
+
+      system("mkdir -p #{binlog_dir}")
+      @log_bin = "--log-bin=#{binlog_dir}"
+    end
+
     up!
 
     tzinfo_to_sql = locate_executable("mysql_tzinfo_to_sql5", "mysql_tzinfo_to_sql")
@@ -100,7 +142,7 @@ class MysqlIsolatedServer
 
       begin
         socket = Socket.new(:INET, :STREAM, 0)
-        socket.bind(Addrinfo.tcp("127.0.0.1", candidate))
+        socket.bind(Socket.pack_sockaddr_in(candidate, '127.0.0.1'))
         socket.close
         return candidate
       rescue Exception => e
@@ -117,9 +159,10 @@ class MysqlIsolatedServer
     system("mkdir -p #{base}/tmp")
     system("chmod 0777 #{base}/tmp")
 
-    original_pid = $$
+    parent_pid = @parent_pid || $$
     mysql_pid = nil
 
+    $stderr.puts cmd
     middle_pid = fork do
       mysql_pid = fork do
         ENV["TMPDIR"] = "#{base}/tmp"
@@ -134,15 +177,18 @@ class MysqlIsolatedServer
       # begin waiting for the parent (or mysql) to die; at_exit is hard to control when interacting with test/unit
       # we can also be killed by our parent with down! and up!
       #
-      trap("TERM") do
-        Process.kill("KILL", mysql_pid) rescue nil
-        cleanup!
-        exit!
+      ["TERM", "INT"].each do |sig|
+        trap(sig) do
+          Process.kill("KILL", mysql_pid) rescue nil
+          cleanup!
+          exit!
+        end
       end
 
+
       while true
         begin
-          Process.kill(0, original_pid)
+          Process.kill(0, parent_pid)
           Process.kill(0, mysql_pid)
         rescue Exception => e
           Process.kill("KILL", mysql_pid) rescue nil

data/lib/mysql_isolated_server/jdbc_connection.rb

@@ -0,0 +1,49 @@
+require "java"
+java_import "java.sql.DriverManager"
+java_import "org.apache.commons.lang.StringEscapeUtils"
+
+class MysqlIsolatedServer
+  class WrappedJDBCConnection
+    def initialize(port)
+      @cx ||= DriverManager.get_connection("jdbc:mysql://127.0.0.1:#{port}/mysql", "root", "")
+    end
+
+    def query(sql)
+      stmt = @cx.create_statement
+      if sql !~ /^select/i && sql !~ /^show/i
+        return stmt.execute(sql)
+      end
+
+      rs = stmt.execute_query(sql)
+      while (rs.next)
+        rows = []
+        meta_data = rs.get_meta_data
+        num_cols = meta_data.get_column_count
+
+        row = {}
+        1.upto(num_cols) do |col|
+          col_name = meta_data.get_column_label(col)
+          col_value = rs.get_object(col) # of meta_data.get_column_type(col)
+
+          row[col_name] = col_value if col_value # skip if nil
+        end
+
+        rows << row
+      end
+      rows
+    ensure
+      stmt.close if stmt
+      rs.close if rs
+    end
+
+    def escape(str)
+      StringEscapeUtils.escapeSql(str)
+    end
+  end
+
+  module DBConnection
+    def connection
+      @connection ||= WrappedJDBCConnection.new(@port)
+    end
+  end
+end

data/lib/mysql_isolated_server/mysql2_connection.rb

@@ -0,0 +1,8 @@
+class MysqlIsolatedServer
+  module DBConnection
+    def connection
+      require 'mysql2'
+      @cx ||= Mysql2::Client.new(:host => "127.0.0.1", :port => @port, :username => "root", :password => "", :database => "mysql")
+    end
+  end
+end

data/lib/mysql_isolated_server/version.rb

@@ -1,3 +1,3 @@
 class MysqlIsolatedServer
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/mysql_isolated_server.gemspec

@@ -15,6 +15,5 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_dependency "mysql2"
   gem.require_paths = ["lib"]
 end

metadata

@@ -1,34 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: mysql_isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-06-16 00:00:00.000000000 Z
+dependencies: []
 description: A small library that allows you to easily spin up new local mysql servers
   for testing purposes.
 email:
 - ben@zendesk.com
-executables: []
+executables:
+- boot_isolated_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -37,7 +24,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/boot_isolated_server
 - lib/mysql_isolated_server.rb
+- lib/mysql_isolated_server/jdbc_connection.rb
+- lib/mysql_isolated_server/mysql2_connection.rb
 - lib/mysql_isolated_server/version.rb
 - lib/tables/user.MYD
 - lib/tables/user.MYI