mysql2 0.3.1 → 0.5.2

data/benchmark/query_with_mysql_casting.rb

@@ -1,80 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql'
-require 'mysql2'
-require 'do_mysql'
-
-number_of = 100
-database = 'test'
-sql = "SELECT * FROM mysql2_test LIMIT 100"
-
-class Mysql
-  include Enumerable
-end
-
-def mysql_cast(type, value)
-  case type
-    when Mysql::Field::TYPE_NULL
-      nil
-    when Mysql::Field::TYPE_TINY, Mysql::Field::TYPE_SHORT, Mysql::Field::TYPE_LONG,
-         Mysql::Field::TYPE_INT24, Mysql::Field::TYPE_LONGLONG, Mysql::Field::TYPE_YEAR
-      value.to_i
-    when Mysql::Field::TYPE_DECIMAL, Mysql::Field::TYPE_NEWDECIMAL
-      BigDecimal.new(value)
-    when Mysql::Field::TYPE_DOUBLE, Mysql::Field::TYPE_FLOAT
-      value.to_f
-    when Mysql::Field::TYPE_DATE
-      Date.parse(value)
-    when Mysql::Field::TYPE_TIME, Mysql::Field::TYPE_DATETIME, Mysql::Field::TYPE_TIMESTAMP
-      Time.parse(value)
-    when Mysql::Field::TYPE_BLOB, Mysql::Field::TYPE_BIT, Mysql::Field::TYPE_STRING,
-         Mysql::Field::TYPE_VAR_STRING, Mysql::Field::TYPE_CHAR, Mysql::Field::TYPE_SET
-         Mysql::Field::TYPE_ENUM
-      value
-    else
-      value
-  end
-end
-
-Benchmark.bmbm do |x|
-  mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
-  mysql2.query "USE #{database}"
-  x.report "Mysql2" do
-    number_of.times do
-      mysql2_result = mysql2.query sql, :symbolize_keys => true
-      mysql2_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  mysql = Mysql.new("localhost", "root")
-  mysql.query "USE #{database}"
-  x.report "Mysql" do
-    number_of.times do
-      mysql_result = mysql.query sql
-      fields = mysql_result.fetch_fields
-      mysql_result.each do |row|
-        row_hash = {}
-        row.each_with_index do |f, j|
-          row_hash[fields[j].name.to_sym] = mysql_cast(fields[j].type, row[j])
-        end
-        # puts row_hash.inspect
-      end
-    end
-  end
-
-  do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
-  command = do_mysql.create_command sql
-  x.report "do_mysql" do
-    number_of.times do
-      do_result = command.execute_reader
-      do_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-end

data/benchmark/query_without_mysql_casting.rb

@@ -1,47 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql'
-require 'mysql2'
-require 'do_mysql'
-
-number_of = 100
-database = 'test'
-sql = "SELECT * FROM mysql2_test LIMIT 100"
-
-Benchmark.bmbm do |x|
-  mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
-  mysql2.query "USE #{database}"
-  x.report "Mysql2" do
-    number_of.times do
-      mysql2_result = mysql2.query sql, :symbolize_keys => true
-      mysql2_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  mysql = Mysql.new("localhost", "root")
-  mysql.query "USE #{database}"
-  x.report "Mysql" do
-    number_of.times do
-      mysql_result = mysql.query sql
-      mysql_result.each_hash do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
-  command = DataObjects::Mysql::Command.new do_mysql, sql
-  x.report "do_mysql" do
-    number_of.times do
-      do_result = command.execute_reader
-      do_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-end

data/benchmark/sequel.rb

@@ -1,37 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql2'
-require 'sequel'
-require 'sequel/adapters/do'
-
-number_of = 10
-mysql2_opts = "mysql2://localhost/test"
-mysql_opts = "mysql://localhost/test"
-do_mysql_opts = "do:mysql://localhost/test"
-
-class Mysql2Model < Sequel::Model(Sequel.connect(mysql2_opts)[:mysql2_test]); end
-class MysqlModel < Sequel::Model(Sequel.connect(mysql_opts)[:mysql2_test]); end
-class DOMysqlModel < Sequel::Model(Sequel.connect(do_mysql_opts)[:mysql2_test]); end
-
-Benchmark.bmbm do |x|
-  x.report "Mysql2" do
-    number_of.times do
-      Mysql2Model.limit(1000).all
-    end
-  end
-
-  x.report "do:mysql" do
-    number_of.times do
-      DOMysqlModel.limit(1000).all
-    end
-  end
-
-  x.report "Mysql" do
-    number_of.times do
-      MysqlModel.limit(1000).all
-    end
-  end
-end

data/benchmark/setup_db.rb

