em-mysql 0.4.0 → 0.4.1

data/em-mysql.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'em-mysql'
-  s.version = '0.4.0'
+  s.version = '0.4.1'
   s.date = '2009-06-23'
   s.summary = 'Async MySQL client API for Ruby/EventMachine'
   s.email = "em-mysql@tmm1.net"

data/lib/em/mysql.rb

@@ -15,7 +15,6 @@ class EventedMysql < EM::Connection
     @fd = mysql.socket
     @opts = opts
     @current = nil
-    @@queue ||= []
     @processing = false
     @connected = true
 
@@ -33,6 +32,10 @@ class EventedMysql < EM::Connection
     'Lost connection to MySQL server during query'
   ] unless defined? DisconnectErrors
 
+  def queue
+    opts[:em_mysql].queue
+  end
+
   def notify_readable
     log 'readable'
     if item = @current
@@ -73,11 +76,11 @@ class EventedMysql < EM::Connection
   rescue Mysql::Error => e
     log 'mysql error', e.message
     if e.message =~ /Deadlock/
-      @@queue << [response, sql, cblk, eblk]
+      queue << [response, sql, cblk, eblk]
       @processing = false
       next_query
     elsif DisconnectErrors.include? e.message
-      @@queue << [response, sql, cblk, eblk]
+      queue << [response, sql, cblk, eblk]
       return close
     elsif cb = (eblk || @opts[:on_error])
       cb.call(e)
@@ -140,13 +143,13 @@ class EventedMysql < EM::Connection
         log 'mysql sending', sql
         @mysql.send_query(sql)
       else
-        @@queue << [response, sql, cblk, eblk]
+        queue << [response, sql, cblk, eblk]
         return
       end
     rescue Mysql::Error => e
       log 'mysql error', e.message
       if DisconnectErrors.include? e.message
-        @@queue << [response, sql, cblk, eblk]
+        queue << [response, sql, cblk, eblk]
         return close
       else
         raise e
@@ -166,7 +169,7 @@ class EventedMysql < EM::Connection
   private
 
   def next_query
-    if @connected and !@processing and pending = @@queue.shift
+    if @connected and !@processing and pending = queue.shift
       response, sql, cblk, eblk = pending
       execute(sql, response, cblk, eblk)
     end
@@ -176,6 +179,7 @@ class EventedMysql < EM::Connection
     return unless @opts[:logging]
     p [Time.now, @fd, (@signature[-4..-1] if @signature), *args]
   end
+  
 
   public
 
@@ -248,30 +252,40 @@ class EventedMysql < EM::Connection
   end
 end
 
-class EventedMysql
-  def self.settings
-    @settings ||= { :connections => 4, :logging => false }
+class EmMysql  
+  def initialize(settings = {})
+    @queue = []
+    @settings = { :connections => 4, :logging => false, :em_mysql => self }.merge settings
+  end
+  
+  def queue
+    @queue
+  end
+  
+  def settings
+    @settings 
   end
 
-  def self.execute query, type = nil, cblk = nil, eblk = nil, &blk
+  def execute query, type = nil, cblk = nil, eblk = nil, &blk
     unless nil#connection = connection_pool.find{|c| not c.processing and c.connected }
       @n ||= 0
+
       connection = connection_pool[@n]
       @n = 0 if (@n+=1) >= connection_pool.size
     end
-
+    
     connection.execute(query, type, cblk, eblk, &blk)
   end
 
   %w[ select insert update raw ].each do |type| class_eval %[
 
-    def self.#{type} query, cblk = nil, eblk = nil, &blk
+    def #{type} query, cblk = nil, eblk = nil, &blk
       execute query, :#{type}, cblk, eblk, &blk
     end
 
   ] end
 
-  def self.all query, type = nil, &blk
+  def all query, type = nil, &blk
     responses = 0
     connection_pool.each do |c|
       c.execute(query, type) do
@@ -281,7 +295,7 @@ class EventedMysql
     end
   end
 
-  def self.connection_pool
+  def connection_pool
     @connection_pool ||= (1..settings[:connections]).map{ EventedMysql.connect(settings) }
     # p ['connpool', settings[:connections], @connection_pool.size]
     # (1..(settings[:connections]-@connection_pool.size)).each do
@@ -291,6 +305,23 @@ class EventedMysql
   end
 end
 
+class EventedMysql
+  @@proxy_object = EmMysql.new
+    
+  def self.databases
+     @@databases ||= {}
+  end
+  
+  [:settings, :connection_pool].each do |name|
+    class_eval "def self.#{name}(*args) @@proxy_object.send(:#{name}, *args); end"
+  end
+  
+  [:execute, :connection_pool, :select, :insert, :update, :raw].each do |name|
+    class_eval "def self.#{name}(*args, &block) @@proxy_object.send(:#{name}, *args, &block); end"
+  end
+  
+end
+
 if __FILE__ == $0 and require 'em/spec'
 
   EM.describe EventedMysql, 'individual connections' do

data/lib/sequel/async.rb

@@ -50,38 +50,43 @@ raise 'need Sequel >= 3.2.0' unless Sequel::MAJOR == 3 and Sequel::MINOR >= 2
 
 module Sequel
   class Dataset
+    STOCK_COUNT_OPTS = {:select => ["COUNT(*)".lit], :order => nil} unless defined? STOCK_COUNT_OPTS
+    def em_mysq
+      EventedMysql.databases[db] || EventedMysql
+    end
+    
     def async_insert *args, &cb
-      EventedMysql.insert insert_sql(*args), &cb
+      em_mysq.insert insert_sql(*args), &cb
       nil
     end
 
     def async_insert_ignore *args, &cb
-      EventedMysql.insert insert_ignore.insert_sql(*args), &cb
+      em_mysq.insert insert_ignore.insert_sql(*args), &cb
       nil
     end
 
     def async_update *args, &cb
-      EventedMysql.update update_sql(*args), &cb
+      em_mysq.update update_sql(*args), &cb
       nil
     end
 
     def async_delete &cb
-      EventedMysql.execute delete_sql, &cb
+      em_mysq.execute delete_sql, &cb
       nil
     end
 
     def async_multi_insert *args, &cb
-      EventedMysql.execute multi_insert_sql(*args).first, &cb
+      em_mysq.execute multi_insert_sql(*args).first, &cb
       nil
     end
 
     def async_multi_insert_ignore *args, &cb
-      EventedMysql.execute insert_ignore.multi_insert_sql(*args).first, &cb
+      em_mysq.execute insert_ignore.multi_insert_sql(*args).first, &cb
       nil
     end
 
     def async_fetch_rows sql, iter = :each
-      EventedMysql.raw(sql) do |m|
+      em_mysq.raw(sql) do |m|
         r = m.result
 
         i = -1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-mysql
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Aman Gupta