Merge pull request rails#53881 from byroot/adapters-consistent-interlock

Consistently release the autoloading interlock from all adapters

Author: byroot

activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -553,7 +553,11 @@ def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow
           type_casted_binds = type_casted_binds(binds)
           log(sql, name, binds, type_casted_binds, async: async) do |notification_payload|
             with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
-              perform_query(conn, sql, binds, type_casted_binds, prepare: prepare, notification_payload: notification_payload, batch: batch)
+              result = ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+                perform_query(conn, sql, binds, type_casted_binds, prepare: prepare, notification_payload: notification_payload, batch: batch)
+              end
+              handle_warnings(result, sql)
+              result
             end
           end
         end
@@ -562,6 +566,9 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
           raise NotImplementedError
         end
 
+        def handle_warnings(raw_result, sql)
+        end
+
         # Receive a native adapter result object and returns an ActiveRecord::Result object.
         def cast_result(raw_result)
           raise NotImplementedError

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -759,7 +759,7 @@ def extended_type_map_key
           end
         end
 
-        def handle_warnings(sql)
+        def handle_warnings(_initial_result, sql)
           return if ActiveRecord.db_warnings_action.nil? || @raw_connection.warning_count == 0
 
           warning_count = @raw_connection.warning_count

activerecord/lib/active_record/connection_adapters/mysql2/database_statements.rb

@@ -50,22 +50,18 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
 
             result = nil
             if binds.nil? || binds.empty?
-              ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                result = raw_connection.query(sql)
-                # Ref: https://github.com/brianmario/mysql2/pull/1383
-                # As of mysql2 0.5.6 `#affected_rows` might raise Mysql2::Error if a prepared statement
-                # from that same connection was GCed while `#query` released the GVL.
-                # By avoiding to call `#affected_rows` when we have a result, we reduce the likeliness
-                # of hitting the bug.
-                @affected_rows_before_warnings = result&.size || raw_connection.affected_rows
-              end
+              result = raw_connection.query(sql)
+              # Ref: https://github.com/brianmario/mysql2/pull/1383
+              # As of mysql2 0.5.6 `#affected_rows` might raise Mysql2::Error if a prepared statement
+              # from that same connection was GCed while `#query` released the GVL.
+              # By avoiding to call `#affected_rows` when we have a result, we reduce the likeliness
+              # of hitting the bug.
+              @affected_rows_before_warnings = result&.size || raw_connection.affected_rows
             elsif prepare
               stmt = @statements[sql] ||= raw_connection.prepare(sql)
               begin
-                ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                  result = stmt.execute(*type_casted_binds)
-                  @affected_rows_before_warnings = stmt.affected_rows
-                end
+                result = stmt.execute(*type_casted_binds)
+                @affected_rows_before_warnings = stmt.affected_rows
               rescue ::Mysql2::Error
                 @statements.delete(sql)
                 raise
@@ -74,10 +70,8 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
               stmt = raw_connection.prepare(sql)
 
               begin
-                ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                  result = stmt.execute(*type_casted_binds)
-                  @affected_rows_before_warnings = stmt.affected_rows
-                end
+                result = stmt.execute(*type_casted_binds)
+                @affected_rows_before_warnings = stmt.affected_rows
 
                 # Ref: https://github.com/brianmario/mysql2/pull/1383
                 # by eagerly closing uncached prepared statements, we also reduce the chances of
@@ -100,7 +94,6 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
             raw_connection.abandon_results!
 
             verified!
-            handle_warnings(sql)
             result
           ensure
             if reset_multi_statement && active?

activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb

@@ -163,7 +163,6 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
             end
 
             verified!
-            handle_warnings(result)
 
             notification_payload[:affected_rows] = result.cmd_tuples
             notification_payload[:row_count] = result.count
@@ -215,7 +214,7 @@ def suppress_composite_primary_key(pk)
             pk unless pk.is_a?(Array)
           end
 
-          def handle_warnings(sql)
+          def handle_warnings(result, sql)
             @notice_receiver_sql_warnings.each do |warning|
               next if warning_ignored?(warning)
 

activerecord/lib/active_record/connection_adapters/trilogy/database_statements.rb

@@ -29,7 +29,6 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
               raw_connection.next_result
             end
             verified!
-            handle_warnings(sql)
 
             notification_payload[:affected_rows] = result.affected_rows
             notification_payload[:row_count] = result.count