tmm1-em-mysql 0.2.0 → 0.3.0

data/em-mysql.gemspec

@@ -0,0 +1,21 @@
+spec = Gem::Specification.new do |s|
+  s.name = 'em-mysql'
+  s.version = '0.3.0'
+  s.date = '2009-06-23'
+  s.summary = 'Async MySQL client API for Ruby/EventMachine'
+  s.email = "em-mysql@tmm1.net"
+  s.homepage = "http://github.com/tmm1/em-mysql"
+  s.description = 'Async MySQL client API for Ruby/EventMachine'
+  s.has_rdoc = false
+  s.authors = ["Aman Gupta"]
+  s.add_dependency('eventmachine', '>= 0.12.8')
+
+  # git ls-files
+  s.files = %w[
+    README
+    em-mysql.gemspec
+    lib/em/mysql.rb
+    lib/sequel/async.rb
+    test.rb
+  ]
+end

data/lib/em/mysql.rb

@@ -1,27 +1,31 @@
 require 'rubygems'
 require 'eventmachine'
 require 'mysqlplus'
+require 'fcntl'
+
+class Mysql
+  def result
+    @cur_result
+  end
+end
 
 class EventedMysql < EM::Connection
   def initialize mysql, opts
     @mysql = mysql
     @fd = mysql.socket
     @opts = opts
-    @queue = []
-    @pending = []
+    @current = nil
+    @@queue ||= []
     @processing = false
     @connected = true
 
     log 'mysql connected'
+    make_socket_blocking
+    EM.add_timer(0){ next_query }
   end
   attr_reader :processing, :connected, :opts
   alias :settings :opts
 
-  def connection_completed
-    @connected = true
-    next_query
-  end
-
   DisconnectErrors = [
     'query: not connected',
     'MySQL server has gone away',
@@ -30,11 +34,14 @@ class EventedMysql < EM::Connection
 
   def notify_readable
     log 'readable'
-    if item = @queue.shift
+    if item = @current
+      @current = nil
       start, response, sql, cblk, eblk = item
       log 'mysql response', Time.now-start, sql
       arg = case response
             when :raw
+              result = @mysql.get_result
+              @mysql.instance_variable_set('@cur_result', result)
               @mysql
             when :select
               ret = []
@@ -64,8 +71,12 @@ class EventedMysql < EM::Connection
     end
   rescue Mysql::Error => e
     log 'mysql error', e.message
-    if DisconnectErrors.include? e.message
-      @pending << [response, sql, cblk, eblk]
+    if e.message =~ /Deadlock/
+      @@queue << [response, sql, cblk, eblk]
+      @processing = false
+      next_query
+    elsif DisconnectErrors.include? e.message
+      @@queue << [response, sql, cblk, eblk]
       return close
     elsif cb = (eblk || @opts[:on_error])
       cb.call(e)
@@ -101,6 +112,9 @@ class EventedMysql < EM::Connection
       @signature = EM.attach_fd @mysql.socket, true, false
       log 'mysql connected'
       EM.instance_variable_get('@conns')[@signature] = self
+      @connected = true
+      make_socket_blocking
+      next_query
     end
   end
 
@@ -115,7 +129,7 @@ class EventedMysql < EM::Connection
         #   # log 'mysql errno', @mysql.errno
         # rescue
         #   log 'mysql ping failed'
-        #   @pending << [response, sql, blk]
+        #   @@queue << [response, sql, blk]
         #   return close
         # end
 
@@ -124,13 +138,13 @@ class EventedMysql < EM::Connection
         log 'mysql sending', sql
         @mysql.send_query(sql)
       else
-        @pending << [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
-        @pending << [response, sql, cblk, eblk]
+        @@queue << [response, sql, cblk, eblk]
         return close
       else
         raise e
@@ -138,7 +152,7 @@ class EventedMysql < EM::Connection
     end
 
     log 'queuing', response, sql
-    @queue << [Time.now, response, sql, cblk, eblk]
+    @current = [Time.now, response, sql, cblk, eblk]
   end
   
   def close
@@ -148,13 +162,23 @@ class EventedMysql < EM::Connection
     # EM.add_timer(0){ close_connection }
     # close_connection
     fd = detach
+    @io.close if @io
+    @io = nil
     log 'detached fd', fd
   end
 
   private
   
+  def make_socket_blocking
+    if defined?(Fcntl::F_GETFL)
+      @io = IO.for_fd(@mysql.socket)
+      m = @io.fcntl(Fcntl::F_GETFL, 0)
+      @io.fcntl(Fcntl::F_SETFL, ~Fcntl::O_NONBLOCK & m)
+    end
+  end
+
   def next_query
-    if @connected and !@processing and pending = @pending.shift
+    if @connected and !@processing and pending = @@queue.shift
       response, sql, cblk, eblk = pending
       execute(sql, response, cblk, eblk)
     end
@@ -205,9 +229,7 @@ class EventedMysql < EM::Connection
       # XXX multi results require multiple callbacks to parse
       # Mysql::CLIENT_MULTI_RESULTS +
       # Mysql::CLIENT_MULTI_STATEMENTS +
-
-      # XXX this should check for opts[:compression]
-      Mysql::CLIENT_COMPRESS
+      (opts[:compress] == false ? 0 : Mysql::CLIENT_COMPRESS)
     )
     
     # increase timeout so mysql server doesn't disconnect us
@@ -227,16 +249,6 @@ class EventedMysql < EM::Connection
     # get results for queries
     conn.query_with_result = true
 
-    # if encoding = opts[:encoding] || opts[:charset]
-    #   conn.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
-    #   conn.query("set names '#{encoding}'")
-    #   conn.query("set character_set_connection = '#{encoding}'")
-    #   conn.query("set character_set_client = '#{encoding}'")
-    #   conn.query("set character_set_database = '#{encoding}'")
-    #   conn.query("set character_set_server = '#{encoding}'")
-    #   conn.query("set character_set_results = '#{encoding}'")
-    # end
-
     conn
   rescue Mysql::Error => e
     if cb = opts[:on_error]
@@ -362,7 +374,7 @@ if __FILE__ == $0 and require 'em/spec'
     should 'have raw mode which yields the mysql object' do
       @mysql.execute('select 1+2 as num', :raw){ |mysql|
         mysql.should.is_a? Mysql
-        mysql.get_result.all_hashes.should == [{'num' => '3'}]
+        mysql.result.all_hashes.should == [{'num' => '3'}]
         done
       }
     end
@@ -446,6 +458,20 @@ if __FILE__ == $0 and require 'em/spec'
       }
     end
 
