Skip to content

Add support for autoloading enhancements in WordPress 6.6 trunk to autoloaded options Site Health check #1112

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixarntz merged 9 commits into from
Apr 4, 2024
Merged

Add support for autoloading enhancements in WordPress 6.6 trunk to autoloaded options Site Health check #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
825a85e
Move typos config to .github
thelovekesh Apr 3, 2024
da1c691
Update spell-check workflow to use typos config from .github
thelovekesh Apr 3, 2024
b08bee7
Merge branch 'trunk' into move/typos-config
thelovekesh Apr 3, 2024
1b4485f
Merge pull request #1109 from WordPress/move/typos-config
felixarntz Apr 3, 2024
f5bb87d
Fix PHPUnit test failures in trunk due to large option autoload optim…
Apr 4, 2024
ac329f6
Fix queries to take additional autoload values into account.
Apr 4, 2024
f3969a8
Fix another autoload query in tests.
Apr 4, 2024
cb548fd
Avoid unnecessary concatenation in queries.
felixarntz Apr 4, 2024
0316586
Implement helper function to get autoload values to autoload.
Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 _typos.toml → .github/typos.toml
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions .github/workflows/spell-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ jobs:
- uses: actions/checkout@v3
- name: Search for misspellings
uses: crate-ci/typos@master
with:
config: ./.github/typos.toml
40 changes: 38 additions & 2 deletions includes/site-health/audit-autoloaded-options/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,18 @@ function perflab_aao_autoloaded_options_test() {
*/
function perflab_aao_autoloaded_options_size() {
global $wpdb;
return (int) $wpdb->get_var( 'SELECT SUM(LENGTH(option_value)) FROM ' . $wpdb->prefix . 'options WHERE autoload = \'yes\'' );

$autoload_values = perflab_aao_get_autoload_values_to_autoload();

return (int) $wpdb->get_var(
$wpdb->prepare(
sprintf(
"SELECT SUM(LENGTH(option_value)) FROM $wpdb->options WHERE autoload IN (%s)",
implode( ',', array_fill( 0, count( $autoload_values ), '%s' ) )
),
$autoload_values
)
);
}

/**
Expand Down Expand Up @@ -130,7 +141,17 @@ function perflab_aao_query_autoloaded_options() {
*/
$option_threshold = apply_filters( 'perflab_aao_autoloaded_options_table_threshold', 100 );

return $wpdb->get_results( $wpdb->prepare( "SELECT option_name, LENGTH(option_value) AS option_value_length FROM {$wpdb->options} WHERE autoload='yes' AND LENGTH(option_value) > %d ORDER BY option_value_length DESC LIMIT 20", $option_threshold ) );
$autoload_values = perflab_aao_get_autoload_values_to_autoload();

return $wpdb->get_results(
$wpdb->prepare(
sprintf(
"SELECT option_name, LENGTH(option_value) AS option_value_length FROM {$wpdb->options} WHERE autoload IN (%s)",
implode( ',', array_fill( 0, count( $autoload_values ), '%s' ) )
) . ' AND LENGTH(option_value) > %d ORDER BY option_value_length DESC LIMIT 20',
array_merge( $autoload_values, array( $option_threshold ) )
)
);
}

/**
Expand Down Expand Up @@ -227,3 +248,18 @@ function perflab_aao_get_disabled_autoloaded_options_table() {

return $html_table;
}

/**
* Gets the autoload values in the database that should trigger their option to be autoloaded.
*
* @since n.e.x.t
*
* @return array List of autoload values.
*/
function perflab_aao_get_autoload_values_to_autoload() {
if ( function_exists( 'wp_autoload_values_to_autoload' ) ) {
return wp_autoload_values_to_autoload();
}

return array( 'yes' );
}
17 changes: 15 additions & 2 deletions tests/includes/site-health/audit-autoloaded-options/audit-autoloaded-options-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,18 @@ public function test_perflab_aao_autoloaded_options_test_warning() {
*/
public function test_perflab_aao_autoloaded_options_size() {
global $wpdb;
$autoloaded_options_size = $wpdb->get_var( 'SELECT SUM(LENGTH(option_value)) FROM ' . $wpdb->prefix . 'options WHERE autoload = \'yes\'' );

$autoload_values = perflab_aao_get_autoload_values_to_autoload();

$autoloaded_options_size = $wpdb->get_var(
$wpdb->prepare(
sprintf(
"SELECT SUM(LENGTH(option_value)) FROM $wpdb->options WHERE autoload IN (%s)",
implode( ',', array_fill( 0, count( $autoload_values ), '%s' ) )
),
$autoload_values
)
);
$this->assertEquals( $autoloaded_options_size, perflab_aao_autoloaded_options_size() );

// Add autoload option.
Expand Down Expand Up @@ -148,7 +159,9 @@ static function () {
*/
public static function set_autoloaded_option( $bytes = 800000 ) {
$heavy_option_string = wp_generate_password( $bytes );
add_option( self::AUTOLOADED_OPTION_KEY, $heavy_option_string );

// Force autoloading so that WordPress core does not override it. See https://core.trac.wordpress.org/changeset/57920.
add_option( self::AUTOLOADED_OPTION_KEY, $heavy_option_string, '', true );
}

/**
Expand Down