activerecord 8.0.3 → 8.1.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (148) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +427 -522
  3. data/README.rdoc +1 -1
  4. data/lib/active_record/association_relation.rb +1 -1
  5. data/lib/active_record/associations/association.rb +1 -1
  6. data/lib/active_record/associations/builder/association.rb +16 -5
  7. data/lib/active_record/associations/builder/belongs_to.rb +17 -4
  8. data/lib/active_record/associations/builder/collection_association.rb +7 -3
  9. data/lib/active_record/associations/builder/has_one.rb +1 -1
  10. data/lib/active_record/associations/builder/singular_association.rb +33 -5
  11. data/lib/active_record/associations/collection_proxy.rb +22 -4
  12. data/lib/active_record/associations/deprecation.rb +88 -0
  13. data/lib/active_record/associations/errors.rb +3 -0
  14. data/lib/active_record/associations/join_dependency.rb +2 -0
  15. data/lib/active_record/associations/preloader/branch.rb +1 -0
  16. data/lib/active_record/associations.rb +159 -21
  17. data/lib/active_record/attribute_methods/serialization.rb +16 -3
  18. data/lib/active_record/attribute_methods.rb +1 -1
  19. data/lib/active_record/attributes.rb +3 -0
  20. data/lib/active_record/autosave_association.rb +1 -1
  21. data/lib/active_record/base.rb +2 -3
  22. data/lib/active_record/coders/json.rb +14 -5
  23. data/lib/active_record/connection_adapters/abstract/connection_handler.rb +1 -3
  24. data/lib/active_record/connection_adapters/abstract/connection_pool/queue.rb +15 -0
  25. data/lib/active_record/connection_adapters/abstract/connection_pool/reaper.rb +51 -12
  26. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +382 -51
  27. data/lib/active_record/connection_adapters/abstract/database_statements.rb +26 -30
  28. data/lib/active_record/connection_adapters/abstract/query_cache.rb +25 -18
  29. data/lib/active_record/connection_adapters/abstract/quoting.rb +15 -24
  30. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +7 -2
  31. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +26 -34
  32. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +2 -1
  33. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +85 -22
  34. data/lib/active_record/connection_adapters/abstract/transaction.rb +16 -3
  35. data/lib/active_record/connection_adapters/abstract_adapter.rb +66 -14
  36. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +43 -11
  37. data/lib/active_record/connection_adapters/column.rb +17 -4
  38. data/lib/active_record/connection_adapters/mysql/database_statements.rb +4 -4
  39. data/lib/active_record/connection_adapters/mysql/schema_creation.rb +2 -0
  40. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +42 -5
  41. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +26 -4
  42. data/lib/active_record/connection_adapters/mysql2/database_statements.rb +27 -22
  43. data/lib/active_record/connection_adapters/mysql2_adapter.rb +1 -0
  44. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +18 -23
  45. data/lib/active_record/connection_adapters/postgresql/oid/array.rb +2 -2
  46. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +1 -1
  47. data/lib/active_record/connection_adapters/postgresql/quoting.rb +21 -10
  48. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +1 -1
  49. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +8 -21
  50. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +65 -30
  51. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +74 -38
  52. data/lib/active_record/connection_adapters/postgresql_adapter.rb +10 -5
  53. data/lib/active_record/connection_adapters/schema_cache.rb +2 -2
  54. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +37 -25
  55. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +0 -8
  56. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +4 -13
  57. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +54 -30
  58. data/lib/active_record/connection_adapters/trilogy/database_statements.rb +4 -3
  59. data/lib/active_record/connection_adapters/trilogy_adapter.rb +1 -1
  60. data/lib/active_record/connection_adapters.rb +1 -0
  61. data/lib/active_record/core.rb +5 -4
  62. data/lib/active_record/counter_cache.rb +33 -8
  63. data/lib/active_record/database_configurations/database_config.rb +5 -1
  64. data/lib/active_record/database_configurations/hash_config.rb +50 -9
  65. data/lib/active_record/database_configurations/url_config.rb +13 -3
  66. data/lib/active_record/database_configurations.rb +7 -3
  67. data/lib/active_record/delegated_type.rb +1 -1
  68. data/lib/active_record/dynamic_matchers.rb +54 -69
  69. data/lib/active_record/encryption/encryptable_record.rb +4 -4
  70. data/lib/active_record/encryption/encrypted_attribute_type.rb +1 -1
  71. data/lib/active_record/encryption/scheme.rb +1 -1
  72. data/lib/active_record/enum.rb +24 -8
  73. data/lib/active_record/errors.rb +23 -7
  74. data/lib/active_record/explain_registry.rb +0 -1
  75. data/lib/active_record/filter_attribute_handler.rb +73 -0
  76. data/lib/active_record/fixtures.rb +2 -2
  77. data/lib/active_record/gem_version.rb +3 -3
  78. data/lib/active_record/inheritance.rb +1 -1
  79. data/lib/active_record/insert_all.rb +12 -7
  80. data/lib/active_record/locking/optimistic.rb +7 -0
  81. data/lib/active_record/locking/pessimistic.rb +5 -0
  82. data/lib/active_record/log_subscriber.rb +1 -5
  83. data/lib/active_record/middleware/shard_selector.rb +34 -17
  84. data/lib/active_record/migration/command_recorder.rb +14 -1
  85. data/lib/active_record/migration/compatibility.rb +34 -24
  86. data/lib/active_record/migration/default_schema_versions_formatter.rb +30 -0
  87. data/lib/active_record/migration.rb +26 -16
  88. data/lib/active_record/model_schema.rb +10 -7
  89. data/lib/active_record/nested_attributes.rb +2 -0
  90. data/lib/active_record/persistence.rb +34 -3
  91. data/lib/active_record/query_cache.rb +22 -15
  92. data/lib/active_record/query_logs.rb +3 -7
  93. data/lib/active_record/railtie.rb +32 -3
  94. data/lib/active_record/railties/databases.rake +16 -4
  95. data/lib/active_record/railties/job_checkpoints.rb +15 -0
  96. data/lib/active_record/railties/job_runtime.rb +10 -11
  97. data/lib/active_record/reflection.rb +42 -3
  98. data/lib/active_record/relation/batches.rb +26 -12
  99. data/lib/active_record/relation/calculations.rb +20 -9
  100. data/lib/active_record/relation/delegation.rb +0 -1
  101. data/lib/active_record/relation/finder_methods.rb +27 -11
  102. data/lib/active_record/relation/merger.rb +2 -2
  103. data/lib/active_record/relation/predicate_builder.rb +2 -2
  104. data/lib/active_record/relation/query_attribute.rb +3 -1
  105. data/lib/active_record/relation/query_methods.rb +39 -29
  106. data/lib/active_record/relation/where_clause.rb +1 -10
  107. data/lib/active_record/relation.rb +25 -13
  108. data/lib/active_record/result.rb +44 -21
  109. data/lib/active_record/sanitization.rb +2 -0
  110. data/lib/active_record/schema_dumper.rb +12 -10
  111. data/lib/active_record/scoping.rb +0 -1
  112. data/lib/active_record/signed_id.rb +43 -15
  113. data/lib/active_record/statement_cache.rb +13 -9
  114. data/lib/active_record/store.rb +44 -19
  115. data/lib/active_record/tasks/abstract_tasks.rb +76 -0
  116. data/lib/active_record/tasks/database_tasks.rb +2 -21
  117. data/lib/active_record/tasks/mysql_database_tasks.rb +3 -40
  118. data/lib/active_record/tasks/postgresql_database_tasks.rb +5 -39
  119. data/lib/active_record/tasks/sqlite_database_tasks.rb +14 -26
  120. data/lib/active_record/test_databases.rb +10 -2
  121. data/lib/active_record/test_fixtures.rb +27 -2
  122. data/lib/active_record/testing/query_assertions.rb +8 -2
  123. data/lib/active_record/timestamp.rb +4 -2
  124. data/lib/active_record/transaction.rb +2 -5
  125. data/lib/active_record/transactions.rb +32 -10
  126. data/lib/active_record/type/hash_lookup_type_map.rb +2 -1
  127. data/lib/active_record/type/internal/timezone.rb +7 -0
  128. data/lib/active_record/type/json.rb +15 -2
  129. data/lib/active_record/type/serialized.rb +11 -4
  130. data/lib/active_record/type/type_map.rb +1 -1
  131. data/lib/active_record/type_caster/connection.rb +2 -1
  132. data/lib/active_record/validations/associated.rb +1 -1
  133. data/lib/active_record.rb +65 -3
  134. data/lib/arel/alias_predication.rb +2 -0
  135. data/lib/arel/crud.rb +6 -11
  136. data/lib/arel/nodes/count.rb +2 -2
  137. data/lib/arel/nodes/function.rb +4 -10
  138. data/lib/arel/nodes/named_function.rb +2 -2
  139. data/lib/arel/nodes/node.rb +1 -1
  140. data/lib/arel/nodes.rb +0 -2
  141. data/lib/arel/select_manager.rb +7 -2
  142. data/lib/arel/visitors/dot.rb +0 -3
  143. data/lib/arel/visitors/postgresql.rb +55 -0
  144. data/lib/arel/visitors/sqlite.rb +55 -8
  145. data/lib/arel/visitors/to_sql.rb +3 -21
  146. data/lib/arel.rb +3 -1
  147. metadata +13 -9
  148. data/lib/active_record/normalization.rb +0 -163
