activerecord-bogacs 0.5.1 → 0.7.1

data/test/active_record/bogacs/validator_test.rb

@@ -49,7 +49,7 @@ module ActiveRecord
       require 'concurrent/atomic/semaphore.rb'
       Semaphore = ::Concurrent::Semaphore
 
-      def test_selects_non_used_connections
+      def test_removes_non_used_connections_from_pool_when_collecting_connections_to_validate
         assert_equal [], validator.send(:connections)
 
         count = AtomicFixnum.new
@@ -67,15 +67,15 @@ module ActiveRecord
           pool.with_connection { |conn| assert released_conn = conn }
         }.join
 
-
         assert_equal 3, pool.connections.size
-        assert_equal 1, validator.send(:connections).size
-        assert_equal [ released_conn ], validator.send(:connections)
-
-        semaphore.release 2
+        validator.send(:connections)
+        assert_equal 2, pool.connections.size
+        assert_false pool.connections.include?(released_conn)
+      ensure
+        semaphore.release 2 if semaphore
       end
 
-      def test_auto_removes_stale_connection_from_pool_when_collecting_connections_to_validate
+      def test_removes_stale_connection_from_pool_when_collecting_connections_to_validate
         conn = connection
 
         assert_equal [], validator.send(:connections)
@@ -91,23 +91,15 @@ module ActiveRecord
         }
         while count.value < 2; sleep 0.01 end
 
-        returned_conn = nil
-        Thread.new {
-          pool.with_connection { |conn| assert returned_conn = conn }
-        }.join
-
-        assert_equal 4, pool.connections.size
+        assert_equal 3, pool.connections.size
         validate_candidates = validator.send(:connections)
-        assert_equal [ returned_conn ], validate_candidates
-        assert_equal 4, pool.connections.size
+        assert_equal 3, pool.connections.size
 
         semaphore.release(2); sleep 0.05
 
-        validate_candidates = validator.send(:connections)
-        assert_equal 2, validate_candidates.size
-        assert validate_candidates.include?(returned_conn)
-        assert ! validate_candidates.include?(stale_conn)
-        assert_equal 3, pool.connections.size
+        validator.send(:connections)
+        assert ! pool.connections.include?(stale_conn)
+        assert_equal 1, pool.connections.size
         assert ! pool.connections.map(&:object_id).include?(stale_conn.object_id)
      end
 
@@ -184,13 +176,13 @@ module ActiveRecord
       end
 
 
-      def test_validate_returns_invalid_connection_count
-        conn = connection; threads = []; invalid_conns = []
-        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.05) } }
-        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.05); conn.expire; invalid_conns << conn } }
-        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.05) } }
-        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.05); conn.expire; invalid_conns << conn } }
-        threads.each(&:join)
+      def test_validate_returns_invalid_connection_count; require 'concurrent/array'
+        done = false; conn = connection; threads = []; invalid_conns = Concurrent::Array.new
+        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.2); sleep(0.1) until done } }
+        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.2); conn.expire; invalid_conns << conn; sleep(0.05) until done } }
+        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.2); sleep(0.1) until done } }
+        threads << Thread.new { pool.with_connection { |conn| thread_work(conn, 0.2); conn.expire; invalid_conns << conn; sleep(0.05) until done } }
+        sleep(0.1) until invalid_conns.size == 2 # threads.each(&:join)
         assert_equal 5, pool.connections.size
 
         invalid_conns.each { |conn| def conn.active?; false end }
@@ -203,6 +195,8 @@ module ActiveRecord
         result = validator.validate
         assert_equal 0, result
         assert_equal 3, pool.connections.size
+      ensure
+        done = true
       end
 
       private
@@ -245,4 +239,4 @@ module ActiveRecord
 
     end
   end
-end
+end

data/test/active_record/connection_pool_test_methods.rb

@@ -10,18 +10,19 @@ module ActiveRecord
       end
 
       def teardown
-        pool.disconnect! if pool
+        pool.discard! if pool
       end
 
       def test_checkout_after_close
         connection = pool.connection
         assert connection.in_use?
+        assert_equal connection.object_id, pool.connection.object_id
 
-        connection.close
+        connection.close # pool.checkin conn
         assert ! connection.in_use?
 
-        assert_equal connection, pool.connection
-        # assert pool.connection.in_use?
+        assert_equal connection.object_id, pool.connection.object_id
+        assert pool.connection.in_use?
       end
 
       def test_released_connection_moves_between_threads
