activerecord-bogacs 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930e066b793b68dafffe166563475cfa1812aad6
-  data.tar.gz: 56cd2c22124126859b4e8bb5da2f8fe133c43a5e
+  metadata.gz: 1f7c9f5688cb27fb4c84bea3a516d1d2d014fb1c
+  data.tar.gz: 17a6269479cb432bda7d027c0d89586c6cecaa19
 SHA512:
-  metadata.gz: 8b9a4c0e4877fd090e266096c7c48cff52d3a2856efc712c8e3919c659d9f8a866ccf1f19d92ac44258e0d44cbfc255bab33473ab4a2c2200fbd6a5e228ebcc5
-  data.tar.gz: daaf27dcb6b82139cfeaf396181ddfbe6bf3ff36300f79dc56ae6aee9d4b604250f2172f434296136350c2bfb290907a2030d8b741e06330343b5fe51db2e4b2
+  metadata.gz: 1ad54c3ab7af8f4edbc2fea17cba7f1d32d784d4107ba8fe186e58fed676dd30f61b91bef610d3912b9f0bc1022286b39366b8b605228ba9e2c38939f155910b
+  data.tar.gz: 8dffdfc6857d604ab66931b0a30eca0d6e5b5d9fd148ec1dcb73721dd29cf338de3744730974581cb4f624e1cf402e2c1790357201310904e8cdef8787be7d54

data/.travis.yml

@@ -5,8 +5,7 @@ jdk:
   - oraclejdk7
   - oraclejdk8
 rvm:
-  - jruby-1.7.16
-  #- jruby-head
+  - jruby-1.7.22
   #- 2.1.2
 before_install:
   - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
@@ -21,8 +20,8 @@ script:
   - bundle exec rake dbcp:download
   - bundle exec rake db:create:mysql db:create:postgresql
 env:
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2"
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.1-java6"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.12"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2-java6"
   - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.0.1-java6"
   - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 3.2.18" HIKARI_VERSION="1.4.0"
   - JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.2.5-java6"
@@ -30,15 +29,22 @@ matrix:
   #allow_failures:
     #- rvm: jruby-head
   exclude:
-    - rvm: jruby-1.7.16
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2"
+    - rvm: jruby-1.7.22
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.12"
       jdk: oraclejdk7
-    - rvm: jruby-1.7.16
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.1-java6"
+    - rvm: jruby-1.7.22
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2-java6"
       jdk: oraclejdk8
-    - rvm: jruby-1.7.16
+    - rvm: jruby-1.7.22
       env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.0.1-java6"
       jdk: oraclejdk8
-    - rvm: jruby-1.7.16
+    - rvm: jruby-1.7.22
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.2.5-java6"
+      jdk: oraclejdk8
+  include:
+    - rvm: jruby-9.0.1.0
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.2.5-java6"
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.1.0
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.3.9"
       jdk: oraclejdk8

data/Gemfile

@@ -19,6 +19,9 @@ end
 if RUBY_VERSION.index('1.8') == 0
   gem 'i18n', '< 0.7.0' # Gem::InstallError: i18n requires Ruby version >= 1.9.3
   gem 'atomic', '1.1.16' # concurrent-ruby gem only for Ruby version >= 1.9.3
+  gem 'thread_safe', '~> 0.3'
+else
+  gem 'concurrent-ruby', '1.0.0.pre4', :require => nil
 end
 
 platform :jruby do

data/Rakefile

@@ -29,6 +29,21 @@ task 'db:create:mysql' do
   # puts "... run tests with MySQL using: `AR_ADAPTER=mysql rake test `"
 end
 
+task 'db:drop:mysql' do
+  fail "could not create database: mysql executable not found" unless mysql = _which('mysql')
+  ENV['Rake'] = true.to_s; ENV['AR_ADAPTER'] ||= 'mysql'
+  require File.expand_path('test/test_helper.rb', File.dirname(__FILE__))
+
+  script = "DROP DATABASE `#{AR_CONFIG[:database]}`;"
+  params = { '-u' => 'root' }
+  if ENV['DATABASE_YML']; require 'yaml'
+    password = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
+    params['--password'] = password
+  end
+  puts "Creating MySQL database: #{AR_CONFIG[:database]}"
+  sh "cat #{_sql_script(script).path} | #{mysql} #{params.to_a.join(' ')}", :verbose => $VERBOSE
+end
+
 desc "Creates a (test) PostgreSQL database"
 task 'db:create:postgresql' do
   fail 'could not create database: psql executable not found' unless psql = _which('psql')