@@ -14,12 +14,12 @@ module ActiveRecord
14
14
  class NullPool # :nodoc:
15
15
  include ConnectionAdapters::AbstractPool
16
16
 
17
- class NullConfig # :nodoc:
17
+ class NullConfig
18
18
  def method_missing(...)
19
19
  nil
20
20
  end
21
21
  end
22
- NULL_CONFIG = NullConfig.new # :nodoc:
22
+ NULL_CONFIG = NullConfig.new
23
23
 
24
24
  def initialize
25
25
  super()
@@ -36,7 +36,6 @@ module ActiveRecord
36
36
  end
37
37
 
38
38
  def schema_cache; end
39
- def query_cache; end
40
39
  def connection_descriptor; end
41
40
  def checkin(_); end
42
41
  def remove(_); end
@@ -49,6 +48,11 @@ module ActiveRecord
49
48
  def dirties_query_cache
50
49
  true
51
50
  end
51
+
52
+ def pool_transaction_isolation_level; end
53
+ def pool_transaction_isolation_level=(isolation_level)
54
+ raise NotImplementedError, "This method should never be called"
55
+ end
52
56
  end
53
57
 
54
58
  # = Active Record Connection Pool
@@ -101,13 +105,20 @@ module ActiveRecord
101
105
  # There are several connection-pooling-related options that you can add to
