em-mysqlplus 0.1.3 → 0.1.4

data/README.md

@@ -2,7 +2,7 @@
 
 EventMachine wrapper for the C-based MySQL / MySQLPlus Ruby gems, which provides
 callbacks, errbacks and all other niceties of EventMachine while keeping the API
-of the original C-based MySQL gem. 
+of the original C-based MySQL gem.
 
 Features:
 
@@ -25,19 +25,20 @@ Features:
 
 ## Query queueing:
 
-  	EventMachine.run {
-	  conn = EventMachine::MySQL.new(:host => 'localhost')
+    EventMachine.run {
+    conn = EventMachine::MySQL.new(:host => 'localhost')
 
-	  results = []
-	  conn.query("select 1") {|res| results.push res.fetch_row.first.to_i}
-	  conn.query("select 2") {|res| results.push res.fetch_row.first.to_i}
-	  conn.query("select 3") {|res| results.push res.fetch_row.first.to_i}
+    results = []
+    conn.query("select 1") {|res| results.push res.fetch_row.first.to_i}
+    conn.query("select 2") {|res| results.push res.fetch_row.first.to_i}
+    conn.query("select 3") {|res| results.push res.fetch_row.first.to_i}
 
-	  EventMachine.add_timer(0.05) {
-	    p results # => [1,2,3]
-	  }
-	}
+    EventMachine.add_timer(0.05) {
+      p results # => [1,2,3]
+    }
+  }
 
 # Credits
 
-Original Async MySQL driver for Ruby/EventMachine - (c) 2008 Aman Gupta (tmm1)
+ * Original Async MySQL driver for Ruby/EventMachine - (c) 2008 Aman Gupta (tmm1)
+ * ActiveRecord fiber patches - Mike Perham (mperham)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/em-mysqlplus.gemspec

@@ -0,0 +1,59 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{em-mysqlplus}
+  s.version = "0.1.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ilya Grigorik", "Aman Gupta"]
+  s.date = %q{2010-07-06}
+  s.description = %q{Async MySQL driver for Ruby/Eventmachine}
+  s.email = %q{ilya@igvita.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "README.md",
+     "Rakefile",
+     "VERSION",
+     "em-mysqlplus.gemspec",
+     "lib/active_record/connection_adapters/em_mysqlplus_adapter.rb",
+     "lib/active_record/patches.rb",
+     "lib/em-activerecord.rb",
+     "lib/em-mysqlplus.rb",
+     "lib/em-mysqlplus/connection.rb",
+     "lib/em-mysqlplus/mysql.rb",
+     "spec/activerecord_spec.rb",
+     "spec/database.yml",
+     "spec/helper.rb",
+     "spec/mysql_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/igrigorik/em-mysql}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{em-mysqlplus}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Async MySQL driver for Ruby/Eventmachine}
+  s.test_files = [
+    "spec/activerecord_spec.rb",
+     "spec/helper.rb",
+     "spec/mysql_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.9"])
+    else
+      s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
+    end
+  else
+    s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
+  end
+end
+

data/lib/active_record/connection_adapters/em_mysqlplus_adapter.rb

@@ -0,0 +1,50 @@
+require 'em-synchrony'
+require 'em-synchrony/em-mysqlplus'
+
+require 'active_record/connection_adapters/mysql_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+
+    class EmMysqlAdapter < MysqlAdapter
+      def initialize(connection, logger, host_parameters, connection_parameters, config)
+        @hostname = host_parameters[0]
+        @port = host_parameters[1]
+        @connect_parameters, @config = connection_parameters, config
+        super(connection, logger, nil, config)
+      end
+
+      def connect
+        @connection = EventMachine::MySQL.new({
+                                                :host => @hostname,
+                                                :port => @port,
+                                                :database => @config[:database],
+                                                :password => @config[:password],
+                                                :socket   => @config[:socket]
+        })
+
+        configure_connection
+        @connection
+      end
+
+    end
+  end
+
+  class Base
+    def self.em_mysqlplus_connection(config) # :nodoc:
+      config = config.symbolize_keys
+      host     = config[:host]
+      port     = config[:port]
+      username = config[:username].to_s if config[:username]
+      password = config[:password].to_s if config[:password]
+
+      if config.has_key?(:database)
+        database = config[:database]
+      else
+        raise ArgumentError, "No database specified. Missing argument: database."
+      end
+
+      ConnectionAdapters::EmMysqlAdapter.new(nil, logger, [host, port], [database, username, password], config)
+    end
+  end
+end