@@ -134,8 +135,6 @@ module ActiveRecord
 
         # TODO this does not pass on built-in pool (MRI assumption) :
         #assert_equal 1, active_connections.size
-      ensure
-        pool.connections.each(&:close)
       end
 
       def test_remove_connection
@@ -159,15 +158,12 @@ module ActiveRecord
       end
 
       def test_active_connection?
-        assert_false pool.active_connection?
+        assert ! pool.active_connection?
         assert pool.connection
-        if ActiveRecord::VERSION::MAJOR >= 4
-          assert_true pool.active_connection?
-        else
-          assert pool.active_connection?
-        end
+        assert pool.active_connection? # true or returns owner thread (alias :in_use? :owner)
+        #assert_equal Thread, pool.active_connection?.class
         pool.release_connection
-        assert_false pool.active_connection?
+        assert ! pool.active_connection?
       end
 
       def test_checkout_behaviour
@@ -177,7 +173,6 @@ module ActiveRecord
           threads << Thread.new(i) do
             connection = pool.connection
             assert_not_nil connection
-            connection.close
           end
         end
 
@@ -185,7 +180,7 @@ module ActiveRecord
 
         Thread.new do
           assert pool.connection
-          pool.connection.close
+          pool.connection.tables
         end.join
       end
 
@@ -332,7 +327,7 @@ module ActiveRecord
 
       def test_pooled_connection_remove
         # ActiveRecord::Base.establish_connection(@connection.merge({:pool => 2, :checkout_timeout => 0.5}))
-        @pool.instance_variable_set(:@size, 2)
+        change_pool_size(2)
         # old_connection = ActiveRecord::Base.connection
         old_connection = @pool.connection
         # extra_connection = ActiveRecord::Base.connection_pool.checkout
@@ -340,11 +335,12 @@ module ActiveRecord
         # ActiveRecord::Base.connection_pool.remove(extra_connection)
         @pool.remove(extra_connection)
         # assert_equal ActiveRecord::Base.connection, old_connection
-        assert_equal @pool.connection, old_connection
+        assert_equal old_connection.object_id, @pool.connection.object_id
       end
 
       def test_pooled_connection_checkin_two
         checkout_checkin_connections_loop 2, 3
+
         assert_equal 3, @connection_count
         assert_equal 0, @timed_out
         # assert_equal 2, ActiveRecord::Base.connection_pool.connections.size
@@ -355,8 +351,8 @@ module ActiveRecord
 
       def checkout_checkin_connections_loop(pool_size, loops)
         # ActiveRecord::Base.establish_connection(@connection.merge({:pool => pool_size, :checkout_timeout => 0.5}))
-        @pool.instance_variable_set(:@size, pool_size)
-        @pool.instance_variable_set(:@checkout_timeout, 0.5)
+        change_pool_size(pool_size)
+        change_pool_checkout_timeout(0.5)
 
         @connection_count = 0; @timed_out = 0
         loops.times do
@@ -376,6 +372,14 @@ module ActiveRecord
         end
       end
 
+      def change_pool_size(size)
+        @pool.instance_variable_set(:@size, size)
+      end
+
+      def change_pool_checkout_timeout(timeout)
+        @pool.instance_variable_set(:@checkout_timeout, timeout)
+      end
+
       private
 
       def active_connections(pool = self.pool)
@@ -384,4 +388,4 @@ module ActiveRecord
 
     end
   end
-end
+end

data/test/test_helper.rb

@@ -24,6 +24,8 @@ require 'arjdbc' if defined? JRUBY_VERSION
 require 'logger'
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 
+puts "testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+
 #shared_pool = ENV['AR_POOL_SHARED'] ? # with AR_POOL_SHARED=true use default
 #  ( ENV['AR_POOL_SHARED'] == 'true' ? shared_pool : ENV['AR_POOL_SHARED'] ) :
 #    shared_pool
@@ -53,7 +55,7 @@ config[:'prepared_statements'] = prepared_statements if prepared_statements
 #jdbc_properties = { 'logUnclosedConnections' => true, 'loginTimeout' => 5 }
 #config[:'properties'] = jdbc_properties
 config[:'properties'] ||= {}
-config[:'properties']['useSSL'] ||= 'false' if config[:adapter].starts_with?('mysql')
+config[:'properties']['useSSL'] ||= 'false' if config[:adapter].start_with?('mysql')
 
 checkout_timeout = ENV['AR_POOL_CHECKOUT_TIMEOUT'] || checkout_timeout
 config[:'checkout_timeout'] = checkout_timeout.to_f if checkout_timeout