102
106
  # your database connection configuration:
103
107
  #
104
- # * +pool+: maximum number of connections the pool may manage (default 5).
105
- # * +idle_timeout+: number of seconds that a connection will be kept
106
- # unused in the pool before it is automatically disconnected (default
107
- # 300 seconds). Set this to zero to keep connections forever.
108
108
  # * +checkout_timeout+: number of seconds to wait for a connection to
109
109
  # become available before giving up and raising a timeout error (default
110
110
  # 5 seconds).
111
+ # * +idle_timeout+: number of seconds that a connection will be kept
112
+ # unused in the pool before it is automatically disconnected (default
113
+ # 300 seconds). Set this to zero to keep connections forever.
114
+ # * +keepalive+: number of seconds between keepalive checks if the
115
+ # connection has been idle (default 600 seconds).
116
+ # * +max_age+: number of seconds the pool will allow the connection to
117
+ # exist before retiring it at next checkin. (default Float::INFINITY).
118
+ # * +max_connections+: maximum number of connections the pool may manage (default 5).
119
+ # * +min_connections+: minimum number of connections the pool will open and maintain (default 0).
120
+ # * +pool_jitter+: maximum reduction factor to apply to +max_age+ and
121
+ # +keepalive+ intervals (default 0.2; range 0.0-1.0).
111
122
  #
112
123
  #--
113
124
  # Synchronization policy:
@@ -115,6 +126,7 @@ module ActiveRecord
115
126
  # * access to these instance variables needs to be in +synchronize+:
116
127
  # * @connections
117
128
  # * @now_connecting
129
+ # * @maintaining
118
130
  # * private methods that require being called in a +synchronize+ blocks
119
131
  # are now explicitly documented
120
132
  class ConnectionPool
@@ -220,7 +232,8 @@ module ActiveRecord
220
232
  include ConnectionAdapters::AbstractPool
221
233
 
222
234
  attr_accessor :automatic_reconnect, :checkout_timeout
223
- attr_reader :db_config, :size, :reaper, :pool_config, :async_executor, :role, :shard
235
+ attr_reader :db_config, :max_connections, :min_connections, :max_age, :keepalive, :reaper, :pool_config, :async_executor, :role, :shard
236
+ alias :size :max_connections
224
237
 
225
238
  delegate :schema_reflection, :server_version, to: :pool_config
226
239
 
@@ -240,7 +253,10 @@ module ActiveRecord
240
253
 
241
254
  @checkout_timeout = db_config.checkout_timeout
242
255
  @idle_timeout = db_config.idle_timeout
243
- @size = db_config.pool
256
+ @max_connections = db_config.max_connections
257
+ @min_connections = db_config.min_connections
258
+ @max_age = db_config.max_age
259
+ @keepalive = db_config.keepalive
244
260
 
245
261
  # This variable tracks the cache of threads mapped to reserved connections, with the
246
262
  # sole purpose of speeding up the +connection+ method. It is not the authoritative
@@ -262,6 +278,12 @@ module ActiveRecord
262
278
  # currently in the process of independently establishing connections to the DB.
263
279
  @now_connecting = 0
264
280
 
281
+ # Sometimes otherwise-idle connections are temporarily held by the Reaper for
282
+ # maintenance. This variable tracks the number of connections currently in that
283
+ # state -- if a thread requests a connection and there are none available, it
284
+ # will await any in-maintenance connections in preference to creating a new one.
285
+ @maintaining = 0
286
+
265
287
  @threads_blocking_new_connections = 0
266
288
 
267
289
  @available = ConnectionLeasingQueue.new self
@@ -272,13 +294,17 @@ module ActiveRecord
272
294
 
273
295
  @schema_cache = nil
274
296
 