@@ -94,14 +109,14 @@ namespace :tomcat do
 
   tomcat_maven_repo = 'http://repo2.maven.org/maven2/org/apache/tomcat'
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
-  version_default = '7.0.59'
+  version_default = '7.0.64'
 
   [ 'tomcat-jdbc', 'tomcat-dbcp' ].each do |tomcat_pool|
     namespace tomcat_pool.sub('tomcat-', '') do # rake tomcat:dbcp:download
 
       tomcat_pool_jar = "#{tomcat_pool}.jar"
 
-      task :download, :version do |_,args| # rake tomcat:jdbc:download[7.0.54]
+      task :download, :version do |_,args| # rake tomcat:jdbc:download[7.0.64]
         env_key = "#{tomcat_pool.upcase.sub('-', '_')}_VERSION" # 'TOMCAT_JDBC_VERSION'
         version = args[:version] || ENV[env_key] || version_default
 

data/activerecord-bogacs.gemspec

@@ -8,19 +8,21 @@ Gem::Specification.new do |gem|
 
   gem.authors = ['Karol Bucek']
   gem.email = ['self@kares.org']
-  gem.description = %q{(experimental) alternatives for ActiveRecord::ConnectionAdapters::ConnectionPool}
-  gem.summary = %q{A small body of still water, usually fresh ... for ActiveRecord!}
+  gem.description = %q{Improved ActiveRecord::ConnectionAdapters::ConnectionPool alternatives}
+  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.' <<
+  "\n\nNOTE: you'll need concurrent-ruby or thread_safe gem."
   gem.homepage = "http://github.com/kares/activerecord-bogacs"
-  #gem.licenses = ['MIT']
+  gem.licenses = ['MIT']
 
   gem.files = `git ls-files`.split($/)
   gem.executables = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'thread_safe', '~> 0.3'
+  gem.add_development_dependency 'concurrent-ruby', '>= 0.9' if RUBY_VERSION.index('1.8') != 0
 
-  gem.add_development_dependency 'concurrent-ruby', '>= 0.8' if RUBY_VERSION.index('1.8') != 0
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'test-unit', '~> 2.5'
 end

data/lib/active_record/bogacs/default_pool.rb

@@ -1,9 +1,9 @@
 require 'thread'
-require 'thread_safe'
 require 'monitor'
 
 require 'active_record/connection_adapters/adapter_compat'
 require 'active_record/bogacs/pool_support'
+require 'active_record/bogacs/thread_safe'
 
 module ActiveRecord
   module Bogacs
@@ -234,7 +234,7 @@ module ActiveRecord
         end
 
         # The cache of reserved connections mapped to threads
-        @reserved_connections = ThreadSafe::Cache.new(:initial_capacity => @size)
+        @reserved_connections = ThreadSafe::Map.new(:initial_capacity => @size)
 
         @connections = []
         @automatic_reconnect = true
@@ -279,7 +279,7 @@ module ActiveRecord
       def release_connection(with_id = current_connection_id)
         #synchronize do
           conn = @reserved_connections.delete(with_id)
-          checkin conn if conn
+          checkin conn, true if conn
         #end
       end
 
@@ -381,15 +381,13 @@ module ActiveRecord
       #
       # +conn+: an AbstractAdapter object, which was obtained by earlier by
       # calling +checkout+ on this pool.
-      def checkin(conn)
+      def checkin(conn, released = nil)
         synchronize do
-          owner = conn.owner
-
           conn.run_callbacks :checkin do
             conn.expire
           end
 
-          release owner
+          release conn.owner unless released
 
           @available.add conn
         end
@@ -453,7 +451,6 @@ module ActiveRecord
 
       def release(owner)
         thread_id = owner.object_id
-
         @reserved_connections.delete thread_id
       end
 

data/lib/active_record/bogacs/false_pool.rb

@@ -1,5 +1,5 @@
-require 'thread_safe'
 require 'active_record/bogacs/pool_support'
+require 'active_record/bogacs/thread_safe'
 
 module ActiveRecord
   module Bogacs
@@ -7,8 +7,7 @@ module ActiveRecord
 
       include PoolSupport
 
-      include ThreadSafe::Util::CheapLockable
-      alias_method :synchronize, :cheap_synchronize
+      include ThreadSafe::Synchronized
 
       attr_accessor :automatic_reconnect
 
@@ -21,7 +20,7 @@ module ActiveRecord
         @size = nil
         #@automatic_reconnect = true
 