@@ -112,13 +114,8 @@ end
 module ActiveRecord
   module Bogacs
 
-    begin
-      require 'concurrent/atomic/atomic_reference'
-      Atomic = Concurrent::AtomicReference
-    rescue LoadError
-      require 'atomic'
-      Atomic = ::Atomic
-    end
+    require 'concurrent/atomic/atomic_reference'
+    Atomic = Concurrent::AtomicReference
 
     module TestHelper
 
@@ -161,7 +158,12 @@ module ActiveRecord
       module_function
 
       def current_connection_config
-        if ActiveRecord::Base.respond_to?(:connection_config)
+        connected = ActiveRecord::Base.connection_pool.connected?
+        if ActiveRecord::Base.connection.respond_to?(:config)
+          ActiveRecord::Base.connection.config.tap do # always an updated config, e.g. after mysql2_connection(config)
+            ActiveRecord::Base.connection_pool.disconnect! unless connected # restore pool state to avoid test surprises
+          end
+        elsif ActiveRecord::Base.respond_to?(:connection_config)
           ActiveRecord::Base.connection_config
         else
           ActiveRecord::Base.connection_pool.spec.config
@@ -226,8 +228,8 @@ module ActiveRecord
       @@setup_jdbc_context = nil
 
       def setup_jdbc_context!
