fibered_mysql2 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7483b06b33f48ad81f0b2edd4418131ff11342f8beb9de37a4b76e01b413e94a
-  data.tar.gz: ce2ba19419f9084c016cbe300b286b3ff16a2cd57a8efaac723be594bee42d52
+  metadata.gz: 886e707f8337bfa2ac7949cda23807f33caeee9cb68b409b05695c65cebc73ce
+  data.tar.gz: 9c4bb45a65868e23427bea1563ce128c9716ab0146244139d035a3d9dd49d547
 SHA512:
-  metadata.gz: 858251652fc0688fa3eee890a9d91409122e27ce174af91cd0906e9f74ec527f60f66b1daa909616e04359e5bf5c829b447cd1bf06a05673528864b66486ed28
-  data.tar.gz: 11b45c4acaa50c6f5ee6c6cfb2eb0526ebf4aba9c0f0561c5f47ee9ba4ae5b24326b4ab542247c64d460ecf640f748f81bae7621ff1681fa10cda7bf7412be88
+  metadata.gz: ef965907130eb174255a789abe06284eaf29b4784d5429431680e2e3049802dd70fe326a36f37117c3d21395555cd25f55944e6c77b96bca2acddba466addfd4
+  data.tar.gz: 19691c1282faaff78212ee6eab9036a9231a137c3f14bd8bfbbcef3fd4625bea7a71edc1add1b3d84ce8d3d22e8a67cbb72c33eb1ef8d7c1003af5e0b1279fc0

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,6 +4,27 @@ 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.4] - 2021-06-25
+### Fixed
+- Disable the ConnectionPool::Reaper in Rails 5 and 6 as it was in 4. This is important since it is
+threaded, not fibered.
+
+## [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
 - Added an adapter for Rails 4, 5, and 6.
@@ -11,4 +32,8 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 - Added TravisCI unit test pipeline.
 - Added coverage reports via Coveralls.
 
+[0.1.4]: https://github.com/Invoca/fibered_mysql2/compare/v0.1.3..v0.1.4
+[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)
+    fibered_mysql2 (0.1.4)
       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/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

@@ -173,6 +173,7 @@ module FiberedMysql2
 
     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)"
+      connection_spec.config[:reaping_frequency] = nil # starting in Rails 5, this defaults to 60 if not explicitly set
 
       super(connection_spec, *args, **keyword_args)
 

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Invoca Development
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -44,7 +44,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-description:
+description: 
 email:
 - development@invoca.com
 executables: []
@@ -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
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: An adapter for fibered mysql2
 test_files: []