-        @reserved_connections = ThreadSafe::Cache.new #:initial_capacity => @size
+        @reserved_connections = ThreadSafe::Map.new #:initial_capacity => @size
       end
 
       # @private replacement for attr_reader :connections

data/lib/active_record/bogacs/pool_support.rb

@@ -4,9 +4,9 @@ module ActiveRecord
   module Bogacs
     module PoolSupport
 
-      def self.included(base)
-        #base.send :include, ThreadSafe::Util::CheapLockable
-      end
+      #def self.included(base)
+        #base.send :include, ThreadSafe::Synchronized
+      #end
 
       def new_connection
         Base.send(spec.adapter_method, spec.config)

data/lib/active_record/bogacs/shareable_pool.rb

@@ -1,17 +1,8 @@
 require 'active_record/connection_adapters/abstract/connection_pool'
 
 require 'thread'
-require 'thread_safe'
-begin
-  require 'concurrent/atomic'
-rescue LoadError => e
-  begin
-    require 'atomic'
-  rescue LoadError
-    warn "shareable pool needs gem 'concurrent-ruby' please install or add it to your Gemfile"
-    raise e
-  end
-end
+
+require 'active_record/bogacs/thread_safe'
 
 require 'active_record/bogacs/pool_support'
 
@@ -23,9 +14,17 @@ require 'active_record/bogacs/pool_support'
 module ActiveRecord
   module Bogacs
     class ShareablePool < ConnectionAdapters::ConnectionPool # NOTE: maybe do not override?!
-      include ThreadSafe::Util::CheapLockable
       include PoolSupport
 
+      if ActiveRecord::Bogacs::ThreadSafe.load_cheap_lockable(false)
+        include ThreadSafe::CheapLockable
+      else
+        alias_method :cheap_synchronize, :synchronize
+      end
+
+      ActiveRecord::Bogacs::ThreadSafe.load_atomic_reference
+      AtomicReference = ThreadSafe::AtomicReference
+
       DEFAULT_SHARED_POOL = 0.25 # only allow 25% of the pool size to be shared
       MAX_THREAD_SHARING = 5 # not really a strict limit but should hold
 
@@ -39,7 +38,7 @@ module ActiveRecord
         # size 0.0 - 1.0 assumes percentage of the pool size
         shared_size = ( @size * shared_size ).round if shared_size <= 1.0
         @shared_size = shared_size.to_i
-        @shared_connections = ThreadSafe::Cache.new # :initial_capacity => @shared_size, :concurrency_level => 20
+        @shared_connections = ThreadSafe::Map.new # :initial_capacity => @shared_size, :concurrency_level => 20
       end
 
       # @override
@@ -232,14 +231,8 @@ module ActiveRecord
         least_shared # might be nil in that case we'll likely wait (as super)
       end
 
-      if defined? Concurrent::Atomic
-        Atomic = Concurrent::Atomic
-      else
-        Atomic = ::Atomic
-      end
-
       def add_shared_connection(connection)
-        @shared_connections[connection] = Atomic.new(1)
+        @shared_connections[connection] = AtomicReference.new(1)
       end
 
       def rem_shared_connection(connection)

data/lib/active_record/bogacs/thread_safe.rb

@@ -0,0 +1,76 @@
+module ActiveRecord
+  module Bogacs
+    module ThreadSafe
+
+      #def self.load_map
+        begin
+          require 'concurrent/map.rb'
+        rescue LoadError => e
+          begin
+            require 'thread_safe'
+          rescue
+            warn "activerecord-bogacs needs gem 'concurrent-ruby', '~> 1.0' (or the old 'thread_safe' gem) " <<
+                 "please install or add it to your Gemfile"
+            raise e
+          end
+        end
+      #end
+
+      #load_map # always pre-load thread_safe
+
+      if defined? ::Concurrent::Map
+        Map = ::Concurrent::Map
+      else
+        Map = ::ThreadSafe::Cache
+      end
+
+      autoload :Synchronized, 'active_record/bogacs/thread_safe/synchronized'
+
+      def self.load_atomic_reference
+        return const_get :AtomicReference if const_defined? :AtomicReference
+
+        begin
+          require 'concurrent/atomic/atomic_reference.rb'
+        rescue LoadError => e
+          begin
+            require 'atomic'
+          rescue LoadError
+            warn "shareable pool needs gem 'concurrent-ruby', '>= 0.9.1' (or the old 'atomic' gem) " <<
+                 "please install or add it to your Gemfile"
+            raise e
+          end
+        end
+
+        if defined? ::Concurrent::AtomicReference
+          const_set :AtomicReference, ::Concurrent::AtomicReference
+        else
+          const_set :AtomicReference, ::Atomic
+        end
+      end
+
+      def self.load_cheap_lockable(required = true)
+        return const_get :CheapLockable if const_defined? :CheapLockable
+
+        begin
+          require 'concurrent/thread_safe/util/cheap_lockable.rb'
+        rescue LoadError => e
+          begin
+            require 'thread_safe'
+          rescue
+            return nil unless required
+            warn "activerecord-bogacs needs gem 'concurrent-ruby', '~> 1.0' (or the old 'thread_safe' gem) " <<
+                 "please install or add it to your Gemfile"
+            raise e
+          end
+        end
+
+        if defined? ::Concurrent::ThreadSafe::Util::CheapLockable
+          const_set :CheapLockable, ::Concurrent::ThreadSafe::Util::CheapLockable
+        else
+          const_set :CheapLockable, ::ThreadSafe::Util::CheapLockable
+        end
+      end
+
+    end
+  end
+end