297
+ @activated = false
298
+ @original_context = ActiveSupport::IsolatedExecutionState.context
299
+
300
+ @reaper_lock = Monitor.new
275
301
  @reaper = Reaper.new(self, db_config.reaping_frequency)
276
302
  @reaper.run
277
303
  end
278
304
 
279
305
  def inspect # :nodoc:
280
- name_field = " name=#{db_config.name.inspect}" unless db_config.name == "primary"
281
- shard_field = " shard=#{@shard.inspect}" unless @shard == :default
306
+ name_field = " name=#{name_inspect}" if name_inspect
307
+ shard_field = " shard=#{shard_inspect}" if shard_inspect
282
308
 
283
309
  "#<#{self.class.name} env_name=#{db_config.env_name.inspect}#{name_field} role=#{role.inspect}#{shard_field}>"
284
310
  end
@@ -308,6 +334,14 @@ module ActiveRecord
308
334
  InternalMetadata.new(self)
309
335
  end
310
336
 
337
+ def activate
338
+ @activated = true
339
+ end
340
+
341
+ def activated?
342
+ @activated
343
+ end
344
+
311
345
  # Retrieve the connection associated with the current thread, or call
312
346
  # #checkout to obtain one if necessary.
313
347
  #
@@ -315,9 +349,8 @@ module ActiveRecord
315
349
  # held in a cache keyed by a thread.
316
350
  def lease_connection
317
351
  lease = connection_lease
318
- lease.connection ||= checkout
319
352
  lease.sticky = true
320
- lease.connection
353
+ lease.connection ||= checkout
321
354
  end
322
355
 
323
356
  def permanent_lease? # :nodoc:
@@ -335,7 +368,6 @@ module ActiveRecord
335
368
  end
336
369
 
337
370
  @pinned_connection.lock_thread = ActiveSupport::IsolatedExecutionState.context if lock_thread
338
- @pinned_connection.pinned = true
339
371
  @pinned_connection.verify! # eagerly validate the connection
340
372
  @pinned_connection.begin_transaction joinable: false, _lazy: false
341
373
  end
@@ -358,7 +390,6 @@ module ActiveRecord
358
390
  end
359
391
 
360
392
  if @pinned_connection.nil?
361
- connection.pinned = false
362
393
  connection.steal!
363
394
  connection.lock_thread = nil
364
395
  checkin(connection)
@@ -390,6 +421,8 @@ module ActiveRecord
390
421
  # #lease_connection or #with_connection methods, connections obtained through
391
422
  # #checkout will not be automatically released.
392
423
  def release_connection(existing_lease = nil)
424
+ return if self.discarded?
425
+
393
426
  if conn = connection_lease.release
394
427
  checkin conn
395
428
  return true
@@ -427,6 +460,24 @@ module ActiveRecord
427
460
  end
428
461
  end
429
462
 
463
+ def with_pool_transaction_isolation_level(isolation_level, transaction_open, &block) # :nodoc:
464
+ if !ActiveRecord.default_transaction_isolation_level.nil?
465
+ begin
466
+ if transaction_open && self.pool_transaction_isolation_level != ActiveRecord.default_transaction_isolation_level
467
+ raise ActiveRecord::TransactionIsolationError, "cannot set default isolation level while transaction is open"
468
+ end
469
+
470
+ old_level = self.pool_transaction_isolation_level
471
+ self.pool_transaction_isolation_level = isolation_level
472
+ yield
473
+ ensure
474
+ self.pool_transaction_isolation_level = old_level
475
+ end
476
+ else
477
+ yield
478
+ end
479
+ end
480
+
430
481
  # Returns true if a connection has already been opened.
431
482
  def connected?
432
483
  synchronize { @connections.any?(&:connected?) }
@@ -454,18 +505,26 @@ module ActiveRecord
454
505
  # connections in the pool within a timeout interval (default duration is
455
506
  # <tt>spec.db_config.checkout_timeout * 2</tt> seconds).
456
507
  def disconnect(raise_on_acquisition_timeout = true)
457
- with_exclusively_acquired_all_connections(raise_on_acquisition_timeout) do
458
- synchronize do
459
- @connections.each do |conn|
460
- if conn.in_use?
461
- conn.steal!
462
- checkin conn
508
+ @reaper_lock.synchronize do
509
+ return if self.discarded?
510
+
511
+ with_exclusively_acquired_all_connections(raise_on_acquisition_timeout) do
512
+ synchronize do
513
+ return if self.discarded?
514
+ @connections.each do |conn|
515
+ if conn.in_use?
516
+ conn.steal!
517
+ checkin conn
518
+ end
519
+ conn.disconnect!
463
520
  end
464
- conn.disconnect!
521
+ @connections = []
522
+ @leases.clear
523
+ @available.clear
524
+
525
+ # Stop maintaining the minimum size until reactivated
526
+ @activated = false
465
527
  end
466
- @connections = []
467
- @leases.clear
468
- @available.clear
469
528
  end
