Changeset 3748520

Timestamp:

10/15/2026 12:56:36 PM (3 weeks ago)

Author:

progressplanner

Message:

Update to version 1.7.0 from GitHub

Location:

aaa-option-optimizer

Files:

• assets/banner-1544x500-nl_NL.png (added)
• assets/banner-1544x500.png (modified) ( previous)
• assets/banner-772x250-nl_NL.png (added)
• assets/banner-772x250.png (modified) ( previous)
• assets/github_banner_aaaao_pp.png (added)
• assets/github_banner_aaaoo_pp.png (deleted)
• tags/1.7.0 (copied) (copied from aaa-option-optimizer/trunk )
• tags/1.7.0/aaa-option-optimizer.php (modified) (1 diff)
• tags/1.7.0/known-plugins/known-plugins.json (modified) (1 diff)
• tags/1.7.0/package-lock.json (modified) (2 diffs)
• tags/1.7.0/package.json (modified) (1 diff)
• tags/1.7.0/readme.txt (modified) (3 diffs)
• tags/1.7.0/src/class-admin-page.php (modified) (7 diffs)
• tags/1.7.0/src/class-database.php (modified) (5 diffs)
• tags/1.7.0/src/class-plugin.php (modified) (2 diffs)
• tags/1.7.0/src/class-rest.php (modified) (2 diffs)
• trunk/aaa-option-optimizer.php (modified) (1 diff)
• trunk/known-plugins/known-plugins.json (modified) (1 diff)
• trunk/package-lock.json (modified) (2 diffs)
• trunk/package.json (modified) (1 diff)
• trunk/readme.txt (modified) (3 diffs)
• trunk/src/class-admin-page.php (modified) (7 diffs)
• trunk/src/class-database.php (modified) (5 diffs)
• trunk/src/class-plugin.php (modified) (2 diffs)
• trunk/src/class-rest.php (modified) (2 diffs)

aaa-option-optimizer/tags/1.7.0/aaa-option-optimizer.php

@@ -5 +5 @@
  * @package Progress_Planner\OptionOptimizer
  *
- * Plugin Name: AAA Option Optimizer
+ * Plugin Name: AAA Autoload Optimizer
  * Plugin URI: https://progressplanner.com/plugins/aaa-option-optimizer/
  * Description: Tracks autoloaded options usage and allows the user to optimize them.
- * Version: 1.6.1
+ * Version: 1.7.0
  * License: GPL-3.0+
- * Author: Team Prospress Planner
- * Author URI: https://prospressplanner.com/
+ * Author: Team Progress Planner
+ * Author URI: https://progressplanner.com/
  * Text Domain: aaa-option-optimizer
  */

aaa-option-optimizer/tags/1.7.0/known-plugins/known-plugins.json

