makara 0.3.9 → 0.5.1

data/lib/active_record/connection_adapters/makara_abstract_adapter.rb

@@ -1,20 +1,16 @@
 require 'active_record'
+require 'makara'
 
 module ActiveRecord
   module ConnectionAdapters
     class MakaraAbstractAdapter < ::Makara::Proxy
-
-
       class ErrorHandler < ::Makara::ErrorHandler
-
-
         HARSH_ERRORS = [
           'ActiveRecord::RecordNotUnique',
           'ActiveRecord::InvalidForeignKey',
           'Makara::Errors::BlacklistConnection'
         ].map(&:freeze).freeze
 
-
         CONNECTION_MATCHERS = [
           /(closed|lost|no|terminating|terminated)\s?([^\s]+)?\sconnection/,
           /gone away/,
@@ -31,11 +27,8 @@ module ActiveRecord
           /the database system is (starting|shutting)/
         ].map(&:freeze).freeze
 
-
         def handle(connection)
-
           yield
-
         rescue Exception => e
           # do it via class name to avoid version-specific constant dependencies
           case e.class.name
@@ -48,20 +41,16 @@ module ActiveRecord
               harshly(e)
             end
           end
-
         end
 
-
         def harsh_errors
           HARSH_ERRORS
         end
 
-
         def connection_matchers
           CONNECTION_MATCHERS
         end
 
-
         def connection_message?(message)
           message = message.to_s.downcase
 
@@ -73,7 +62,6 @@ module ActiveRecord
           end
         end
 
-
         def custom_error_message?(connection, message)
           custom_error_matchers = connection._makara_custom_error_matchers
           return false if custom_error_matchers.empty?
@@ -81,7 +69,6 @@ module ActiveRecord
           message = message.to_s
 
           custom_error_matchers.each do |matcher|
-
             if matcher.is_a?(String)
 
               # accept strings that look like "/.../" as a regex
@@ -100,49 +87,43 @@ module ActiveRecord
 
           false
         end
-
-
       end
 
-
-      hijack_method :execute, :select_rows, :exec_query, :transaction
+      hijack_method :execute, :exec_query, :exec_no_cache, :exec_cache, :transaction
       send_to_all :connect, :reconnect!, :verify!, :clear_cache!, :reset!
 
