fibered_mysql2 0.1.0.pre.4 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a7c1f9db37bca0d6b9861985ad594863e1cde7847952dc83a2ed94bed72d2e
-  data.tar.gz: 1ac220f2391d1b7c74df9985ddfaca59855570ee01e36f8351841f8651306a98
+  metadata.gz: 225cf0ef6cb3df66126005bfc6a4371440ab608b29ea963844eb06e73cd7d246
+  data.tar.gz: b23527416fae27ac715336a587b91e34915b12458ff7847a5ddfd1e67dd583fa
 SHA512:
-  metadata.gz: 4df2ada93ac02bf3b34b6a223c83c26690a620a88eec6c38ffc4f1a1c8a052867fc126b4f745ad3e1aa9278e86a7808c08dc7b493dbd99cb93812895b1901584
-  data.tar.gz: 78fafb964db2b16da1604032ea1421b2761f81ef60c52851be4df30f96e78a9f688b9a656fec1d4a0ad4b1564aca20f57bb9722a69aba64be4891835d11cfd6e
+  metadata.gz: 5dd796506d874c6cce296873e6f378d72d116a0491ef6d408cbd58366702573c11a525228ba7fe7801cae9808ea6a04dca1323f9eed1425222f9dcfb9ff0832d
+  data.tar.gz: 75edd0d65c74021b038c8668bce101e5b3baeecea48da3e237ff99e26d3a74dca7bb73337b909c22c43159669ed268252614c156a57b1ed77077f3fd8817f222

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
+--format progress
 --color
 --require spec_helper

data/Appraisals

@@ -9,5 +9,5 @@ appraise 'rails-5' do
 end
 
 appraise 'rails-6' do
-  gem 'rails', '~> 6.0'
+  gem 'rails', '~> 6.0.0'
 end

data/CHANGELOG.md

@@ -4,11 +4,30 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - Unreleased
+## [0.1.3] - 2021-06-17
+### Fixed
+- When checking that @owner is a Fiber, allow nil.
+
+## [0.1.2] - 2021-06-16
+### Fixed
+- Added checking to be certain that @owner is never overwritten with a non-Fiber by another mixin.
+
+## [0.1.1] - 2021-02-12
+### Fixed
+- Fixed bug with Rails 5+ adapter where connections that have `steal!` called on them were not having their owner updated to the current Fiber, which would then cause an exception when trying to expire the connection (this showed up with the Rails 5 `ConnectionPool::Reaper` that reaps unused connections)
+
+### Changed
+- Updated Rails 6 dependency to 6.0.x for now as 6.1+ requires a newer version of the mysql gem (0.5+) that we do not yet support
+
+
+## [0.1.0] - 2020-10-23
 ### Added
-- An adapter for Rails 4, 5, and 6.
-- Appraisals for Rails 4, 5, and 6.
-- TravisCI unit test pipeline.
-- Coverage reports via Coveralls.
+- Added an adapter for Rails 4, 5, and 6.
+- Added appraisals for Rails 4, 5, and 6.
+- Added TravisCI unit test pipeline.
+- Added coverage reports via Coveralls.
 
-[0.1.0]: https://github.com/Invoca/fibered_mysql2/tree/v0.1.0
+[0.1.3]: https://github.com/Invoca/fibered_mysql2/compare/v0.1.2..v0.1.3
+[0.1.2]: https://github.com/Invoca/fibered_mysql2/compare/v0.1.1..v0.1.2
+[0.1.1]: https://github.com/Invoca/fibered_mysql2/compare/v0.1.0..v0.1.1
+[0.1.0]: https://github.com/Invoca/fibered_mysql2/tree/v0.1.0

data/Gemfile

@@ -8,8 +8,10 @@ gemspec
 gem 'appraisal'
 gem 'bundler',    '~> 1.8'
 gem 'coveralls', require: false