+    should 'allow access to insert_id in raw mode' do
+      SQL.raw('insert into evented_mysql_test (num) values (20), (21), (22)'){ |mysql|
+        mysql.insert_id.should == 4
+        done
+      }
+    end
+
+    should 'allow access to affected_rows in raw mode' do
+      SQL.raw('update evented_mysql_test set num = num + 10'){ |mysql|
+        mysql.affected_rows.should == 6
+        done
+      }
+    end
+
     should 'fire error callback with exceptions' do
       SQL.settings.update :on_error => proc{ |e|
         e.class.should == Mysql::Error

data/lib/sequel/async.rb

@@ -1,14 +1,14 @@
 # async sequel extensions, for use with em-mysql
 #
 #   require 'em/mysql'
-#   DB = Sequel.connect(...)
-#   ADB = EventedMysql.connect(..., :on_error => proc{|e| log 'error', e })
+#   DB = Sequel.connect(:adapter => 'mysql', :user => 'root', :database => 'test', ...)
+#   EventedMysql.settings.update(..., :on_error => proc{|e| log 'error', e })
 #
 #   def log *args
 #     p [Time.now, *args]
 #   end
 #
-#   DB[:table].where(:id < 100).async_update do |num_updated|
+#   DB[:table].where(:id < 100).async_update(:field => 'new value') do |num_updated|
 #     log "done updating #{num_updated} rows"
 #   end
 #
@@ -48,49 +48,52 @@
 module Sequel
   class Dataset
     def async_insert *args, &cb
-      ADB.insert insert_sql(*args), &cb
+      EventedMysql.insert insert_sql(*args), &cb
+      nil
+    end
+
+    def async_insert_ignore *args, &cb
+      EventedMysql.insert insert_sql(*args).sub(/insert/i, 'INSERT IGNORE'), &cb
       nil
     end
 
     def async_update *args, &cb
-      ADB.update update_sql(*args), &cb
+      EventedMysql.update update_sql(*args), &cb
       nil
     end
 
     def async_delete &cb
-      ADB.execute delete_sql, &cb
+      EventedMysql.execute delete_sql, &cb
       nil
     end
 
     def async_multi_insert *args, &cb
-      ADB.execute multi_insert_sql(*args).first, &cb
+      EventedMysql.execute multi_insert_sql(*args).first, &cb
       nil
     end
 
     def async_multi_insert_ignore *args, &cb
-      ADB.execute multi_insert_sql(*args).first.sub(/insert/i, "INSERT IGNORE"), &cb
+      EventedMysql.execute multi_insert_sql(*args).first.sub(/insert/i, "INSERT IGNORE"), &cb
       nil
     end
 
-    def async_each *args
-      ADB.select(select_sql(*args)) do |rows|
+    def async_each
+      EventedMysql.select(select_sql) do |rows|
         rows.each{|r|
-          r = transform_load(r) if @transform
-          r = row_proc[r] if row_proc
-          yield r
+          if row_proc = @row_proc
+            yield row_proc.call(r)
+          else
+            yield r
+          end
         }
       end
       nil
     end
 
     def async_all
-      ADB.select(sql) do |rows|
-        if row_proc or transform
-          yield(rows.map{|r|
-            r = transform_load(r) if @transform
-            r = row_proc[r] if row_proc
-            r
-          })
+      EventedMysql.select(sql) do |rows|
+        if row_proc = @row_proc
+          yield(rows.map{|r| row_proc.call(r) })
         else
           yield(rows)
         end
@@ -102,7 +105,7 @@ module Sequel
       if options_overlap(COUNT_FROM_SELF_OPTS)
         from_self.async_count(&cb)
       else
-        naked.async_each(STOCK_COUNT_OPTS){|r|
+        clone(STOCK_COUNT_OPTS).async_each{|r|
           yield r.values.first.to_i
         }
       end
@@ -124,6 +127,7 @@ module Sequel
 
     class << self
       [ :async_insert,
+        :async_insert_ignore,
         :async_multi_insert,
         :async_multi_insert_ignore,
         :async_each,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmm1-em-mysql
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-18 00:00:00 -08:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.4
+        version: 0.12.8
     version: 
 description: Async MySQL client API for Ruby/EventMachine
 email: em-mysql@tmm1.net
@@ -32,6 +32,7 @@ extra_rdoc_files: []
 
 files: 
 - README
+- em-mysql.gemspec
 - lib/em/mysql.rb
 - lib/sequel/async.rb
 - test.rb