mysql2 0.2.18-x86-mswin32-60 → 0.3.9-x86-mswin32-60

data/lib/active_record/fiber_patches.rb

@@ -1,132 +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 = []
-        @automatic_reconnect = true
-        @tables = {}
-
-        @columns     = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-
-            # Fetch a list of columns
-            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
-
-              # set primary key information
-              columns.each do |column|
-                column.primary = column.name == primary_keys[table_name]
-              end
-            end
-          end
-        end
-
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
-        end
-
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-            table_exists?(table_name) ? conn.primary_key(table_name) : 'id'
-          end
-        end
-      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

data/lib/arel/engines/sql/compilers/mysql2_compiler.rb

@@ -1,11 +0,0 @@
-module Arel
-  module SqlCompiler
-    class Mysql2Compiler < GenericCompiler
-      def limited_update_conditions(conditions, taken)
-        conditions << " LIMIT #{taken}"
-        conditions
-      end
-    end
-  end
-end
-

data/lib/mysql2/em_fiber.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-require 'mysql2/em'
-require 'fiber'
-
-module Mysql2
-  module EM
-    module Fiber
-      class Client < ::Mysql2::EM::Client
-        def query(sql, opts={})
-          if ::EM.reactor_running?
-            deferable = super(sql, opts)
-
-            fiber = ::Fiber.current
-            deferable.callback do |result|
-              fiber.resume(result)
-            end
-            deferable.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
-end

data/spec/em/em_fiber_spec.rb

@@ -1,22 +0,0 @@
-# encoding: UTF-8
-if defined? EventMachine && defined? Fiber
-  require 'spec_helper'
-  require 'mysql2/em_fiber'
-
-  describe Mysql2::EM::Fiber::Client do
-    it 'should support queries' do
-      results = []
-      EM.run do
-        Fiber.new {
-          client1 = Mysql2::EM::Fiber::Client.new
-          results = client1.query "SELECT sleep(0.1) as first_query"
-          EM.stop_event_loop
-        }.resume
-      end
-
-      results.first.keys.should include("first_query")
-    end
-  end
-else
-  puts "Either EventMachine or Fibers not available. Skipping tests that use them."
-end