-        load 'test/jars/tomcat-juli.jar'
-        load 'test/jars/tomcat-catalina.jar'
+        load_jar 'test/jars/tomcat-juli.jar'
+        load_jar 'test/jars/tomcat-catalina.jar'
 
         java.lang.System.set_property(
             javax.naming.Context::INITIAL_CONTEXT_FACTORY,
@@ -251,7 +253,7 @@ module ActiveRecord
       end
 
       def build_tomcat_jdbc_data_source(ar_jdbc_config = AR_CONFIG)
-        load 'test/jars/tomcat-jdbc.jar'
+        load_jar 'test/jars/tomcat-jdbc.jar'
 
         data_source = org.apache.tomcat.jdbc.pool.DataSource.new
         configure_dbcp_data_source(data_source, ar_jdbc_config)
@@ -262,7 +264,7 @@ module ActiveRecord
       end
 
       def build_tomcat_dbcp_data_source(ar_jdbc_config = AR_CONFIG)
-        load 'test/jars/tomcat-dbcp.jar'
+        load_jar 'test/jars/tomcat-dbcp.jar'
 
         data_source = org.apache.tomcat.dbcp.dbcp.BasicDataSource.new
         configure_dbcp_data_source(data_source, ar_jdbc_config)
@@ -273,7 +275,7 @@ module ActiveRecord
       end
 
       def build_commons_dbcp_data_source(ar_jdbc_config = AR_CONFIG)
-        load Dir.glob('test/jars/{commons-dbcp}*.jar').first
+        load_jar Dir.glob('test/jars/{commons-dbcp}*.jar').first
 
         data_source = org.apache.tomcat.dbcp.dbcp.BasicDataSource.new
         configure_dbcp_data_source(data_source, ar_jdbc_config)
@@ -299,11 +301,9 @@ module ActiveRecord
             properties.each { |name, value| db_properties.put(name, value.to_s) }
             data_source.setDbProperties db_properties
           else # Tomcat-DBCP / Commons DBCP2
-            # format of the string must be: [propertyName=property;]
-            connection_properties = properties.inject('') do
-              |str, name, val| str << "[#{name}=#{val};]"; str
+            properties.each do |name, val|
+              data_source.addConnectionProperty name, val.to_s
             end
-            data_source.setConnectionProperties connection_properties
           end
         end
         # JDBC pool tunings (some mapped from AR configuration) :
@@ -327,7 +327,7 @@ module ActiveRecord
       private :configure_dbcp_data_source
 
       def build_c3p0_data_source(ar_jdbc_config = AR_CONFIG)
-        Dir.glob('test/jars/{c3p0,mchange-commons}*.jar').each { |jar| load jar }
+        Dir.glob('test/jars/{c3p0,mchange-commons}*.jar').each { |jar| load_jar jar }
 
         data_source = com.mchange.v2.c3p0.ComboPooledDataSource.new
         configure_c3p0_data_source(data_source, ar_jdbc_config)
@@ -373,15 +373,15 @@ module ActiveRecord
 
 
       def build_hikari_data_source(ar_jdbc_config = AR_CONFIG)
-        unless hikari_jar = Dir.glob('test/jars/HikariCP*.jar').last
+        unless hikari_jar = Dir.glob('test/jars/HikariCP*.jar').sort.last
           raise 'HikariCP jar not found in test/jars directory'
         end
         if ( version = File.basename(hikari_jar, '.jar').match(/\-([\w\.\-]$)/) ) && version[1] < '2.3.9'
-          Dir.glob('test/jars/{javassist,slf4j}*.jar').each { |jar| require jar }
+          Dir.glob('test/jars/{javassist,slf4j}*.jar').each { |jar| load_jar jar }
         else
-          Dir.glob('test/jars/{slf4j}*.jar').each { |jar| require jar }
+          Dir.glob('test/jars/{slf4j}*.jar').each { |jar| load_jar jar }
         end
-        require hikari_jar
+        load_jar hikari_jar
 
         configure_hikari_data_source(ar_jdbc_config)
       end
@@ -396,7 +396,12 @@ module ActiveRecord
 
         case driver
         when /mysql/i
-          hikari_config.setDataSourceClassName 'com.mysql.jdbc.jdbc2.optional.MysqlDataSource'
+          data_source_class_name = if driver == 'com.mysql.cj.jdbc.Driver'
+            'com.mysql.cj.jdbc.MysqlDataSource' # driver 8.0
+          else
+            'com.mysql.jdbc.jdbc2.optional.MysqlDataSource' # old 5.x
+          end
+          hikari_config.setDataSourceClassName data_source_class_name
           hikari_config.addDataSourceProperty 'serverName', ar_jdbc_config[:host] || 'localhost'
           hikari_config.addDataSourceProperty 'databaseName', ar_jdbc_config[:database]
           hikari_config.addDataSourceProperty 'port', ar_jdbc_config[:port] if ar_jdbc_config[:port]
@@ -407,7 +412,7 @@ module ActiveRecord
             hikari_config.addDataSourceProperty 'password', ar_jdbc_config[:password]
           end
           ( ar_jdbc_config[:properties] || {} ).each do |name, val|
-            hikari_config.addDataSourceProperty name.to_s, val.to_s
+            hikari_config.addDataSourceProperty name.to_s, val.to_s unless name.eql?('useLegacyDatetimeCode')
           end
         when /postgres/i
           hikari_config.setDataSourceClassName 'org.postgresql.ds.PGSimpleDataSource'
@@ -478,6 +483,16 @@ module ActiveRecord
 
       def jndi_name; 'jdbc/TestDB' end
 
+      private
+
+      def load_jar(jar)
+        abs_jar = File.expand_path(jar)
+        unless File.file?(abs_jar)
+          raise "path does not exist or is not a file: #{jar}"
+        end
+        load abs_jar
+      end
+
     end
   end
-end
+end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bogacs
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Karol Bucek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  name: concurrent-ruby
+        version: '6'
+  name: activerecord
   prerelease: false
-  type: :development
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '1.0'
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -59,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -68,9 +83,11 @@ files:
 - activerecord-bogacs.gemspec
 - lib/active_record/bogacs.rb
 - lib/active_record/bogacs/autoload.rb
+- lib/active_record/bogacs/connection_handler.rb
 - lib/active_record/bogacs/default_pool.rb
 - lib/active_record/bogacs/false_pool.rb
 - lib/active_record/bogacs/pool_support.rb
+- lib/active_record/bogacs/railtie.rb
 - lib/active_record/bogacs/reaper.rb
 - lib/active_record/bogacs/shareable_pool.rb
 - lib/active_record/bogacs/thread_safe.rb
@@ -80,6 +97,7 @@ files:
 - lib/active_record/connection_adapters/adapter_compat.rb
 - lib/active_record/connection_adapters/pool_class.rb
 - lib/active_record/shared_connection.rb
+- lib/activerecord-bogacs.rb
 - test/active_record/bogacs/default_pool_test.rb
 - test/active_record/bogacs/false_pool_test.rb
 - test/active_record/bogacs/reaper_test.rb
@@ -109,14 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: 'Bogacs contains several pool implementations that can be used as a replacement
-  for ActiveRecord''s built-in pool, e.g. DefaultPool is an upstream tuned version
-  with an API that is compatible with older AR versions.  NOTE: you''ll need concurrent-ruby
-  or thread_safe gem.'
+summary: Bogacs contains several pool implementations that can be used as a replacement
+  for ActiveRecord's built-in pool, e.g. DefaultPool is an upstream tuned version
+  with an API that is compatible with older AR versions.
 test_files:
 - test/active_record/bogacs/default_pool_test.rb
 - test/active_record/bogacs/false_pool_test.rb