@@ -1,119 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-# This script is for generating psudo-random data into a single table consisting of nearly every
-# data type MySQL 5.1 supports.
-#
-# It's meant to be used with the query.rb benchmark script (or others in the future)
-
-require 'mysql2'
-require 'rubygems'
-require 'faker'
-
-num = ENV['NUM'] && ENV['NUM'].to_i || 10_000
-
-create_table_sql = %[
-  CREATE TABLE IF NOT EXISTS mysql2_test (
-    null_test VARCHAR(10),
-    bit_test BIT,
-    tiny_int_test TINYINT,
-    small_int_test SMALLINT,
-    medium_int_test MEDIUMINT,
-    int_test INT,
-    big_int_test BIGINT,
-    float_test FLOAT(10,3),
-    float_zero_test FLOAT(10,3),
-    double_test DOUBLE(10,3),
-    decimal_test DECIMAL(10,3),
-    decimal_zero_test DECIMAL(10,3),
-    date_test DATE,
-    date_time_test DATETIME,
-    timestamp_test TIMESTAMP,
-    time_test TIME,
-    year_test YEAR(4),
-    char_test CHAR(10),
-    varchar_test VARCHAR(10),
-    binary_test BINARY(10),
-    varbinary_test VARBINARY(10),
-    tiny_blob_test TINYBLOB,
-    tiny_text_test TINYTEXT,
-    blob_test BLOB,
-    text_test TEXT,
-    medium_blob_test MEDIUMBLOB,
-    medium_text_test MEDIUMTEXT,
-    long_blob_test LONGBLOB,
-    long_text_test LONGTEXT,
-    enum_test ENUM('val1', 'val2'),
-    set_test SET('val1', 'val2')
-  ) DEFAULT CHARSET=utf8
-]
-
-# connect to localhost by default, pass options as needed
-@client = Mysql2::Client.new :host => "localhost", :username => "root", :database => "test"
-
-@client.query create_table_sql
-
-def insert_record(args)
-  insert_sql = "
-    INSERT INTO mysql2_test (
-      null_test, bit_test, tiny_int_test, small_int_test, medium_int_test, int_test, big_int_test,
-      float_test, float_zero_test, double_test, decimal_test, decimal_zero_test, date_test, date_time_test, timestamp_test, time_test,
-      year_test, char_test, varchar_test, binary_test, varbinary_test, tiny_blob_test,
-      tiny_text_test, blob_test, text_test, medium_blob_test, medium_text_test,
-      long_blob_test, long_text_test, enum_test, set_test
-    )
-
-    VALUES (
-      NULL, #{args[:bit_test]}, #{args[:tiny_int_test]}, #{args[:small_int_test]}, #{args[:medium_int_test]}, #{args[:int_test]}, #{args[:big_int_test]},
-      #{args[:float_test]}, #{args[:float_zero_test]}, #{args[:double_test]}, #{args[:decimal_test]}, #{args[:decimal_zero_test]}, '#{args[:date_test]}', '#{args[:date_time_test]}', '#{args[:timestamp_test]}', '#{args[:time_test]}',
-      #{args[:year_test]}, '#{args[:char_test]}', '#{args[:varchar_test]}', '#{args[:binary_test]}', '#{args[:varbinary_test]}', '#{args[:tiny_blob_test]}',
-      '#{args[:tiny_text_test]}', '#{args[:blob_test]}', '#{args[:text_test]}', '#{args[:medium_blob_test]}', '#{args[:medium_text_test]}',
-      '#{args[:long_blob_test]}', '#{args[:long_text_test]}', '#{args[:enum_test]}', '#{args[:set_test]}'
-    )
-  "
-  @client.query insert_sql
-end
-
-puts "Creating #{num} records"
-num.times do |n|
-  five_words = Faker::Lorem.words(rand(5))
-  twenty5_paragraphs = Faker::Lorem.paragraphs(rand(25))
-  insert_record(
-    :bit_test => 1,
-    :tiny_int_test => rand(128),
-    :small_int_test => rand(32767),
-    :medium_int_test => rand(8388607),
-    :int_test => rand(2147483647),
-    :big_int_test => rand(9223372036854775807),
-    :float_test => rand(32767)/1.87,
-    :float_zero_test => 0.0,
-    :double_test => rand(8388607)/1.87,
-    :decimal_test => rand(8388607)/1.87,
-    :decimal_zero_test => 0,
-    :date_test => '2010-4-4',
-    :date_time_test => '2010-4-4 11:44:00',
-    :timestamp_test => '2010-4-4 11:44:00',
-    :time_test => '11:44:00',
-    :year_test => Time.now.year,
-    :char_test => five_words,
-    :varchar_test => five_words,
-    :binary_test => five_words,
-    :varbinary_test => five_words,
-    :tiny_blob_test => five_words,
-    :tiny_text_test => Faker::Lorem.paragraph(rand(5)),
-    :blob_test => twenty5_paragraphs,
-    :text_test => twenty5_paragraphs,
-    :medium_blob_test => twenty5_paragraphs,
-    :medium_text_test => twenty5_paragraphs,
-    :long_blob_test => twenty5_paragraphs,
-    :long_text_test => twenty5_paragraphs,
-    :enum_test => ['val1', 'val2'].rand,
-    :set_test => ['val1', 'val2', 'val1,val2'].rand
-  )
-  if n % 100 == 0
-    $stdout.putc '.'
-    $stdout.flush
-  end
-end
-puts
-puts "Done"