@@ -1 +1 @@
 {
     "aaa-option-optimizer": {
-        "name": "AAA Option Optimizer",
+        "name": "AAA Autoload Optimizer",
         "option_prefixes": ["option_optimizer"]
     },

aaa-option-optimizer/tags/1.7.0/package-lock.json

@@ -1 +1 @@
 {
         "name": "aaa-option-optimizer",
-        "version": "1.3.2",
+        "version": "1.7.0",
         "lockfileVersion": 3,
         "requires": true,
@@ -7 +7 @@
                 "": {
                         "name": "aaa-option-optimizer",
-                        "version": "1.3.2",
+                        "version": "1.7.0",
                         "license": "GPL-3.0-or-later",
                         "devDependencies": {

aaa-option-optimizer/tags/1.7.0/package.json

@@ -1 +1 @@
 {
         "name": "aaa-option-optimizer",
-        "version": "1.3.2",
+        "version": "1.7.0",
         "private": true,
         "description": "WordPress plugin",

aaa-option-optimizer/tags/1.7.0/readme.txt

@@ -1 @@
-=== AAA Option Optimizer ===
+=== AAA Autoload Optimizer ===
 Contributors: joostdevalk, aristath, filipi, progressplanner
-Tags: options, database, cleanup
+Tags: autoload, options, database, performance, cleanup
 Requires at least: 6.7
-Tested up to: 7.0
+Tested up to: 7.1
+Stable tag: 1.7.0
 Requires PHP: 7.4
-Stable tag: 1.6.1
-License: GPL3+
+License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
 
-Plugin that tracks autoloaded options usage and allows the user to optimize them.
+Find and fix bloated autoloaded options slowing down your WordPress database
 
 == Description ==
-This plugin tracks which of the autoloaded options are used on a page, and stores that data at the end of page render. It keeps an array of options that it has seen as being used. On the admin page, it compares all the autoloaded options to the array of stored options, and shows the autoloaded options that have not been used as you were browsing the site. If you've been to every page on your site, or you've kept the plugin around for a week or so, this means that those options probably don't need to be autoloaded.
-
-=== How to use this plugin ===
-Install this plugin, and go through your entire site. Best is to use it normally for a couple of days, or to visit every page on your site and in your admin manually. Then go to the plugin's settings screen, and go through the unused options. You can either decide to remove an unused option (they might for instance be for plugins you no longer use), or to set it to not autoload. The latter action is much less destructive: it'll still be there, but it just won't be autoloaded.
+
+Every WordPress site loads dozens — sometimes hundreds — of autoloaded
+options from the `wp_options` table on every single page request. Many of
+those options belong to plugins you removed long ago, or simply don't need
+to be autoloaded. The result: a bigger database query, slower page loads,
+and wasted server resources.
+
+**AAA Autoload Optimizer** tracks which autoloaded options your site actually
+uses, then shows you the ones it doesn't — so you can safely remove them
+or turn off autoloading.
+
+== How It Works ==
+
+1. Install the plugin and browse your site normally for a few days.
+2. The plugin quietly records which autoloaded options are actually used
+   during page rendering.
+3. Visit the settings screen to see every autoloaded option that was
+   *never* used — and decide what to do with it.
+
+You can **remove** unused options entirely (great for leftover data from
+deactivated plugins) or **disable autoloading** for options that exist but
+don't need to load on every request. Disabling autoloading is
+non-destructive — the option stays in your database, it just won't be
+fetched automatically.
+
+== Features ==
+
+- **Automatic usage tracking** — monitors which autoloaded options are
+  loaded on every page, on both the front end and in the admin.
+- **Bulk actions** — optimize or delete multiple options at once instead
+  of one by one.
+- **Known-plugin recognition** — identifies which plugin or theme each
+  option belongs to, so you know exactly what you're looking at.
+- **"All Options" browser** — view and manage every option in your
+  `wp_options` table, not just the unused ones.
+- **Source filtering** — filter options by their source plugin, theme, or
+  WordPress core to quickly find what you need.
+- **Safe by design** — disabling autoload is non-destructive. You can
+  always re-enable it.
+- **Lightweight** — the plugin's own tracking data is stored in a custom
+  database table for optimal performance.
+
+== Why the "aaa" Slug? ==
+
+WordPress loads plugins alphabetically. Because this plugin needs to start
+tracking options as early as possible, the `aaa-option-optimizer` slug
+ensures it loads first. It's not vanity — it's a technical requirement for
+accurate measurement.
+
+== Links ==
+
+- [GitHub repository](https://github.com/ProgressPlanner/aaa-option-optimizer/)
+  — report bugs, contribute code, or browse the source.
+- [Report a security vulnerability](https://patchstack.com/database/vdp/aaa-option-optimizer)
+  — via the Patchstack Vulnerability Disclosure Program.
+- Built by the team behind
+  [Progress Planner](https://progressplanner.com/).
+
+== Installation ==
+
+= Automatic installation =
+
+1. In your WordPress dashboard, go to **Plugins → Add New**.
+2. Search for **AAA Autoload Optimizer**.
+3. Click **Install Now**, then **Activate**.
+4. Browse your site normally for a few days — or visit every page
+   manually if you're in a hurry.
+5. Go to **Tools → Autoload Optimizer** to review and optimize your
+   autoloaded options.
+
+= Manual installation =
+
+1. Download the plugin zip file.
+2. Upload it via **Plugins → Add New → Upload Plugin**, or extract it
+   to `/wp-content/plugins/aaa-option-optimizer/` via FTP.
+3. Activate the plugin through the **Plugins** menu.
+4. Follow steps 4–5 above.
 
 == Frequently Asked Questions ==
 
-= Why the AAA prefix in the plugin name? =
-
-Because the plugin needs to measure options being loaded, it benefits from being loaded itself first. As WordPress loads plugins alphabetically,
-starting the name with AAA made sense.
+= Will this plugin break my site? =
+
+The safest action — disabling autoload — is non-destructive. The option
+remains in your database and can still be loaded on demand. Deleting an
+option is permanent, so only do that for options you're confident are no
+longer needed (e.g., from plugins you've already removed). Always back up
+your database before making bulk changes.
+
+= Can I undo changes? =
+
+Disabling autoload can be reversed from the "All Options" tab. Deleting
+an option is permanent. If you need it back, you'll need to restore from
+a database backup.
+
+= How long should I wait before optimizing? =
+
+A few days of normal browsing is usually enough. If you have a lot of 
+visitors, a few hours might even suffice. The goal is to visit every major 
+page on your site (front end and admin) so the plugin can record which 
+options are actually used. If you're thorough, you can start optimizing 
+sooner.
+
+= Does this work with WordPress multisite? =
+
+The plugin currently targets single-site installations. Multisite
+compatibility has not been officially tested.
+
+= How do I know which options are safe to remove? =
+
+The plugin identifies the source of each option (which plugin, theme, or
+WordPress core). If an option belongs to a plugin you've already
+deactivated and removed, it's generally safe to delete. When in doubt,
+disable autoloading instead of deleting — it's the safer choice.
 
 = Do I need to take precautions? =
 
-Yes!! Backup your database.
+Yes, always back up your database before optimizing. Disabling autoload
+is safe and reversible, but deleting options is permanent.
 
 = Where can I report bugs? =
 
-Please use [our GitHub](https://github.com/ProgressPlanner/aaa-option-optimizer/) for reporting bugs or making code suggestions. Feel free to use the forums for asking questions too, of course.
-
-For security issues, please see the next question.
+Please use [the GitHub repository](https://github.com/ProgressPlanner/aaa-option-optimizer/)
+for bug reports and code suggestions. The WordPress.org support forum
+works too for general questions.
 
 = How can I report security issues? =
 
-You can report security bugs through the Patchstack Vulnerability Disclosure Program. The Patchstack team help validate, triage and handle any security vulnerabilities. [Report a security vulnerability.](https://patchstack.com/database/vdp/aaa-option-optimizer)
-
-= How can I add recognized plugins? =
-
-Please do a pull request via GitHub on [this file](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/develop/known-plugins/known-plugins.json) in the plugin.
-
-== Installation ==
-1. Search for AAA Option Optimizer on the repository.
-2. Install the plugin.
-3. Wait a week or so. Or, if you're in a hurry, click around on pages on your site, be sure to try and hit every page on your site and in your admin.
-4. Go to the plugin's admin page and optimize your option usage.
+Through the Patchstack Vulnerability Disclosure Program. The Patchstack
+team validates, triages, and handles all security reports.
+[Report a security vulnerability here.](https://patchstack.com/database/vdp/aaa-option-optimizer)
+
+= How can I add my plugin to the known-plugins list? =
+
+Submit a pull request on GitHub to
+[known-plugins.json](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/develop/known-plugins/known-plugins.json).
 
 == Screenshots ==
 
-1. Screenshot of the admin screen, initial tab.
-2. Screenshot of the "All options" screen, showing you can browse all the options.
+1. The main dashboard showing unused autoloaded options with their size,
+   source plugin, and action buttons.
+2. The "All Options" tab lets you browse and manage every option in your
+   wp_options table.
+<!-- TODO: add screenshot showing bulk actions in use -->
+<!-- TODO: add screenshot showing the source filtering feature -->
 
 == Changelog ==
 
+= 1.7.0 =
+
+* Rename the plugin to AAA Autoload Optimizer.
+* Fix database deadlocks when concurrent requests write tracked options.
+* Fix a fatal error when W3 Total Cache's database cache is active.
+* Readme improvements.
+
 = 1.6.1 =
 
-* Fix infinite recursion in option access monitoring that could cause a fatal error in certain hosting environments.
-
-= 1.6.0
-
-* Replace using 'all' filter for monitoring option usage with 'pre_option' filter for better performance.
-* Migrate tracked options data from a single wp_option to a custom database table for improved performance and reliability.
+* Fix infinite recursion in option access monitoring that could cause a
+  fatal error in certain hosting environments.
+
+= 1.6.0 =
+
+* Replace using 'all' filter for monitoring option usage with
+  'pre_option' filter for better performance.
+* Migrate tracked options data from a single wp_option to a custom
+  database table for improved performance and reliability.
 
 = 1.5.1 =
@@ -105 +219 @@
 
 * Overhaul of the UX, implementing proper tabs, better buttons and more.
-* Added a new "All options" tab, which, when you hit the button, loads all the options from the database and allows you to manage them.
+* Added a new "All options" tab, which, when you hit the button, loads
+  all the options from the database and allows you to manage them.
 * Added a "Reset data" button which resets the tracking data.
 * Added a link to the Optimize Options page from the Plugins page.
-* Much improved recognition of core WordPress options, themes and plugins under "Source", thanks in part to pull requests from [Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/) and [system4pc](https://github.com/system4pc).
-* You can now also filter all tables by Source so you can more easily find the options you're looking for.
-* Many code and speed improvements under the hood, including adding a class autoloader and some i18n fixes.
+* Much improved recognition of core WordPress options, themes and plugins
+  under "Source", thanks in part to pull requests from
+  [Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/)
+  and [system4pc](https://github.com/system4pc).
+* You can now also filter all tables by Source so you can more easily
+  find the options you're looking for.
+* Many code and speed improvements under the hood, including adding a
+  class autoloader and some i18n fixes.
 
 = 1.1.1 =
 
-Implement the missing functionality to create an option with value `false` when it's being loaded but doesn't exist.
+Implement the missing functionality to create an option with value
+`false` when it's being loaded but doesn't exist.
 
 = 1.1 =
 
-The plugin now recognizes plugins from which the options came (thanks to a great pull by [Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/)). If you're a plugin developer and want your plugin's options
-properly recognized, please do a pull request [on this file](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/main/known-plugins/known-plugins.json).
+The plugin now recognizes plugins from which the options came (thanks to
+a great pull by
+[Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/)).
+If you're a plugin developer and want your plugin's options properly
+recognized, please do a pull request on
+[this file](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/main/known-plugins/known-plugins.json).
 
 Small enhancements:
 
-* Column width is now automatically determined which leads to better spacing.
+* Column width is now automatically determined which leads to better
+  spacing.
 * Action buttons are now centered in their columns.
 
 Bugs fixed:
 
-* If you removed autoload from or deleted an option, it'd be removed from the table but would be back when you paginated, that's fixed - thanks to [Jono Alderson](https://profiles.wordpress.org/jonoaldersonwp/) for reporting.
-* Fixed sorting by filesize by moving the `KB` to the table heading, so that you can now properly sort numbers.
+* If you removed autoload from or deleted an option, it'd be removed
+  from the table but would be back when you paginated, that's fixed -
+  thanks to
+  [Jono Alderson](https://profiles.wordpress.org/jonoaldersonwp/)
+  for reporting.
+* Fixed sorting by filesize by moving the `KB` to the table heading, so
+  that you can now properly sort numbers.
 * Fixed issue where an empty option would result in weird size output.
 
@@ -135 +266 @@
 
 * Fixed a bug where the buttons wouldn't work in a paginated state.
-* Show the value of an option in a `popover`, as suggested with a great pull request by [@rogierlankhorst](https://profiles.wordpress.org/rogierlankhorst/).
+* Show the value of an option in a `popover`, as suggested with a great
+  pull request by
+  [@rogierlankhorst](https://profiles.wordpress.org/rogierlankhorst/).
 
 = 1.0.1 =
 
-Fixed an error with values that are objects, not strings, which also caused sorting not to work for some people.
+Fixed an error with values that are objects, not strings, which also
+caused sorting not to work for some people.
 
 = 1.0 =
 
 Initial release on GitHub and WordPress.org.
+
+== Upgrade Notice ==
+
+= 1.7.0 =
+The plugin is now called AAA Autoload Optimizer. Also fixes bugs with
+concurrent requests and W3 Total Cache.
+
+= 1.6.1 =
+Fixes a potential fatal error from infinite recursion in option
+monitoring on certain hosts.
+
+= 1.6.0 =
+Performance and reliability: option tracking now uses a custom database
+table instead of a single wp_option.

aaa-option-optimizer/tags/1.7.0/src/class-admin-page.php

@@ -1 +1 @@
 <?php
 /**
- * Admin page functionality for AAA Option Optimizer.
+ * Admin page functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -9 +9 @@
 
 /**
- * Admin page functionality for AAA Option Optimizer.
+ * Admin page functionality for AAA Autoload Optimizer.
  */
 class Admin_Page {
@@ -136 +136 @@
         public function add_admin_page() {
                 \add_management_page(
-                        __( 'AAA Option Optimizer', 'aaa-option-optimizer' ),
-                        __( 'Option Optimizer', 'aaa-option-optimizer' ),
+                        __( 'AAA Autoload Optimizer', 'aaa-option-optimizer' ),
+                        __( 'Autoload Optimizer', 'aaa-option-optimizer' ),
                         'manage_options',
                         'aaa-option-optimizer',
@@ -272 +272 @@
                 ?>
                 <div class="wrap">
-                        <h1><?php \esc_html_e( 'AAA Option Optimizer', 'aaa-option-optimizer' ); ?></h1>
+                        <h1><?php \esc_html_e( 'AAA Autoload Optimizer', 'aaa-option-optimizer' ); ?></h1>
 
                         <?php if ( $migration_status['needs_migration'] ) : ?>
@@ -307 +307 @@
                                 <div class="panel">
                                         <h2 id="unused-autoloaded"><?php \esc_html_e( 'Unused, but autoloaded', 'aaa-option-optimizer' ); ?></h2>
-                                        <p><?php \esc_html_e( 'The following options are autoloaded on each pageload, but AAA Option Optimizer has not been able to detect them being used.', 'aaa-option-optimizer' ); ?></p>
+                                        <p><?php \esc_html_e( 'The following options are autoloaded on each pageload, but AAA Autoload Optimizer has not been able to detect them being used.', 'aaa-option-optimizer' ); ?></p>
 
                                         <table style="width:100%" id="unused_options_table" class="aaa_option_table">
@@ -348 +348 @@
                                         <?php // Render differences. ?>
                                         <h2 id="used-not-autoloaded"><?php \esc_html_e( 'Used, but not autoloaded options', 'aaa-option-optimizer' ); ?></h2>
-                                        <p><?php \esc_html_e( 'The following options are *not* autoloaded on each pageload, but AAA Option Optimizer has detected that they are being used. If one of the options below has been called a lot and is not very big, you might consider adding autoload to that option.', 'aaa-option-optimizer' ); ?></p>
+                                        <p><?php \esc_html_e( 'The following options are *not* autoloaded on each pageload, but AAA Autoload Optimizer has detected that they are being used. If one of the options below has been called a lot and is not very big, you might consider adding autoload to that option.', 'aaa-option-optimizer' ); ?></p>
                                         <table style="width:100%;" id="used_not_autoloaded_table" class="aaa_option_table">
                                                 <thead>
@@ -390 +390 @@
                                 <div class="panel">
                                         <h2 id="requested-do-not-exist"><?php \esc_html_e( 'Requested options that do not exist', 'aaa-option-optimizer' ); ?></h2>
-                                        <p><?php \esc_html_e( 'The following options are requested sometimes, but AAA Option Optimizer has detected that they do not exist. If one of the options below has been called a lot, it might help to create it with a value of false.', 'aaa-option-optimizer' ); ?></p>
+                                        <p><?php \esc_html_e( 'The following options are requested sometimes, but AAA Autoload Optimizer has detected that they do not exist. If one of the options below has been called a lot, it might help to create it with a value of false.', 'aaa-option-optimizer' ); ?></p>
                                         <table width="100%" id="requested_do_not_exist_table" class="aaa_option_table">
                                                 <thead>

aaa-option-optimizer/tags/1.7.0/src/class-database.php

@@ -1 +1 @@
 <?php
 /**
- * Database functionality for AAA Option Optimizer.
+ * Database functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -182 +182 @@
          * for optimal performance on slow hosts with large datasets.
          *
+         * Rows are written in a fixed (sorted) order. Every request writes the
+         * options it read at shutdown, and InnoDB locks rows in the order of the
+         * VALUES list; with per-request access order, concurrent requests lock
+         * the same rows in different orders and deadlock each other.
+         *
          * @param array<string, int> $options    Array of option_name => count.
          * @param int                $chunk_size Number of options per query. Default 500.
@@ -188 +193 @@
          */
         public static function batch_insert( $options, $chunk_size = 500 ) {
-                global $wpdb;
-
                 if ( empty( $options ) ) {
                         return;
                 }
 
-                $table_name = self::get_table_name();
-
+                // SORT_STRING: numeric option names become int keys, keep one total order.
+                \ksort( $options, SORT_STRING );
+
+                // A deadlock rolls back the whole transaction, so one retry can't double count.
+                if ( ! self::write_chunks( $options, $chunk_size ) && self::last_error_is_deadlock() ) {
+                        self::write_chunks( $options, $chunk_size );
+                }
+        }
+
+        /**
+         * Write option counts in chunks inside a single transaction.
+         *
+         * @param array<string, int> $options    Array of option_name => count, already sorted.
+         * @param int                $chunk_size Number of options per query.
+         *
+         * @return bool Whether the transaction was committed.
+         */
+        private static function write_chunks( $options, $chunk_size ) {
+                global $wpdb;
+
+                $table_name = self::get_table_name();
+
+                // Use `START TRANSACTION` (not `BEGIN`) so W3 Total Cache's DbCache layer
+                // recognizes it as a transaction and skips caching — `BEGIN` slips past its
+                // regex and triggers a fatal in wpdb::load_col_info() on the boolean result.
                 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
-                $wpdb->query( 'BEGIN' );
+                $wpdb->query( 'START TRANSACTION' );
 
                 foreach ( array_chunk( $options, $chunk_size, true ) as $chunk ) {
@@ -205 +231 @@
                         foreach ( $chunk as $option_name => $count ) {
                                 $placeholders[] = '(%s, %d, NOW())';
-                                $values[]       = $option_name;
+                                $values[]       = (string) $option_name;
                                 $values[]       = (int) $count;
                         }
@@ -214 +240 @@
 
                         // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared
-                        $wpdb->query( $wpdb->prepare( $sql, ...$values ) );
+                        if ( false === $wpdb->query( $wpdb->prepare( $sql, ...$values ) ) ) {
+                                // Keep the error: ROLLBACK succeeding would clear `$wpdb->last_error`.
+                                $error = $wpdb->last_error;
+                                // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+                                $wpdb->query( 'ROLLBACK' );
+                                $wpdb->last_error = $error;
+                                return false;
+                        }
                 }
 
                 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
-                $wpdb->query( 'COMMIT' );
+                return false !== $wpdb->query( 'COMMIT' );
+        }
+
+        /**
+         * Whether the last database error was an InnoDB deadlock (MySQL error 1213).
+         *
+         * @return bool
+         */
+        private static function last_error_is_deadlock() {
+                global $wpdb;
+
+                return false !== \stripos( (string) $wpdb->last_error, 'Deadlock found' );
         }
 

aaa-option-optimizer/tags/1.7.0/src/class-plugin.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin functionality for AAA Option Optimizer.
+ * Plugin functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -9 +9 @@
 
 /**
- * Core functionality of AAA Option Optimizer.
+ * Core functionality of AAA Autoload Optimizer.
  */
 class Plugin {

aaa-option-optimizer/tags/1.7.0/src/class-rest.php

@@ -1 +1 @@
 <?php
 /**
- * REST functionality for AAA Option Optimizer.
+ * REST functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -13 +13 @@
 
 /**
- * REST functionality of AAA Option Optimizer.
+ * REST functionality of AAA Autoload Optimizer.
  */
 class REST {

aaa-option-optimizer/trunk/aaa-option-optimizer.php

@@ -5 +5 @@
  * @package Progress_Planner\OptionOptimizer
  *
- * Plugin Name: AAA Option Optimizer
+ * Plugin Name: AAA Autoload Optimizer
  * Plugin URI: https://progressplanner.com/plugins/aaa-option-optimizer/
  * Description: Tracks autoloaded options usage and allows the user to optimize them.
- * Version: 1.6.1
+ * Version: 1.7.0
  * License: GPL-3.0+
- * Author: Team Prospress Planner
- * Author URI: https://prospressplanner.com/
+ * Author: Team Progress Planner
+ * Author URI: https://progressplanner.com/
  * Text Domain: aaa-option-optimizer
  */

aaa-option-optimizer/trunk/known-plugins/known-plugins.json

@@ -1 +1 @@
 {
     "aaa-option-optimizer": {
-        "name": "AAA Option Optimizer",
+        "name": "AAA Autoload Optimizer",
         "option_prefixes": ["option_optimizer"]
     },

aaa-option-optimizer/trunk/package-lock.json

@@ -1 +1 @@
 {
         "name": "aaa-option-optimizer",
-        "version": "1.3.2",
+        "version": "1.7.0",
         "lockfileVersion": 3,
         "requires": true,
@@ -7 +7 @@
                 "": {
                         "name": "aaa-option-optimizer",
-                        "version": "1.3.2",
+                        "version": "1.7.0",
                         "license": "GPL-3.0-or-later",
                         "devDependencies": {

aaa-option-optimizer/trunk/package.json

@@ -1 +1 @@
 {
         "name": "aaa-option-optimizer",
-        "version": "1.3.2",
+        "version": "1.7.0",
         "private": true,
         "description": "WordPress plugin",

aaa-option-optimizer/trunk/readme.txt

@@ -1 @@
-=== AAA Option Optimizer ===
+=== AAA Autoload Optimizer ===
 Contributors: joostdevalk, aristath, filipi, progressplanner
-Tags: options, database, cleanup
+Tags: autoload, options, database, performance, cleanup
 Requires at least: 6.7
-Tested up to: 7.0
+Tested up to: 7.1
+Stable tag: 1.7.0
 Requires PHP: 7.4
-Stable tag: 1.6.1
-License: GPL3+
+License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
 
-Plugin that tracks autoloaded options usage and allows the user to optimize them.
+Find and fix bloated autoloaded options slowing down your WordPress database
 
 == Description ==
-This plugin tracks which of the autoloaded options are used on a page, and stores that data at the end of page render. It keeps an array of options that it has seen as being used. On the admin page, it compares all the autoloaded options to the array of stored options, and shows the autoloaded options that have not been used as you were browsing the site. If you've been to every page on your site, or you've kept the plugin around for a week or so, this means that those options probably don't need to be autoloaded.
-
-=== How to use this plugin ===
-Install this plugin, and go through your entire site. Best is to use it normally for a couple of days, or to visit every page on your site and in your admin manually. Then go to the plugin's settings screen, and go through the unused options. You can either decide to remove an unused option (they might for instance be for plugins you no longer use), or to set it to not autoload. The latter action is much less destructive: it'll still be there, but it just won't be autoloaded.
+
+Every WordPress site loads dozens — sometimes hundreds — of autoloaded
+options from the `wp_options` table on every single page request. Many of
+those options belong to plugins you removed long ago, or simply don't need
+to be autoloaded. The result: a bigger database query, slower page loads,
+and wasted server resources.
+
+**AAA Autoload Optimizer** tracks which autoloaded options your site actually
+uses, then shows you the ones it doesn't — so you can safely remove them
+or turn off autoloading.
+
+== How It Works ==
+
+1. Install the plugin and browse your site normally for a few days.
+2. The plugin quietly records which autoloaded options are actually used
+   during page rendering.
+3. Visit the settings screen to see every autoloaded option that was
+   *never* used — and decide what to do with it.
+
+You can **remove** unused options entirely (great for leftover data from
+deactivated plugins) or **disable autoloading** for options that exist but
+don't need to load on every request. Disabling autoloading is
+non-destructive — the option stays in your database, it just won't be
+fetched automatically.
+
+== Features ==
+
+- **Automatic usage tracking** — monitors which autoloaded options are
+  loaded on every page, on both the front end and in the admin.
+- **Bulk actions** — optimize or delete multiple options at once instead
+  of one by one.
+- **Known-plugin recognition** — identifies which plugin or theme each
+  option belongs to, so you know exactly what you're looking at.
+- **"All Options" browser** — view and manage every option in your
+  `wp_options` table, not just the unused ones.
+- **Source filtering** — filter options by their source plugin, theme, or
+  WordPress core to quickly find what you need.
+- **Safe by design** — disabling autoload is non-destructive. You can
+  always re-enable it.
+- **Lightweight** — the plugin's own tracking data is stored in a custom
+  database table for optimal performance.
+
+== Why the "aaa" Slug? ==
+
+WordPress loads plugins alphabetically. Because this plugin needs to start
+tracking options as early as possible, the `aaa-option-optimizer` slug
+ensures it loads first. It's not vanity — it's a technical requirement for
+accurate measurement.
+
+== Links ==
+
+- [GitHub repository](https://github.com/ProgressPlanner/aaa-option-optimizer/)
+  — report bugs, contribute code, or browse the source.
+- [Report a security vulnerability](https://patchstack.com/database/vdp/aaa-option-optimizer)
+  — via the Patchstack Vulnerability Disclosure Program.
+- Built by the team behind
+  [Progress Planner](https://progressplanner.com/).
+
+== Installation ==
+
+= Automatic installation =
+
+1. In your WordPress dashboard, go to **Plugins → Add New**.
+2. Search for **AAA Autoload Optimizer**.
+3. Click **Install Now**, then **Activate**.
+4. Browse your site normally for a few days — or visit every page
+   manually if you're in a hurry.
+5. Go to **Tools → Autoload Optimizer** to review and optimize your
+   autoloaded options.
+
+= Manual installation =
+
+1. Download the plugin zip file.
+2. Upload it via **Plugins → Add New → Upload Plugin**, or extract it
+   to `/wp-content/plugins/aaa-option-optimizer/` via FTP.
+3. Activate the plugin through the **Plugins** menu.
+4. Follow steps 4–5 above.
 
 == Frequently Asked Questions ==
 
-= Why the AAA prefix in the plugin name? =
-
-Because the plugin needs to measure options being loaded, it benefits from being loaded itself first. As WordPress loads plugins alphabetically,
-starting the name with AAA made sense.
+= Will this plugin break my site? =
+
+The safest action — disabling autoload — is non-destructive. The option
+remains in your database and can still be loaded on demand. Deleting an
+option is permanent, so only do that for options you're confident are no
+longer needed (e.g., from plugins you've already removed). Always back up
+your database before making bulk changes.
+
+= Can I undo changes? =
+
+Disabling autoload can be reversed from the "All Options" tab. Deleting
+an option is permanent. If you need it back, you'll need to restore from
+a database backup.
+
+= How long should I wait before optimizing? =
+
+A few days of normal browsing is usually enough. If you have a lot of 
+visitors, a few hours might even suffice. The goal is to visit every major 
+page on your site (front end and admin) so the plugin can record which 
+options are actually used. If you're thorough, you can start optimizing 
+sooner.
+
+= Does this work with WordPress multisite? =
+
+The plugin currently targets single-site installations. Multisite
+compatibility has not been officially tested.
+
+= How do I know which options are safe to remove? =
+
+The plugin identifies the source of each option (which plugin, theme, or
+WordPress core). If an option belongs to a plugin you've already
+deactivated and removed, it's generally safe to delete. When in doubt,
+disable autoloading instead of deleting — it's the safer choice.
 
 = Do I need to take precautions? =
 
-Yes!! Backup your database.
+Yes, always back up your database before optimizing. Disabling autoload
+is safe and reversible, but deleting options is permanent.
 
 = Where can I report bugs? =
 
-Please use [our GitHub](https://github.com/ProgressPlanner/aaa-option-optimizer/) for reporting bugs or making code suggestions. Feel free to use the forums for asking questions too, of course.
-
-For security issues, please see the next question.
+Please use [the GitHub repository](https://github.com/ProgressPlanner/aaa-option-optimizer/)
+for bug reports and code suggestions. The WordPress.org support forum
+works too for general questions.
 
 = How can I report security issues? =
 
-You can report security bugs through the Patchstack Vulnerability Disclosure Program. The Patchstack team help validate, triage and handle any security vulnerabilities. [Report a security vulnerability.](https://patchstack.com/database/vdp/aaa-option-optimizer)
-
-= How can I add recognized plugins? =
-
-Please do a pull request via GitHub on [this file](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/develop/known-plugins/known-plugins.json) in the plugin.
-
-== Installation ==
-1. Search for AAA Option Optimizer on the repository.
-2. Install the plugin.
-3. Wait a week or so. Or, if you're in a hurry, click around on pages on your site, be sure to try and hit every page on your site and in your admin.
-4. Go to the plugin's admin page and optimize your option usage.
+Through the Patchstack Vulnerability Disclosure Program. The Patchstack
+team validates, triages, and handles all security reports.
+[Report a security vulnerability here.](https://patchstack.com/database/vdp/aaa-option-optimizer)
+
+= How can I add my plugin to the known-plugins list? =
+
+Submit a pull request on GitHub to
+[known-plugins.json](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/develop/known-plugins/known-plugins.json).
 
 == Screenshots ==
 
-1. Screenshot of the admin screen, initial tab.
-2. Screenshot of the "All options" screen, showing you can browse all the options.
+1. The main dashboard showing unused autoloaded options with their size,
+   source plugin, and action buttons.
+2. The "All Options" tab lets you browse and manage every option in your
+   wp_options table.
+<!-- TODO: add screenshot showing bulk actions in use -->
+<!-- TODO: add screenshot showing the source filtering feature -->
 
 == Changelog ==
 
+= 1.7.0 =
+
+* Rename the plugin to AAA Autoload Optimizer.
+* Fix database deadlocks when concurrent requests write tracked options.
+* Fix a fatal error when W3 Total Cache's database cache is active.
+* Readme improvements.
+
 = 1.6.1 =
 
-* Fix infinite recursion in option access monitoring that could cause a fatal error in certain hosting environments.
-
-= 1.6.0
-
-* Replace using 'all' filter for monitoring option usage with 'pre_option' filter for better performance.
-* Migrate tracked options data from a single wp_option to a custom database table for improved performance and reliability.
+* Fix infinite recursion in option access monitoring that could cause a
+  fatal error in certain hosting environments.
+
+= 1.6.0 =
+
+* Replace using 'all' filter for monitoring option usage with
+  'pre_option' filter for better performance.
+* Migrate tracked options data from a single wp_option to a custom
+  database table for improved performance and reliability.
 
 = 1.5.1 =
@@ -105 +219 @@
 
 * Overhaul of the UX, implementing proper tabs, better buttons and more.
-* Added a new "All options" tab, which, when you hit the button, loads all the options from the database and allows you to manage them.
+* Added a new "All options" tab, which, when you hit the button, loads
+  all the options from the database and allows you to manage them.
 * Added a "Reset data" button which resets the tracking data.
 * Added a link to the Optimize Options page from the Plugins page.
-* Much improved recognition of core WordPress options, themes and plugins under "Source", thanks in part to pull requests from [Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/) and [system4pc](https://github.com/system4pc).
-* You can now also filter all tables by Source so you can more easily find the options you're looking for.
-* Many code and speed improvements under the hood, including adding a class autoloader and some i18n fixes.
+* Much improved recognition of core WordPress options, themes and plugins
+  under "Source", thanks in part to pull requests from
+  [Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/)
+  and [system4pc](https://github.com/system4pc).
+* You can now also filter all tables by Source so you can more easily
+  find the options you're looking for.
+* Many code and speed improvements under the hood, including adding a
+  class autoloader and some i18n fixes.
 
 = 1.1.1 =
 
-Implement the missing functionality to create an option with value `false` when it's being loaded but doesn't exist.
+Implement the missing functionality to create an option with value
+`false` when it's being loaded but doesn't exist.
 
 = 1.1 =
 
-The plugin now recognizes plugins from which the options came (thanks to a great pull by [Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/)). If you're a plugin developer and want your plugin's options
-properly recognized, please do a pull request [on this file](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/main/known-plugins/known-plugins.json).
+The plugin now recognizes plugins from which the options came (thanks to
+a great pull by
+[Rogier Lankhorst](https://profiles.wordpress.org/rogierlankhorst/)).
+If you're a plugin developer and want your plugin's options properly
+recognized, please do a pull request on
+[this file](https://github.com/ProgressPlanner/aaa-option-optimizer/blob/main/known-plugins/known-plugins.json).
 
 Small enhancements:
 
-* Column width is now automatically determined which leads to better spacing.
+* Column width is now automatically determined which leads to better
+  spacing.
 * Action buttons are now centered in their columns.
 
 Bugs fixed:
 
-* If you removed autoload from or deleted an option, it'd be removed from the table but would be back when you paginated, that's fixed - thanks to [Jono Alderson](https://profiles.wordpress.org/jonoaldersonwp/) for reporting.
-* Fixed sorting by filesize by moving the `KB` to the table heading, so that you can now properly sort numbers.
+* If you removed autoload from or deleted an option, it'd be removed
+  from the table but would be back when you paginated, that's fixed -
+  thanks to
+  [Jono Alderson](https://profiles.wordpress.org/jonoaldersonwp/)
+  for reporting.
+* Fixed sorting by filesize by moving the `KB` to the table heading, so
+  that you can now properly sort numbers.
 * Fixed issue where an empty option would result in weird size output.
 
@@ -135 +266 @@
 
 * Fixed a bug where the buttons wouldn't work in a paginated state.
-* Show the value of an option in a `popover`, as suggested with a great pull request by [@rogierlankhorst](https://profiles.wordpress.org/rogierlankhorst/).
+* Show the value of an option in a `popover`, as suggested with a great
+  pull request by
+  [@rogierlankhorst](https://profiles.wordpress.org/rogierlankhorst/).
 
 = 1.0.1 =
 
-Fixed an error with values that are objects, not strings, which also caused sorting not to work for some people.
+Fixed an error with values that are objects, not strings, which also
+caused sorting not to work for some people.
 
 = 1.0 =
 
 Initial release on GitHub and WordPress.org.
+
+== Upgrade Notice ==
+
+= 1.7.0 =
+The plugin is now called AAA Autoload Optimizer. Also fixes bugs with
+concurrent requests and W3 Total Cache.
+
+= 1.6.1 =
+Fixes a potential fatal error from infinite recursion in option
+monitoring on certain hosts.
+
+= 1.6.0 =
+Performance and reliability: option tracking now uses a custom database
+table instead of a single wp_option.

aaa-option-optimizer/trunk/src/class-admin-page.php

@@ -1 +1 @@
 <?php
 /**
- * Admin page functionality for AAA Option Optimizer.
+ * Admin page functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -9 +9 @@
 
 /**
- * Admin page functionality for AAA Option Optimizer.
+ * Admin page functionality for AAA Autoload Optimizer.
  */
 class Admin_Page {
@@ -136 +136 @@
         public function add_admin_page() {
                 \add_management_page(
-                        __( 'AAA Option Optimizer', 'aaa-option-optimizer' ),
-                        __( 'Option Optimizer', 'aaa-option-optimizer' ),
+                        __( 'AAA Autoload Optimizer', 'aaa-option-optimizer' ),
+                        __( 'Autoload Optimizer', 'aaa-option-optimizer' ),
                         'manage_options',
                         'aaa-option-optimizer',
@@ -272 +272 @@
                 ?>
                 <div class="wrap">
-                        <h1><?php \esc_html_e( 'AAA Option Optimizer', 'aaa-option-optimizer' ); ?></h1>
+                        <h1><?php \esc_html_e( 'AAA Autoload Optimizer', 'aaa-option-optimizer' ); ?></h1>
 
                         <?php if ( $migration_status['needs_migration'] ) : ?>
@@ -307 +307 @@
                                 <div class="panel">
                                         <h2 id="unused-autoloaded"><?php \esc_html_e( 'Unused, but autoloaded', 'aaa-option-optimizer' ); ?></h2>
-                                        <p><?php \esc_html_e( 'The following options are autoloaded on each pageload, but AAA Option Optimizer has not been able to detect them being used.', 'aaa-option-optimizer' ); ?></p>
+                                        <p><?php \esc_html_e( 'The following options are autoloaded on each pageload, but AAA Autoload Optimizer has not been able to detect them being used.', 'aaa-option-optimizer' ); ?></p>
 
                                         <table style="width:100%" id="unused_options_table" class="aaa_option_table">
@@ -348 +348 @@
                                         <?php // Render differences. ?>
                                         <h2 id="used-not-autoloaded"><?php \esc_html_e( 'Used, but not autoloaded options', 'aaa-option-optimizer' ); ?></h2>
-                                        <p><?php \esc_html_e( 'The following options are *not* autoloaded on each pageload, but AAA Option Optimizer has detected that they are being used. If one of the options below has been called a lot and is not very big, you might consider adding autoload to that option.', 'aaa-option-optimizer' ); ?></p>
+                                        <p><?php \esc_html_e( 'The following options are *not* autoloaded on each pageload, but AAA Autoload Optimizer has detected that they are being used. If one of the options below has been called a lot and is not very big, you might consider adding autoload to that option.', 'aaa-option-optimizer' ); ?></p>
                                         <table style="width:100%;" id="used_not_autoloaded_table" class="aaa_option_table">
                                                 <thead>
@@ -390 +390 @@
                                 <div class="panel">
                                         <h2 id="requested-do-not-exist"><?php \esc_html_e( 'Requested options that do not exist', 'aaa-option-optimizer' ); ?></h2>
-                                        <p><?php \esc_html_e( 'The following options are requested sometimes, but AAA Option Optimizer has detected that they do not exist. If one of the options below has been called a lot, it might help to create it with a value of false.', 'aaa-option-optimizer' ); ?></p>
+                                        <p><?php \esc_html_e( 'The following options are requested sometimes, but AAA Autoload Optimizer has detected that they do not exist. If one of the options below has been called a lot, it might help to create it with a value of false.', 'aaa-option-optimizer' ); ?></p>
                                         <table width="100%" id="requested_do_not_exist_table" class="aaa_option_table">
                                                 <thead>

aaa-option-optimizer/trunk/src/class-database.php

@@ -1 +1 @@
 <?php
 /**
- * Database functionality for AAA Option Optimizer.
+ * Database functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -182 +182 @@
          * for optimal performance on slow hosts with large datasets.
          *
+         * Rows are written in a fixed (sorted) order. Every request writes the
+         * options it read at shutdown, and InnoDB locks rows in the order of the
+         * VALUES list; with per-request access order, concurrent requests lock
+         * the same rows in different orders and deadlock each other.
+         *
          * @param array<string, int> $options    Array of option_name => count.
          * @param int                $chunk_size Number of options per query. Default 500.
@@ -188 +193 @@
          */
         public static function batch_insert( $options, $chunk_size = 500 ) {
-                global $wpdb;
-
                 if ( empty( $options ) ) {
                         return;
                 }
 
-                $table_name = self::get_table_name();
-
+                // SORT_STRING: numeric option names become int keys, keep one total order.
+                \ksort( $options, SORT_STRING );
+
+                // A deadlock rolls back the whole transaction, so one retry can't double count.
+                if ( ! self::write_chunks( $options, $chunk_size ) && self::last_error_is_deadlock() ) {
+                        self::write_chunks( $options, $chunk_size );
+                }
+        }
+
+        /**
+         * Write option counts in chunks inside a single transaction.
+         *
+         * @param array<string, int> $options    Array of option_name => count, already sorted.
+         * @param int                $chunk_size Number of options per query.
+         *
+         * @return bool Whether the transaction was committed.
+         */
+        private static function write_chunks( $options, $chunk_size ) {
+                global $wpdb;
+
+                $table_name = self::get_table_name();
+
+                // Use `START TRANSACTION` (not `BEGIN`) so W3 Total Cache's DbCache layer
+                // recognizes it as a transaction and skips caching — `BEGIN` slips past its
+                // regex and triggers a fatal in wpdb::load_col_info() on the boolean result.
                 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
-                $wpdb->query( 'BEGIN' );
+                $wpdb->query( 'START TRANSACTION' );
 
                 foreach ( array_chunk( $options, $chunk_size, true ) as $chunk ) {
@@ -205 +231 @@
                         foreach ( $chunk as $option_name => $count ) {
                                 $placeholders[] = '(%s, %d, NOW())';
-                                $values[]       = $option_name;
+                                $values[]       = (string) $option_name;
                                 $values[]       = (int) $count;
                         }
@@ -214 +240 @@
 
                         // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared
-                        $wpdb->query( $wpdb->prepare( $sql, ...$values ) );
+                        if ( false === $wpdb->query( $wpdb->prepare( $sql, ...$values ) ) ) {
+                                // Keep the error: ROLLBACK succeeding would clear `$wpdb->last_error`.
+                                $error = $wpdb->last_error;
+                                // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+                                $wpdb->query( 'ROLLBACK' );
+                                $wpdb->last_error = $error;
+                                return false;
+                        }
                 }
 
                 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
-                $wpdb->query( 'COMMIT' );
+                return false !== $wpdb->query( 'COMMIT' );
+        }
+
+        /**
+         * Whether the last database error was an InnoDB deadlock (MySQL error 1213).
+         *
+         * @return bool
+         */
+        private static function last_error_is_deadlock() {
+                global $wpdb;
+
+                return false !== \stripos( (string) $wpdb->last_error, 'Deadlock found' );
         }
 

aaa-option-optimizer/trunk/src/class-plugin.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin functionality for AAA Option Optimizer.
+ * Plugin functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -9 +9 @@
 
 /**
- * Core functionality of AAA Option Optimizer.
+ * Core functionality of AAA Autoload Optimizer.
  */
 class Plugin {

aaa-option-optimizer/trunk/src/class-rest.php

@@ -1 +1 @@
 <?php
 /**
- * REST functionality for AAA Option Optimizer.
+ * REST functionality for AAA Autoload Optimizer.
  *
  * @package Progress_Planner\OptionOptimizer
@@ -13 +13 @@
 
 /**
- * REST functionality of AAA Option Optimizer.
+ * REST functionality of AAA Autoload Optimizer.
  */
 class REST {