Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize slow tests in activerecord #47510

Merged
merged 1 commit into from Mar 13, 2023
Merged

Optimize slow tests in activerecord #47510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
135 changes: 68 additions & 67 deletions activerecord/test/cases/connection_adapters/schema_cache_test.rb
View file
Open in desktop
Expand Up @@ -6,14 +6,15 @@ module ActiveRecord
module ConnectionAdapters
class SchemaCacheTest < ActiveRecord::TestCase
def setup
@connection = ActiveRecord::Base.connection
@connection = ARUnit2Model.connection
@cache = SchemaCache.new @connection
@database_version = @connection.get_database_version
end

def test_yaml_dump_and_load
connection = ActiveRecord::Base.connection
# Create an empty cache.
cache = SchemaCache.new @connection
cache = SchemaCache.new connection

tempfile = Tempfile.new(["schema_cache-", ".yml"])
# Dump it. It should get populated before dumping.
Expand All @@ -25,7 +26,7 @@ def test_yaml_dump_and_load
# Give it a connection. Usually the connection
# would get set on the cache when it's retrieved
# from the pool.
cache.connection = @connection
cache.connection = connection

assert_no_queries do
assert_equal 12, cache.columns("posts").size
Expand Down Expand Up @@ -70,11 +71,11 @@ def test_yaml_dump_and_load_with_gzip
cache.connection = @connection

assert_no_queries do
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size
assert_equal @database_version.to_s, cache.database_version.to_s
end

Expand All @@ -85,11 +86,11 @@ def test_yaml_dump_and_load_with_gzip
cache.connection = @connection

assert_no_queries do
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size
assert_equal @database_version.to_s, cache.database_version.to_s
end
ensure
Expand All @@ -98,7 +99,7 @@ def test_yaml_dump_and_load_with_gzip

def test_yaml_loads_5_1_dump
cache = SchemaCache.load_from(schema_dump_path)
cache.connection = @connection
cache.connection = ActiveRecord::Base.connection

assert_no_queries do
assert_equal 11, cache.columns("posts").size
Expand All @@ -110,7 +111,7 @@ def test_yaml_loads_5_1_dump

def test_yaml_loads_5_1_dump_without_indexes_still_queries_for_indexes
cache = SchemaCache.load_from(schema_dump_path)
cache.connection = @connection
cache.connection = ActiveRecord::Base.connection

assert_queries :any, ignore_none: true do
assert_equal 1, cache.indexes("posts").size
Expand All @@ -119,7 +120,7 @@ def test_yaml_loads_5_1_dump_without_indexes_still_queries_for_indexes

def test_yaml_loads_5_1_dump_without_database_version_still_queries_for_database_version
cache = SchemaCache.load_from(schema_dump_path)
cache.connection = @connection
cache.connection = ActiveRecord::Base.connection

# We can't verify queries get executed because the database version gets
# cached in both MySQL and PostgreSQL outside of the schema cache.
Expand All @@ -128,15 +129,15 @@ def test_yaml_loads_5_1_dump_without_database_version_still_queries_for_database
end

def test_primary_key_for_existent_table
assert_equal "id", @cache.primary_keys("posts")
assert_equal "id", @cache.primary_keys("courses")
end

def test_primary_key_for_non_existent_table
assert_nil @cache.primary_keys("omgponies")
end

def test_columns_for_existent_table
assert_equal 12, @cache.columns("posts").size
assert_equal 3, @cache.columns("courses").size
end

def test_columns_for_non_existent_table
Expand All @@ -146,7 +147,7 @@ def test_columns_for_non_existent_table
end

def test_columns_hash_for_existent_table
assert_equal 12, @cache.columns_hash("posts").size
assert_equal 3, @cache.columns_hash("courses").size
end

def test_columns_hash_for_non_existent_table
Expand All @@ -156,7 +157,7 @@ def test_columns_hash_for_non_existent_table
end

def test_indexes_for_existent_table
assert_equal 1, @cache.indexes("posts").size
assert_equal 1, @cache.indexes("courses").size
end

def test_indexes_for_non_existent_table
Expand All @@ -176,11 +177,11 @@ def test_caches_database_version
end

def test_clearing
@cache.columns("posts")
@cache.columns_hash("posts")
@cache.data_sources("posts")
@cache.primary_keys("posts")
@cache.indexes("posts")
@cache.columns("courses")
@cache.columns_hash("courses")
@cache.data_sources("courses")
@cache.primary_keys("courses")
@cache.indexes("courses")

@cache.clear!

Expand All @@ -193,17 +194,17 @@ def test_marshal_dump_and_load
cache = SchemaCache.new @connection

# Populate it.
cache.add("posts")
cache.add("courses")

# Create a new cache by marshal dumping / loading.
cache = Marshal.load(Marshal.dump(cache))

assert_no_queries do
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size
assert_equal @database_version.to_s, cache.database_version.to_s
end
end
Expand All @@ -221,11 +222,11 @@ def test_marshal_dump_and_load_via_disk
cache.connection = @connection

assert_no_queries do
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size
assert_equal @database_version.to_s, cache.database_version.to_s
end
ensure
Expand All @@ -234,7 +235,7 @@ def test_marshal_dump_and_load_via_disk

def test_marshal_dump_and_load_with_ignored_tables
old_ignore = ActiveRecord.schema_cache_ignored_tables
ActiveRecord.schema_cache_ignored_tables = ["p_schema_migrations"]
ActiveRecord.schema_cache_ignored_tables = ["professors"]
# Create an empty cache.
cache = SchemaCache.new @connection