470
529
  end
471
530
  end
@@ -486,12 +545,14 @@ module ActiveRecord
486
545
  #
487
546
  # See AbstractAdapter#discard!
488
547
  def discard! # :nodoc:
489
- synchronize do
490
- return if self.discarded?
491
- @connections.each do |conn|
492
- conn.discard!
548
+ @reaper_lock.synchronize do
549
+ synchronize do
550
+ return if self.discarded?
551
+ @connections.each do |conn|
552
+ conn.discard!
553
+ end
554
+ @connections = @available = @leases = nil
493
555
  end
494
- @connections = @available = @leases = nil
495
556
  end
496
557
  end
497
558
 
@@ -499,6 +560,16 @@ module ActiveRecord
499
560
  @connections.nil?
500
561
  end
501
562
 
563
+ def maintainable? # :nodoc:
564
+ synchronize do
565
+ @connections&.size&.> 0 || (activated? && @min_connections > 0)
566
+ end
567
+ end
568
+
569
+ def reaper_lock(&block) # :nodoc:
570
+ @reaper_lock.synchronize(&block)
571
+ end
572
+
502
573
  # Clears reloadable connections from the pool and re-connects connections that
503
574
  # require reloading.
504
575
  #
@@ -604,7 +675,7 @@ module ActiveRecord
604
675
  @available.delete conn
605
676
 
606
677
  # @available.any_waiting? => true means that prior to removing this
607
- # conn, the pool was at its max size (@connections.size == @size).
678
+ # conn, the pool was at its max size (@connections.size == @max_connections).
608
679
  # This would mean that any threads stuck waiting in the queue wouldn't
609
680
  # know they could checkout_new_connection, so let's do it for them.
610
681
  # Because condition-wait loop is encapsulated in the Queue class
@@ -612,14 +683,14 @@ module ActiveRecord
612
683
  # that are "stuck" there are helpless. They have no way of creating
613
684
  # new connections and are completely reliant on us feeding available
614
685
  # connections into the Queue.
615
- needs_new_connection = @available.any_waiting?
686
+ needs_new_connection = @available.num_waiting > @maintaining
616
687
  end
617
688
 
618
689
  # This is intentionally done outside of the synchronized section as we
619
690
  # would like not to hold the main mutex while checking out new connections.
620
691
  # Thus there is some chance that needs_new_connection information is now
621
692
  # stale, we can live with that (bulk_make_new_connections will make
622
- # sure not to exceed the pool's @size limit).
693
+ # sure not to exceed the pool's @max_connections limit).
623
694
  bulk_make_new_connections(1) if needs_new_connection
624
695
  end
625
696
 
@@ -652,11 +723,27 @@ module ActiveRecord
652
723
  def flush(minimum_idle = @idle_timeout)
653
724
  return if minimum_idle.nil?
654
725
 
655
- idle_connections = synchronize do
726
+ removed_connections = synchronize do
656
727
  return if self.discarded?
657
- @connections.select do |conn|
728
+
729
+ idle_connections = @connections.select do |conn|
658
730
  !conn.in_use? && conn.seconds_idle >= minimum_idle
659
- end.each do |conn|
731
+ end.sort_by { |conn| -conn.seconds_idle } # sort longest idle first
732
+
733
+ # Don't go below our configured pool minimum unless we're flushing
734
+ # everything
735
+ idles_to_retain =
736
+ if minimum_idle > 0
737
+ @min_connections - (@connections.size - idle_connections.size)
738
+ else
739
+ 0
740
+ end
741
+
742
+ if idles_to_retain > 0
743
+ idle_connections.pop idles_to_retain
744
+ end
745
+
746
+ idle_connections.each do |conn|
660
747
  conn.lease
661
748
 
662
749
  @available.delete conn
@@ -664,22 +751,108 @@ module ActiveRecord
664
751
  end
665
752
  end
666
753
 
667
- idle_connections.each do |conn|
754
+ removed_connections.each do |conn|
668
755
  conn.disconnect!
669
756
  end
670
757
  end
671
758
 
672
759
  # Disconnect all currently idle connections. Connections currently checked
673
- # out are unaffected.
760
+ # out are unaffected. The pool will stop maintaining its minimum size until
761
+ # it is reactivated (such as by a subsequent checkout).
674
762
  def flush!
675
763
  reap
676
764
  flush(-1)
