Changeset 41963

Timestamp:

10/21/2017 01:21:24 PM (7 years ago)

Author:

dd32

Message:

Transients: Clear expired transients from the database in a daily cron task.

Fixes #41699

Location:

trunk/src

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/option.php (modified) (1 diff)

trunk/src/wp-admin/includes/schema.php

@@ -585 +585 @@
     $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
 
-    /*
-     * Deletes all expired transients. The multi-table delete syntax is used
-     * to delete the transient record from table a, and the corresponding
-     * transient_timeout record from table b.
-     */
-    $time = time();
-    $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
-        WHERE a.option_name LIKE %s
-        AND a.option_name NOT LIKE %s
-        AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
-        AND b.option_value < %d";
-    $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) );
-
-    if ( is_main_site() && is_main_network() ) {
-        $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
-            WHERE a.option_name LIKE %s
-            AND a.option_name NOT LIKE %s
-            AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
-            AND b.option_value < %d";
-        $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
-    }
+    // Clear expired transients
+    delete_expired_transients( true );
 }
 

trunk/src/wp-admin/includes/upgrade.php

@@ -1747 +1747 @@
     global $wp_current_db_version, $wpdb;
 
-    // Always.
-    if ( is_main_network() ) {
-        /*
-         * Deletes all expired transients. The multi-table delete syntax is used
-         * to delete the transient record from table a, and the corresponding
-         * transient_timeout record from table b.
-         */
-        $time = time();
-        $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b
-            WHERE a.meta_key LIKE %s
-            AND a.meta_key NOT LIKE %s
-            AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
-            AND b.meta_value < %d";
-        $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
-    }
+    // Always clear expired transients
+    delete_expired_transients( true );
 
     // 2.8.

trunk/src/wp-includes/default-filters.php

@@ -318 +318 @@
 add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
 add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
-add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'                            );
-add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'                      );
 add_action( 'admin_init',                 'send_frame_options_header',               10, 0 );
-add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment'                           );
 add_action( 'try_gutenberg_panel',        'wp_try_gutenberg_panel'                         );
 add_action( 'welcome_panel',              'wp_welcome_panel'                               );
+
+// Cron tasks
+add_action( 'wp_scheduled_delete',            'wp_scheduled_delete'       );
+add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'     );
+add_action( 'importer_scheduled_cleanup',     'wp_delete_attachment'      );
+add_action( 'upgrader_scheduled_cleanup',     'wp_delete_attachment'      );
+add_action( 'delete_expired_transients',      'delete_expired_transients' );
 
 // Navigation menu actions

trunk/src/wp-includes/option.php

@@ -818 +818 @@
 
 /**
+ * Deletes all expired transients.
+ *
+ * The multi-table delete syntax is used to delete the transient record
+ * from table a, and the corresponding transient_timeout record from table b.                           +
+ *
+ * @since 4.9.0
+ *
+ * @param bool $force_db Optional. Force cleanup to run against the database even when an external object cache is used.
+ */
+function delete_expired_transients( $force_db = false) {
+    global $wpdb;
+
+    if ( ! $force_db && wp_using_ext_object_cache() ) {
+        return;
+    }
+
+    $wpdb->query( $wpdb->prepare(
+        "DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
+            WHERE a.option_name LIKE %s
+            AND a.option_name NOT LIKE %s
+            AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
+            AND b.option_value < %d",
+        $wpdb->esc_like( '_transient_' ) . '%',
+        $wpdb->esc_like( '_transient_timeout_' ) . '%',
+        time()
+    ) );
+
+    if ( ! is_multisite() ) {
+        // non-Multisite stores site transients in the options table.
+        $wpdb->query( $wpdb->prepare(
+            "DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
+                WHERE a.option_name LIKE %s
+                AND a.option_name NOT LIKE %s
+                AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
+                AND b.option_value < %d",
+            $wpdb->esc_like( '_site_transient_' ) . '%',
+            $wpdb->esc_like( '_site_transient_timeout_' ) . '%',
+            time()
+        ) );
+    } elseif ( is_multisite() && is_main_site() && is_main_network() ) {
+        // Multisite stores site transients in the sitemeta table.
+        $wpdb->query( $wpdb->prepare(
+            "DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
+                WHERE a.meta_key LIKE %s
+                AND a.meta_key NOT LIKE %s
+                AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
+                AND b.meta_value < %d",
+            $wpdb->esc_like( '_site_transient_' ) . '%',
+            $wpdb->esc_like( '_site_transient_timeout_' ) . '%',
+            time()
+        ) );
+    }
+}
+
+/**
  * Saves and restores user interface settings stored in a cookie.
  *