data/benchmark/threaded.rb

@@ -1,44 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'active_record'
-
-mysql2_opts = {
-  :adapter => 'mysql2',
-  :database => 'test',
-  :pool => 25
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  25.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
-end
-puts x
-
-mysql2_opts = {
-  :adapter => 'mysql',
-  :database => 'test',
-  :pool => 25
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  25.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
-end
-puts x
-
-# these results are similar on 1.8.7, 1.9.2 and rbx-head
-#
-# $ bundle exec ruby benchmarks/threaded.rb
-# 1.0774750709533691
-#
-# and using the mysql gem
-# 25.099437952041626

data/lib/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-
-# AR adapter for using a fibered mysql2 connection with EM
-# This adapter should be used within Thin or Unicorn with the rack-fiber_pool middleware.
-# Just update your database.yml's adapter to be 'em_mysql2'
-
-module ActiveRecord
-  class Base
-    def self.em_mysql2_connection(config)
-      client = ::Mysql2::Fibered::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
-    end
-  end
-end
-
-require 'fiber'
-require 'eventmachine'
-require 'mysql2'
-require 'active_record/connection_adapters/mysql2_adapter'
-require 'active_record/fiber_patches'
-
-module Mysql2
-  module Fibered
-    class Client < ::Mysql2::Client
-      module Watcher
-        def initialize(client, deferable)
-          @client = client
-          @deferable = deferable
-        end
-
-        def notify_readable
-          begin
-            detach
-            results = @client.async_result
-            @deferable.succeed(results)
-          rescue Exception => e
-            @deferable.fail(e)
-          end
-        end
-      end
-
-      def query(sql, opts={})
-        if ::EM.reactor_running?
-          super(sql, opts.merge(:async => true))
-          deferrable = ::EM::DefaultDeferrable.new
-          ::EM.watch(self.socket, Watcher, self, deferrable).notify_readable = true
-          fiber = Fiber.current
-          deferrable.callback do |result|
-            fiber.resume(result)
-          end
-          deferrable.errback do |err|
-            fiber.resume(err)
-          end
-          Fiber.yield.tap do |result|
-            raise result if result.is_a?(Exception)
-          end
-        else
-          super(sql, opts)
-        end
-      end
-    end
-  end
-end

data/lib/active_record/fiber_patches.rb

@@ -1,104 +0,0 @@
-# Necessary monkeypatching to make AR fiber-friendly.
-
-module ActiveRecord
-  module ConnectionAdapters
-
-    def self.fiber_pools
-      @fiber_pools ||= []
-    end
-    def self.register_fiber_pool(fp)
-      fiber_pools << fp
-    end
-
-    class FiberedMonitor
-      class Queue
-        def initialize
-          @queue = []
-        end
-
-        def wait(timeout)
-          t = timeout || 5
-          fiber = Fiber.current
-          x = EM::Timer.new(t) do
-            @queue.delete(fiber)
-            fiber.resume(false)
-          end
-          @queue << fiber
-          Fiber.yield.tap do
-            x.cancel
-          end
-        end
-
-        def signal
-          fiber = @queue.pop
-          fiber.resume(true) if fiber
-        end
-      end
-
-      def synchronize
-        yield
-      end
-
-      def new_cond
-        Queue.new
-      end
-    end
-
-    # ActiveRecord's connection pool is based on threads.  Since we are working
-    # with EM and a single thread, multiple fiber design, we need to provide
-    # our own connection pool that keys off of Fiber.current so that different
-    # fibers running in the same thread don't try to use the same connection.
-    class ConnectionPool
-      def initialize(spec)
-        @spec = spec
-
-        # The cache of reserved connections mapped to threads
-        @reserved_connections = {}
-
-        # The mutex used to synchronize pool access
-        @connection_mutex = FiberedMonitor.new
-        @queue = @connection_mutex.new_cond
-
-        # default 5 second timeout unless on ruby 1.9
-        @timeout = spec.config[:wait_timeout] || 5
-
-        # default max pool size to 5
-        @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
-
-        @connections = []
-        @checked_out = []
-      end
-
-      def clear_stale_cached_connections!
-        cache = @reserved_connections
-        keys = Set.new(cache.keys)
-
-        ActiveRecord::ConnectionAdapters.fiber_pools.each do |pool|
-          pool.busy_fibers.each_pair do |object_id, fiber|
-            keys.delete(object_id)
-          end
-        end
-
-        keys.each do |key|
-          next unless cache.has_key?(key)
-          checkin cache[key]
-          cache.delete(key)
-        end
-      end
-
-      private
-
-      def current_connection_id #:nodoc:
-        Fiber.current.object_id
-      end
-
-      def checkout_and_verify(c)
-        @checked_out << c
-        c.run_callbacks :checkout
-        c.verify!
-        c
-      end
-    end
-
-  end
-end