765
+
766
+ # Stop maintaining the minimum size until reactivated
767
+ @activated = false
768
+ end
769
+
770
+ # Ensure that the pool contains at least the configured minimum number of
771
+ # connections.
772
+ def prepopulate
773
+ need_new_connections = nil
774
+
775
+ synchronize do
776
+ return if self.discarded?
777
+
778
+ # We don't want to start prepopulating until we know the pool is wanted,
779
+ # so we can avoid maintaining full pools in one-off scripts etc.
780
+ return unless @activated
781
+
782
+ need_new_connections = @connections.size < @min_connections
783
+ end
784
+
785
+ if need_new_connections
786
+ while new_conn = try_to_checkout_new_connection { @connections.size < @min_connections }
787
+ checkin(new_conn)
788
+ end
789
+ end
790
+ end
791
+
792
+ def retire_old_connections(max_age = @max_age)
793
+ max_age ||= Float::INFINITY
794
+
795
+ sequential_maintenance -> c { c.connection_age&.>= c.pool_jitter(max_age) } do |conn|
796
+ # Disconnect, then return the adapter to the pool. Preconnect will
797
+ # handle the rest.
798
+ conn.disconnect!
799
+ end
800
+ end
801
+
802
+ # Preconnect all connections in the pool. This saves pool users from
803
+ # having to wait for a connection to be established when first using it
804
+ # after checkout.
805
+ def preconnect
806
+ sequential_maintenance -> c { (!c.connected? || !c.verified?) && c.allow_preconnect } do |conn|
807
+ conn.connect!
808
+ rescue
809
+ # Wholesale rescue: there's nothing we can do but move on. The
810
+ # connection will go back to the pool, and the next consumer will
811
+ # presumably try to connect again -- which will either work, or
812
+ # fail and they'll be able to report the exception.
813
+ end
814
+ end
815
+
816
+ # Prod any connections that have been idle for longer than the configured
817
+ # keepalive time. This will incidentally verify the connection is still
818
+ # alive, but the main purpose is to show the server (and any intermediate
819
+ # network hops) that we're still here and using the connection.
820
+ def keep_alive(threshold = @keepalive)
821
+ return if threshold.nil?
822
+
823
+ sequential_maintenance -> c { (c.seconds_since_last_activity || 0) > c.pool_jitter(threshold) } do |conn|
824
+ # conn.active? will cause some amount of network activity, which is all
825
+ # we need to provide a keepalive signal.
826
+ #
827
+ # If it returns false, the connection is already broken; disconnect,
828
+ # so it can be found and repaired.
829
+ conn.disconnect! unless conn.active?
830
+ end
831
+ end
832
+
833
+ # Immediately mark all current connections as due for replacement,
834
+ # equivalent to them having reached +max_age+ -- even if there is
835
+ # no +max_age+ configured.
836
+ def recycle!
837
+ synchronize do
838
+ return if self.discarded?
839
+
840
+ @connections.each do |conn|
841
+ conn.force_retirement
842
+ end
843
+ end
844
+
845
+ retire_old_connections
677
846
  end
678
847
 
679
848
  def num_waiting_in_queue # :nodoc:
680
849
  @available.num_waiting
681
850
  end
682
851
 
852
+ def num_available_in_queue # :nodoc:
853
+ @available.size
854
+ end
855
+
683
856
  # Returns the connection pool's usage statistic.
684
857
  #
685
858
  # ActiveRecord::Base.connection_pool.stat # => { size: 15, connections: 1, busy: 1, dead: 0, idle: 0, waiting: 0, checkout_timeout: 5 }
@@ -710,6 +883,16 @@ module ActiveRecord
710
883
  raise ex.set_pool(self)
711
884
  end
712
885
 
886
+ def pool_transaction_isolation_level
887
+ isolation_level_key = "activerecord_pool_transaction_isolation_level_#{db_config.name}"
888
+ ActiveSupport::IsolatedExecutionState[isolation_level_key]
889
+ end
890
+
891
+ def pool_transaction_isolation_level=(isolation_level)
892
+ isolation_level_key = "activerecord_pool_transaction_isolation_level_#{db_config.name}"
893
+ ActiveSupport::IsolatedExecutionState[isolation_level_key] = isolation_level
894
+ end
895
+
713
896
  private
714
897
  def connection_lease
715
898
  @leases[ActiveSupport::IsolatedExecutionState.context]
@@ -719,7 +902,9 @@ module ActiveRecord
719
902
  case ActiveRecord.async_query_executor
720
903
  when :multi_thread_pool
721
904
  if @db_config.max_threads > 0