data/lib/active_record/patches.rb

@@ -0,0 +1,102 @@
+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
+          returning Fiber.yield 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
+
+      private
+
+      def current_connection_id #:nodoc:
+        Fiber.current.object_id
+      end
+
+      # Remove stale fibers from the cache.
+      def remove_stale_cached_threads!(cache, &block)
+        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)
+          block.call(key, cache[key])
+          cache.delete(key)
+        end
+      end
+
+      def checkout_and_verify(c)
+        @checked_out << c
+        c.run_callbacks :checkout
+        c.verify!
+        c
+      end
+    end
+
+  end
+end

data/lib/em-activerecord.rb

@@ -0,0 +1,4 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'active_record/connection_adapters/em_mysqlplus_adapter'
+require 'active_record/patches'

data/spec/activerecord_spec.rb

@@ -0,0 +1,51 @@
+require 'helper'
+require 'logger'
+require 'yaml'
+require 'erb'
+
+require 'active_record'
+require 'lib/em-activerecord'
+
+RAILS_ENV='test'
+
+ActiveRecord::Base.configurations = YAML::load(ERB.new(File.read(File.join(File.dirname(__FILE__), 'database.yml'))).result)
+ActiveRecord::Base.default_timezone = :utc
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+ActiveRecord::Base.logger.level = Logger::INFO
+ActiveRecord::Base.pluralize_table_names = true
+ActiveRecord::Base.time_zone_aware_attributes = true
+Time.zone = 'UTC'
+
+class Widget < ActiveRecord::Base; end;
+
+describe "ActiveRecord Driver for EM-MySQLPlus" do
+  it "should establish AR connection" do
+    EventMachine.run {
+      Fiber.new {
+        ActiveRecord::Base.establish_connection
+        result = Widget.find_by_sql("select sleep(1)")
+        result.size.should == 1
+
+        EventMachine.stop
+      }.resume
+    }
+  end
+
+  it "should use fiber aware ConnectionPool" do
+    EventMachine.run {
+      results = []
+
+      3.times do |n|
+        Fiber.new {
+          ActiveRecord::Base.establish_connection
+          results.push Widget.find_by_sql("select sleep(1)")
+        }.resume
+      end
+
+      EM.add_timer(1.5) {
+        results.size.should == 3
+        EventMachine.stop
+      }
+    }
+  end
+end

data/spec/database.yml

@@ -0,0 +1,5 @@
+test:
+  adapter: em_mysqlplus
+  database: widgets
+  user: root
+  pool: 3

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 -04:00
+date: 2010-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,9 +44,15 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- em-mysqlplus.gemspec
+- lib/active_record/connection_adapters/em_mysqlplus_adapter.rb
+- lib/active_record/patches.rb
+- lib/em-activerecord.rb
 - lib/em-mysqlplus.rb
 - lib/em-mysqlplus/connection.rb
 - lib/em-mysqlplus/mysql.rb
+- spec/activerecord_spec.rb
+- spec/database.yml
 - spec/helper.rb
 - spec/mysql_spec.rb
 has_rdoc: true
@@ -80,5 +86,6 @@ signing_key:
 specification_version: 3
 summary: Async MySQL driver for Ruby/Eventmachine
 test_files: 
+- spec/activerecord_spec.rb
 - spec/helper.rb
 - spec/mysql_spec.rb