Expand All @@ -247,23 +248,23 @@ def test_marshal_dump_and_load_with_ignored_tables
cache.connection = @connection

# Assert a table in the cache
assert cache.data_sources("posts"), "expected posts to be in the cached data_sources"
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert cache.data_sources("courses"), "expected courses to be in the cached data_sources"
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size

# Assert ignored table. Behavior should match non-existent table.
assert_nil cache.data_sources("p_schema_migrations"), "expected comments to not be in the cached data_sources"
assert_nil cache.data_sources("professors"), "expected professors to not be in the cached data_sources"
assert_raises ActiveRecord::StatementInvalid do
cache.columns("p_schema_migrations")
cache.columns("professors")
end
assert_raises ActiveRecord::StatementInvalid do
cache.columns_hash("p_schema_migrations").size
cache.columns_hash("professors").size
end
assert_nil cache.primary_keys("p_schema_migrations")
assert_equal [], cache.indexes("p_schema_migrations")
assert_nil cache.primary_keys("professors")
assert_equal [], cache.indexes("professors")
ensure
tempfile.unlink
ActiveRecord.schema_cache_ignored_tables = old_ignore
Expand All @@ -282,11 +283,11 @@ def test_marshal_dump_and_load_with_gzip
cache.connection = @connection

assert_no_queries do
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size
assert_equal @database_version.to_s, cache.database_version.to_s
end

Expand All @@ -295,46 +296,46 @@ def test_marshal_dump_and_load_with_gzip
cache.connection = @connection

assert_no_queries do
assert_equal 12, cache.columns("posts").size
assert_equal 12, cache.columns_hash("posts").size
assert cache.data_sources("posts")
assert_equal "id", cache.primary_keys("posts")
assert_equal 1, cache.indexes("posts").size
assert_equal 3, cache.columns("courses").size
assert_equal 3, cache.columns_hash("courses").size
assert cache.data_sources("courses")
assert_equal "id", cache.primary_keys("courses")
assert_equal 1, cache.indexes("courses").size
assert_equal @database_version.to_s, cache.database_version.to_s
end
ensure
tempfile.unlink
end

def test_data_source_exist
assert @cache.data_source_exists?("posts")
assert @cache.data_source_exists?("courses")
assert_not @cache.data_source_exists?("foo")
end

def test_clear_data_source_cache
@cache.clear_data_source_cache!("posts")
@cache.clear_data_source_cache!("courses")
end

test "#columns_hash? is populated by #columns_hash" do
assert_not @cache.columns_hash?("posts")
assert_not @cache.columns_hash?("courses")

@cache.columns_hash("posts")
@cache.columns_hash("courses")

assert @cache.columns_hash?("posts")
assert @cache.columns_hash?("courses")
end

test "#columns_hash? is not populated by #data_source_exists?" do
assert_not @cache.columns_hash?("posts")
assert_not @cache.columns_hash?("courses")

@cache.data_source_exists?("posts")
@cache.data_source_exists?("courses")

assert_not @cache.columns_hash?("posts")
assert_not @cache.columns_hash?("courses")
end

unless in_memory_db?
def test_when_lazily_load_schema_cache_is_set_cache_is_lazily_populated_when_est_connection
tempfile = Tempfile.new(["schema_cache-", ".yml"])
original_config = ActiveRecord::Base.connection_db_config
original_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit2", name: "primary")
new_config = original_config.configuration_hash.merge(schema_cache_path: tempfile.path)

ActiveRecord::Base.establish_connection(new_config)
Expand Down
3 changes: 2 additions & 1 deletion activerecord/test/cases/encryption/concurrency_test.rb
View file
Open in desktop
Expand Up @@ -13,7 +13,8 @@ class ActiveRecord::Encryption::ConcurrencyTest < ActiveRecord::EncryptionTestCa
end

def thread_encrypting_and_decrypting(thread_label)
posts = 200.times.collect { |index| EncryptedPost.create! title: "Article #{index} (#{thread_label})", body: "Body #{index} (#{thread_label})" }
EncryptedPost.insert_all 100.times.collect { |index| { title: "Article #{index} (#{thread_label})", body: "Body #{index} (#{thread_label})" } }
posts = EncryptedPost.last(100)

Thread.new do
posts.each.with_index do |article, index|
Expand Down
11 changes: 6 additions & 5 deletions activerecord/test/cases/relation/or_test.rb
View file
Open in desktop
Expand Up @@ -4,7 +4,8 @@
require "models/author"
require "models/categorization"
require "models/post"
require "models/citation"
require "models/book"
require "models/paragraph"

module ActiveRecord
class OrTest < ActiveRecord::TestCase
Expand Down Expand Up @@ -180,14 +181,14 @@ def test_structurally_incompatible_values
# https://www.sqlite.org/limits.html#max_expr_depth
class TooManyOrTest < ActiveRecord::TestCase
unless current_adapter?(:SQLite3Adapter)
fixtures :citations
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loads 65k records into the database. I believe a smaller amount in this case would suffice.

fixtures :paragraphs

def test_too_many_or
citations = 6000.times.map do |i|
Citation.where(id: i, book2_id: i * i)
paragraphs = 1001.times.map do |i|
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is 1001 entries enough to reliably blow the stack here? cc @kamipo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It raised for 1000 when the fix was implemented - 7d3bff1

Paragraph.where(id: i, book_id: i * i)
end

assert_equal 6000, citations.inject(&:or).count
assert_equal 1001, paragraphs.inject(&:or).count
end
end
end
Expand Down