905
+ name_with_shard = [name_inspect, shard_inspect].join("-").tr("_", "-")
722
906
  Concurrent::ThreadPoolExecutor.new(
907
+ name: "ActiveRecord-#{name_with_shard}-async-query-executor",
723
908
  min_threads: @db_config.min_threads,
724
909
  max_threads: @db_config.max_threads,
725
910
  max_queue: @db_config.max_queue,
@@ -731,11 +916,109 @@ module ActiveRecord
731
916
  end
732
917
  end
733
918
 
919
+ # Perform maintenance work on pool connections. This method will
920
+ # select a connection to work on by calling the +candidate_selector+
921
+ # proc while holding the pool lock. If a connection is selected, it
922
+ # will be checked out for maintenance and passed to the
923
+ # +maintenance_work+ proc. The connection will always be returned to
924
+ # the pool after the proc completes.
925
+ #
926
+ # If the pool has async threads, all work will be scheduled there.
927
+ # Otherwise, this method will block until all work is complete.
928
+ #
929
+ # Each connection will only be processed once per call to this method,
930
+ # but (particularly in the async case) there is no protection against
931
+ # a second call to this method starting to work through the list
932
+ # before the first call has completed. (Though regular pool behaviour
933
+ # will prevent two instances from working on the same specific
934
+ # connection at the same time.)
935
+ def sequential_maintenance(candidate_selector, &maintenance_work)
936
+ # This hash doesn't need to be synchronized, because it's only
937
+ # used by one thread at a time: the +perform_work+ block gives
938
+ # up its right to +connections_visited+ when it schedules the
939
+ # next iteration.
940
+ connections_visited = Hash.new(false)
941
+ connections_visited.compare_by_identity
942
+
943
+ perform_work = lambda do
944
+ connection_to_maintain = nil
945
+
946
+ synchronize do
947
+ unless self.discarded?
948
+ if connection_to_maintain = @connections.select { |conn| !conn.in_use? }.select(&candidate_selector).sort_by(&:seconds_idle).find { |conn| !connections_visited[conn] }
949
+ checkout_for_maintenance connection_to_maintain
950
+ end
951
+ end
952
+ end
953
+
954
+ if connection_to_maintain
955
+ connections_visited[connection_to_maintain] = true
956
+
957
+ # If we're running async, we can schedule the next round of work
958
+ # as soon as we've grabbed a connection to work on.
959
+ @async_executor&.post(&perform_work)
960
+
961
+ begin
962
+ maintenance_work.call connection_to_maintain
963
+ ensure
964
+ return_from_maintenance connection_to_maintain
965
+ end
966
+
967
+ true
968
+ end
969
+ end
970
+
971
+ if @async_executor
972
+ @async_executor.post(&perform_work)
973
+ else
974
+ nil while perform_work.call
975
+ end
976
+ end
977
+
978
+ # Directly check a specific connection out of the pool. Skips callbacks.
979
+ #
980
+ # The connection must later either #return_from_maintenance or
981
+ # #remove_from_maintenance, or the pool will hang.
982
+ def checkout_for_maintenance(conn)
983
+ synchronize do
984
+ @maintaining += 1
985
+ @available.delete(conn)
986
+ conn.lease
987
+ conn
988
+ end
989
+ end
990
+
991
+ # Return a connection to the pool after it has been checked out for
992
+ # maintenance. Does not update the connection's idle time, and skips
993
+ # callbacks.
994
+ #--
995
+ # We assume that a connection that has required maintenance is less
996
+ # desirable (either it's been idle for a long time, or it was just
997
+ # created and hasn't been used yet). We'll put it at the back of the
998
+ # queue.
999
+ def return_from_maintenance(conn)
1000
+ synchronize do
1001
+ conn.expire(false)
1002
+ @available.add_back(conn)
1003
+ @maintaining -= 1
1004
+ end
1005
+ end
1006
+
1007
+ # Remove a connection from the pool after it has been checked out for
1008
+ # maintenance. It will be automatically replaced with a new connection if
1009
+ # necessary.
1010
+ def remove_from_maintenance(conn)
1011
+ synchronize do
1012
+ @maintaining -= 1
1013
+ remove conn
1014
+ end
1015
+ end
1016
+
734
1017
  #--
735
1018
  # this is unfortunately not concurrent
736
1019
  def bulk_make_new_connections(num_new_conns_needed)
737
1020
  num_new_conns_needed.times do
738
- # try_to_checkout_new_connection will not exceed pool's @size limit
1021
+ # try_to_checkout_new_connection will not exceed pool's @max_connections limit
739
1022
  if new_conn = try_to_checkout_new_connection
740
1023
  # make the new_conn available to the starving threads stuck @available Queue
741
1024
  checkin(new_conn)
@@ -748,9 +1031,11 @@ module ActiveRecord
748
1031
  # wrap it in +synchronize+ because some pool's actions are allowed
749
1032
  # to be performed outside of the main +synchronize+ block.
750
1033
  def with_exclusively_acquired_all_connections(raise_on_acquisition_timeout = true)
751
- with_new_connections_blocked do
752
- attempt_to_checkout_all_existing_connections(raise_on_acquisition_timeout)
753
- yield
1034
+ @reaper_lock.synchronize do
1035
+ with_new_connections_blocked do
1036
+ attempt_to_checkout_all_existing_connections(raise_on_acquisition_timeout)
1037
+ yield
1038
+ end
754
1039
  end
755
1040
  end
756
1041
 
@@ -870,13 +1155,13 @@ module ActiveRecord
870
1155
  # <tt>synchronize { conn.lease }</tt> in this method, but by leaving it to <tt>@available.poll</tt>
871
1156
  # and +try_to_checkout_new_connection+ we can piggyback on +synchronize+ sections
872
1157
  # of the said methods and avoid an additional +synchronize+ overhead.
873
- if conn = @available.poll || try_to_checkout_new_connection
1158
+ if conn = @available.poll || try_to_queue_for_background_connection(checkout_timeout) || try_to_checkout_new_connection
874
1159
  conn
875
1160
  else
876
1161
  reap
877
1162
  # Retry after reaping, which may return an available connection,
878
1163
  # remove an inactive connection, or both
879
- if conn = @available.poll || try_to_checkout_new_connection
1164
+ if conn = @available.poll || try_to_queue_for_background_connection(checkout_timeout) || try_to_checkout_new_connection
880
1165
  conn
881
1166
  else
882
1167
  @available.poll(checkout_timeout)
@@ -886,6 +1171,31 @@ module ActiveRecord
886
1171
  raise ex.set_pool(self)
887
1172
  end
888
1173
 
1174
+ #--
1175
+ # If new connections are already being established in the background,
1176
+ # and there are fewer threads already waiting than the number of
1177
+ # upcoming connections, we can just get in queue and wait to be handed a
1178
+ # connection. This avoids us overshooting the required connection count
1179
+ # by starting a new connection ourselves, and is likely to be faster
1180
+ # too (because at least some of the time it takes to establish a new
1181
+ # connection must have already passed).
1182
+ #
1183
+ # If background connections are available, this method will block and
1184
+ # return a connection. If no background connections are available, it
1185
+ # will immediately return +nil+.
1186
+ def try_to_queue_for_background_connection(checkout_timeout)
1187
+ return unless @maintaining > 0
1188
+
1189
+ synchronize do
1190
+ return unless @maintaining > @available.num_waiting
1191
+
1192
+ # We are guaranteed the "maintaining" thread will return its promised
1193
+ # connection within one maintenance-unit of time. Thus we can safely
1194
+ # do a blocking wait with (functionally) no timeout.
1195
+ @available.poll(100)
1196
+ end
1197
+ end
1198
+
889
1199
  #--
890
1200
  # if owner_thread param is omitted, this must be called in synchronize block
891
1201
  def remove_connection_from_thread_cache(conn, owner_thread = conn.owner)
@@ -895,17 +1205,26 @@ module ActiveRecord
895
1205
  end
896
1206
  alias_method :release, :remove_connection_from_thread_cache
897
1207
 
898
- # If the pool is not at a <tt>@size</tt> limit, establish new connection. Connecting
1208
+ # If the pool is not at a <tt>@max_connections</tt> limit, establish new connection. Connecting
899
1209
  # to the DB is done outside main synchronized section.
1210
+ #
1211
+ # If a block is supplied, it is an additional constraint (checked while holding the
1212
+ # pool lock) on whether a new connection should be established.
900
1213
  #--
901
1214
  # Implementation constraint: a newly established connection returned by this
902
1215
  # method must be in the +.leased+ state.
903
1216
  def try_to_checkout_new_connection
904
1217
  # first in synchronized section check if establishing new conns is allowed
905
- # and increment @now_connecting, to prevent overstepping this pool's @size
1218
+ # and increment @now_connecting, to prevent overstepping this pool's @max_connections
906
1219
  # constraint
907
1220
  do_checkout = synchronize do
908
- if @threads_blocking_new_connections.zero? && (@connections.size + @now_connecting) < @size
1221
+ return if self.discarded?
1222
+
1223
+ if @threads_blocking_new_connections.zero? && (@connections.size + @now_connecting) < @max_connections && (!block_given? || yield)
1224
+ if @connections.size > 0 || @original_context != ActiveSupport::IsolatedExecutionState.context
1225
+ @activated = true
1226
+ end
1227
+
909
1228
  @now_connecting += 1
910
1229
  end
911
1230
  end
@@ -916,12 +1235,16 @@ module ActiveRecord
916
1235
  conn = checkout_new_connection
917
1236
  ensure
918
1237
  synchronize do
1238
+ @now_connecting -= 1
919
1239
  if conn
920
- adopt_connection(conn)
921
- # returned conn needs to be already leased
922
- conn.lease
1240
+ if self.discarded?
1241
+ conn.discard!
1242
+ else
1243
+ adopt_connection(conn)
1244
+ # returned conn needs to be already leased
1245
+ conn.lease
1246
+ end
923
1247
  end
924
- @now_connecting -= 1
925
1248
  end
926
1249
  end
927
1250
  end
@@ -953,6 +1276,14 @@ module ActiveRecord
953
1276
  c.disconnect!
954
1277
  raise
955
1278
  end
1279
+
1280
+ def name_inspect
1281
+ db_config.name.inspect unless db_config.name == "primary"
1282
+ end
1283
+
1284
+ def shard_inspect
1285
+ shard.inspect unless shard == :default
1286
+ end
956
1287
  end
957
1288
  end
958
1289
  end