data/lib/active_record/bogacs/thread_safe/synchronized.rb

@@ -0,0 +1,33 @@
+# @note Inpspired by thread_safe gem's Util::CheapLockable mixin.
+module ActiveRecord::Bogacs
+  module ThreadSafe
+    engine = defined?(RUBY_ENGINE) && RUBY_ENGINE
+    if engine == 'rbx'
+      module Synchronized
+        # Making use of the Rubinius' ability to lock via object headers to avoid
+        # the overhead of the extra Mutex objects.
+        def synchronize
+          ::Rubinius.lock(self)
+          begin
+            yield
+          ensure
+            ::Rubinius.unlock(self)
+          end
+        end
+      end
+    elsif engine == 'jruby'
+      module Synchronized
+        require 'jruby'
+        # Use Java's native synchronized (this) { wait(); notifyAll(); } to avoid
+        # the overhead of the extra Mutex objects
+        def synchronize
+          ::JRuby.reference0(self).synchronized { yield }
+        end
+      end
+    else
+      require 'thread'; require 'monitor'
+      # on MRI fallback to built-in MonitorMixin
+      Synchronized = MonitorMixin
+    end
+  end
+end

data/lib/active_record/bogacs/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bogacs
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/test/test_helper.rb

@@ -42,7 +42,7 @@ if url = ENV['AR_URL'] || ENV['JDBC_URL']
   config[:'url'] = url
 else
   config[:'host'] = ENV['AR_HOST'] || 'localhost'
-  config[:'database'] = ENV['AR_DATABASE'] || 'ar_basin'
+  config[:'database'] = ENV['AR_DATABASE'] || 'ar_bogacs'
 end
 
 config[:'pool'] = ENV['AR_POOL_SIZE'] ? ENV['AR_POOL_SIZE'].to_i : pool_size
@@ -111,8 +111,8 @@ module ActiveRecord
   module Bogacs
 
     begin
-      require 'concurrent/atomic'
-      Atomic = Concurrent::Atomic
+      require 'concurrent/atomic/atomic_reference'
+      Atomic = Concurrent::AtomicReference
     rescue LoadError
       require 'atomic'
       Atomic = ::Atomic

metadata

@@ -1,41 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bogacs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Karol Bucek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -66,7 +52,7 @@ dependencies:
         version: '2.5'
   prerelease: false
   type: :development
-description: (experimental) alternatives for ActiveRecord::ConnectionAdapters::ConnectionPool
+description: Improved ActiveRecord::ConnectionAdapters::ConnectionPool alternatives
 email:
 - self@kares.org
 executables: []
@@ -85,6 +71,8 @@ files:
 - lib/active_record/bogacs/false_pool.rb
 - lib/active_record/bogacs/pool_support.rb
 - lib/active_record/bogacs/shareable_pool.rb
+- lib/active_record/bogacs/thread_safe.rb
+- lib/active_record/bogacs/thread_safe/synchronized.rb
 - lib/active_record/bogacs/version.rb
 - lib/active_record/connection_adapters/adapter_compat.rb
 - lib/active_record/shared_connection.rb
@@ -97,7 +85,8 @@ files:
 - test/active_record/connection_pool_test_methods.rb
 - test/test_helper.rb
 homepage: http://github.com/kares/activerecord-bogacs
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -115,10 +104,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
-summary: A small body of still water, usually fresh ... for ActiveRecord!
+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.'
 test_files:
 - test/active_record/bogacs/default_pool_test.rb
 - test/active_record/bogacs/false_pool_test.rb