+gem 'mimemagic',  '~> 0.3',     git: 'git@github.com:Invoca/mimemagic',                      ref: 'b084ce8d50c080f5a312156498be21a541fe72a2'
 gem 'mysql2',     '0.4.5'
 gem 'pry',        '~> 0.13'
 gem 'pry-byebug', '~> 3.9'
+gem 'rails',      '< 6.1'
 gem 'rake',       '~> 10.0'
 gem 'rspec',      '~> 3.0'

data/Gemfile.lock

@@ -1,7 +1,14 @@
+GIT
+  remote: git@github.com:Invoca/mimemagic
+  revision: b084ce8d50c080f5a312156498be21a541fe72a2
+  ref: b084ce8d50c080f5a312156498be21a541fe72a2
+  specs:
+    mimemagic (0.3.5)
+
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.1.0.pre.4)
+    fibered_mysql2 (0.1.3)
       em-synchrony (~> 1.0)
       rails (>= 4.2, < 7)
 
@@ -63,14 +70,14 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.3.0)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -82,14 +89,14 @@ GEM
     docile (1.3.2)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
-    erubi (1.9.0)
+    erubi (1.10.0)
     eventmachine (1.2.7)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
-    loofah (2.7.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -97,10 +104,9 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     mysql2 (0.4.5)
     nio4r (2.5.4)
     nokogiri (1.10.10)
@@ -173,12 +179,12 @@ GEM
     thread_safe (0.3.6)
     tins (1.25.0)
       sync
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -188,11 +194,13 @@ DEPENDENCIES
   bundler (~> 1.8)
   coveralls
   fibered_mysql2!
+  mimemagic (~> 0.3)!
   mysql2 (= 0.4.5)
   pry (~> 0.13)
   pry-byebug (~> 3.9)
+  rails (< 6.1)
   rake (~> 10.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/README.md

@@ -29,7 +29,7 @@ Behaves the same as `ActiveRecord::ConnectionAdapters::EMMysql2Adapter` but with
 ```ruby
 connection = FiberedMysql2::FiberedMysql2Adapter.new(client, logger, options, config)
 connection.lease
-connection.expire // Rails 5+ only
+connection.expire # Rails 5+ only
 ```
 
 ## Development

data/fibered_mysql2.gemspec

@@ -7,16 +7,18 @@ require "fibered_mysql2/version"
 Gem::Specification.new do |spec|
   spec.name          = "fibered_mysql2"
   spec.version       = FiberedMysql2::VERSION
-  spec.authors       = ["Octothorp"]
-  spec.email         = ["octothorp@invoca.com"]
+  spec.authors       = ["Invoca Development"]
+  spec.email         = ["development@invoca.com"]
 
   spec.summary       = "An adapter for fibered mysql2"
   spec.homepage      = "https://github.com/Invoca/fibered_mysql2"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["homepage_uri"]      = spec.homepage
+  spec.metadata = {
+    "allowed_push_host" => "https://rubygems.org",
+    "homepage_uri"      => spec.homepage
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/gemfiles/rails_6.gemfile

@@ -10,6 +10,6 @@ gem "pry", "~> 0.13"
 gem "pry-byebug", "~> 3.9"
 gem "rake", "~> 10.0"
 gem "rspec", "~> 3.0"
-gem "rails", "~> 6.0"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/active_record/connection_adapters/fibered_mysql2_adapter.rb

@@ -20,10 +20,10 @@ module FiberedMysql2
     def lease
       if in_use?
         msg = "Cannot lease connection, ".dup
-        if @owner == Fiber.current
+        if owner_fiber == Fiber.current
           msg << "it is already leased by the current fiber."
         else
-          msg << "it is already in use by a different fiber: #{@owner}. " \
+          msg << "it is already in use by a different fiber: #{owner_fiber}. " \
                   "Current fiber: #{Fiber.current}."
         end
         raise ::ActiveRecord::ActiveRecordError, msg
@@ -37,9 +37,9 @@ module FiberedMysql2
         # Because we are actively releasing connections from dead fibers, we only want
         # to enforce that we're expiring the current fibers connection, iff the owner
         # of the connection is still alive.
-        if @owner.alive? && @owner != Fiber.current
+        if owner_fiber.alive? && owner_fiber != Fiber.current
           raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection, " \
-            "it is owned by a different fiber: #{@owner}. " \
+            "it is owned by a different fiber: #{owner_fiber}. " \
             "Current fiber: #{Fiber.current}."
         end
 
@@ -49,6 +49,26 @@ module FiberedMysql2
         raise ::ActiveRecord::ActiveRecordError, "Cannot expire connection, it is not currently leased."
       end
     end
+
+    def steal!
+      if in_use?
+        if owner_fiber != Fiber.current
+          pool.send :remove_connection_from_thread_cache, self, owner_fiber
+
+          @owner = Fiber.current
+        end
+      else
+        raise ::ActiveRecord::ActiveRecordError, "Cannot steal connection, it is not currently leased."
+      end
+    end
+
+    private
+
+    def owner_fiber
+      @owner.nil? || @owner.is_a?(Fiber) or
+        raise "@owner must be a Fiber! Found #{@owner.inspect}"
+      @owner
+    end
   end
 
   class FiberedMysql2Adapter < ::ActiveRecord::ConnectionAdapters::EMMysql2Adapter

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -124,12 +124,44 @@ module FiberedMysql2
       def cached_connections
         @reserved_connections
       end
+
+      def current_connection_id
+        ActiveRecord::Base.connection_id ||= Fiber.current.object_id
+      end
+
+      def checkout
+        begin
+          reap_connections
+        rescue => ex
+          ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+        end
+        super
+      end
     end
 
     module Adapter_5_2
       def cached_connections
         @thread_cached_conns
       end
+
+      def current_connection_id
+        connection_cache_key(current_thread)
+      end
+
+      def checkout(checkout_timeout = @checkout_timeout)
+        begin
+          reap_connections
+        rescue => ex
+          ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
+        end
+        super
+      end
+
+      def release_connection(owner_thread = Fiber.current)
+        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
+          checkin(conn)
+        end
+      end
     end
 
     case Rails::VERSION::MAJOR
@@ -139,10 +171,10 @@ module FiberedMysql2
       include Adapter_5_2
     end
 
-    def initialize(connection_spec)
+    def initialize(connection_spec, *args, **keyword_args)
       connection_spec.config[:reaping_frequency] and raise "reaping_frequency is not supported (the ActiveRecord Reaper is thread-based)"
 
-      super(connection_spec)
+      super(connection_spec, *args, **keyword_args)
 
       @reaper = nil # no need to keep a reference to this since it does nothing in this sub-class
 
@@ -165,36 +197,6 @@ module FiberedMysql2
       end
     end
 
-    if Rails::VERSION::MAJOR > 4
-      def release_connection(owner_thread = Fiber.current)
-        if (conn = @thread_cached_conns.delete(connection_cache_key(owner_thread)))
-          checkin(conn)
-        end
-      end
-    end
-
-    def current_connection_id
-      case Rails::VERSION::MAJOR
-      when 4
-        ActiveRecord::Base.connection_id ||= Fiber.current.object_id
-      else
-        connection_cache_key(current_thread)
-      end
-    end
-
-    def checkout(checkout_timeout = @checkout_timeout)
-      begin
-        reap_connections
-      rescue => ex
-        ActiveRecord::Base.logger.error("Exception occurred while executing reap_connections: #{ex}")
-      end
-      if Rails::VERSION::MAJOR > 4
-        super
-      else
-        super()
-      end
-    end
-
     def reap_connections
       cached_connections.values.each do |connection|
         unless connection.owner.alive?

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.1.0.pre.4"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.4
+  version: 0.1.3
 platform: ruby
 authors:
-- Octothorp
-autorequire:
+- Invoca Development
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -44,9 +44,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-description:
+description: 
 email:
-- octothorp@invoca.com
+- development@invoca.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -77,7 +77,7 @@ licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/Invoca/fibered_mysql2
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -88,12 +88,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: An adapter for fibered mysql2
 test_files: []