-      SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i].map(&:freeze).freeze
-      SQL_SLAVE_MATCHERS            = [/\A\s*select\s/i].map(&:freeze).freeze
+      control_method :close, :steal!, :expire, :lease, :in_use?, :owner, :schema_cache, :pool=, :pool,
+         :schema_cache=, :lock, :seconds_idle, :==
+
+      SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i, /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i].map(&:freeze).freeze
+      SQL_SLAVE_MATCHERS            = [/\A\s*(select|with.+\)\s*select)\s/i].map(&:freeze).freeze
       SQL_ALL_MATCHERS              = [/\A\s*set\s/i].map(&:freeze).freeze
       SQL_SKIP_STICKINESS_MATCHERS  = [/\A\s*show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /\A\s*(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
 
-
       def sql_master_matchers
         SQL_MASTER_MATCHERS
       end
 
-
       def sql_slave_matchers
         SQL_SLAVE_MATCHERS
       end
 
-
       def sql_all_matchers
         SQL_ALL_MATCHERS
       end
 
-
       def sql_skip_stickiness_matchers
         SQL_SKIP_STICKINESS_MATCHERS
       end
 
-
       def initialize(config)
         @error_handler = ::ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter::ErrorHandler.new
+        @control = ActiveRecordPoolControl.new(self)
         super(config)
       end
 
-
       protected
 
-
       def appropriate_connection(method_name, args, &block)
         if needed_by_all?(method_name, args)
 
@@ -163,29 +144,28 @@ module ActiveRecord
         end
       end
 
-
       def should_stick?(method_name, args)
         sql = coerce_query_to_sql_string(args.first)
         return false if sql_skip_stickiness_matchers.any?{|m| sql =~ m }
+
         super
       end
 
-
       def needed_by_all?(method_name, args)
         sql = coerce_query_to_sql_string(args.first)
         return true if sql_all_matchers.any?{|m| sql =~ m }
+
         false
       end
 
-
       def needs_master?(method_name, args)
         sql = coerce_query_to_sql_string(args.first)
         return true if sql_master_matchers.any?{|m| sql =~ m }
         return false if sql_slave_matchers.any?{|m| sql =~ m }
+
         true
       end
 
-
       def coerce_query_to_sql_string(sql_or_arel)
         if sql_or_arel.respond_to?(:to_sql)
           sql_or_arel.to_sql
@@ -194,18 +174,116 @@ module ActiveRecord
         end
       end
 
-
       def connection_for(config)
         config = Makara::ConfigParser.merge_and_resolve_default_url_config(config)
         active_record_connection_for(config)
       end
 
-
       def active_record_connection_for(config)
         raise NotImplementedError
       end
 
+      class ActiveRecordPoolControl
+        attr_reader :owner
+        alias :in_use? :owner
+
+        def initialize(proxy)
+          @proxy = proxy
+          @owner = nil
+          @pool = nil
+          @schema_cache = ActiveRecord::ConnectionAdapters::SchemaCache.new @proxy
+          @idle_since = Concurrent.monotonic_time
+          @adapter = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(@proxy)
+        end
+
+        def close(*args)
+          @pool.checkin @proxy
+        end
+
+        # this method must only be called while holding connection pool's mutex
+        def lease(*args)
+          if in_use?
+            msg = +"Cannot lease connection, "
+            if @owner == Thread.current
+              msg << "it is already leased by the current thread."
+            else
+              msg << "it is already in use by a different thread: #{@owner}. " \
+                    "Current thread: #{Thread.current}."
+            end
+            raise ActiveRecordError, msg
+          end
+          @owner = Thread.current
+        end
+
+        # this method must only be called while holding connection pool's mutex
+        def expire(*args)
+          if in_use?
+            if @owner != Thread.current
+              raise ActiveRecordError, "Cannot expire connection, " \
+                "it is owned by a different thread: #{@owner}. " \
+                "Current thread: #{Thread.current}."
+            end
+
+            @idle_since = Concurrent.monotonic_time
+            @owner = nil
+          else
+            raise ActiveRecordError, "Cannot expire connection, it is not currently leased."
+          end
+        end
+
+        # Seconds since this connection was returned to the pool
+        def seconds_idle(*args)
+          return 0 if in_use?
+
+          Concurrent.monotonic_time - @idle_since
+        end
+
+        # this method must only be called while holding connection pool's mutex (and a desire for segfaults)
+        def steal!(*args)
+          if in_use?
+            if @owner != Thread.current
+              @pool.send :remove_connection_from_thread_cache, @proxy, @owner
+              @owner = Thread.current
+            end
+          else
+            raise ActiveRecordError, "Cannot steal connection, it is not currently leased."
+          end
+        end
+
+        def schema_cache(*args)
+          if @pool.respond_to?(:get_schema_cache) # AR6
+            @pool.get_schema_cache(@proxy)
+          else
+            @schema_cache
+          end
+        end
+
+        def schema_cache=(*args)
+          cache = args[0]
+          cache.connection = @proxy
+          if @pool.respond_to?(:set_schema_cache) # AR6
+            @pool.set_schema_cache(cache)
+          else
+            @schema_cache = cache
+          end
+        end
+
+        def lock(*args)
+          @adapter.lock
+        end
+
+        def pool=(*args)
+          @pool = args[0]
+        end
 
+        def pool(*args)
+          @pool
+        end
+
+        def ==(*args)
+          @proxy.object_id == args[0].object_id
+        end
+      end
     end
   end
 end

data/lib/active_record/connection_adapters/makara_jdbcmysql_adapter.rb

@@ -2,24 +2,10 @@ require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/jdbcmysql_adapter'
 require 'active_record/connection_adapters/makara_mysql2_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_jdbcmysql_connection(config)
-        makara_mysql2_connection(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_jdbcmysql_connection(config)
-        self.makara_mysql2_connection(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_jdbcmysql_connection(config)
+      makara_mysql2_connection(config)
     end
   end
-
 end

data/lib/active_record/connection_adapters/makara_jdbcpostgresql_adapter.rb

@@ -2,24 +2,10 @@ require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/jdbcpostgresql_adapter'
 require 'active_record/connection_adapters/makara_postgresql_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_jdbcpostgresql_connection(config)
-        makara_postgresql_connection(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_jdbcpostgresql_connection(config)
-        self.makara_postgresql_connection(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_jdbcpostgresql_connection(config)
+      makara_postgresql_connection(config)
     end
   end
-
 end

data/lib/active_record/connection_adapters/makara_mysql2_adapter.rb

@@ -1,32 +1,17 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/mysql2_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_mysql2_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter.new(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_mysql2_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter.new(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_mysql2_connection(config)
+      ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter.new(config)
     end
   end
-
 end
 
 module ActiveRecord
   module ConnectionAdapters
     class MakaraMysql2Adapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter
-
       class << self
         def visitor_for(*args)
           ActiveRecord::ConnectionAdapters::Mysql2Adapter.visitor_for(*args)
@@ -38,7 +23,6 @@ module ActiveRecord
       def active_record_connection_for(config)
         ::ActiveRecord::Base.mysql2_connection(config)
       end
-
     end
   end
 end

data/lib/active_record/connection_adapters/makara_postgis_adapter.rb

@@ -1,29 +1,14 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/postgis_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_postgis_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_postgis_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_postgis_connection(config)
+      ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
     end
   end
-
 end
 
-
 module ActiveRecord
   module ConnectionAdapters
     class MakaraPostgisAdapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter

data/lib/active_record/connection_adapters/makara_postgresql_adapter.rb

@@ -1,32 +1,17 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/postgresql_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_postgresql_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter.new(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_postgresql_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter.new(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_postgresql_connection(config)
+      ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter.new(config)
     end
   end
-
 end
 
 module ActiveRecord
   module ConnectionAdapters
     class MakaraPostgreSQLAdapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter
-
       class << self
         def visitor_for(*args)
           ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.visitor_for(*args)
@@ -38,7 +23,6 @@ module ActiveRecord
       def active_record_connection_for(config)
         ::ActiveRecord::Base.postgresql_connection(config)
       end
-
     end
   end
 end