Ticket #20316: 20316.2.diff

src/wp-admin/includes/schema.php

@@ -546 +546 @@
 
         // delete obsolete magpie stuff
         $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
+
         // clear transient data
-        $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE '\_transient\_%' OR option_name LIKE '\_site\_transient\_%'" );
+        $time = time();
+        delete_expired_transients( $time );
+
+        if ( is_main_site() && is_main_network() )
+                delete_expired_site_transients( $time );
 }
 
 /**

src/wp-admin/includes/upgrade.php

@@ -1215 +1215 @@
  */
 function upgrade_network() {
         global $wp_current_db_version, $wpdb;
+
+        // Always
+        if ( is_main_network() )
+                delete_expired_site_transients();
+
         // 2.8
         if ( $wp_current_db_version < 11549 ) {
                 $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );

src/wp-includes/option.php

@@ -515 +515 @@
 }
 
 /**
+ * Delete all expired transients from the database
+ *
+ * @package WordPress
+ * @subpackage Option
+ * @since 3.7.0
+ *
+ * @param int|bool $time If timestamp is passed, only expired transients less than the
+ *              passed time will be deleted.
+ */
+function delete_expired_transients( $time = false ) {
+        global $wpdb;
+
+        $wpdb->suppress_errors();
+
+        $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+
+        $wpdb->suppress_errors( false );
+
+        if ( ! $installed )
+                return;
+
+        if ( ! $time )
+                $time = time();
+
+        $wpdb->query( "DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE
+                a.option_name LIKE '\_transient\_%' AND
+                a.option_name NOT LIKE '\_transient\_timeout\_%' AND
+                b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
+                AND b.option_value < $time" );
+}
+
+/**
+ * Delete all expired site transients from the database
+ *
+ * @package WordPress
+ * @subpackage Option
+ * @since 3.7.0
+ *
+ * @param int|bool $time If timestamp is passed, only expired transients less than the
+ *              passed time will be deleted.
+ */
+function delete_expired_site_transients( $time = false ) {
+        global $wpdb;
+
+        $wpdb->suppress_errors();
+
+        $installed = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
+
+        $wpdb->suppress_errors( false );
+
+        if ( ! $installed )
+                return;
+
+        if ( ! $time )
+                $time = time();
+
+        $wpdb->query( "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b WHERE
+                a.meta_key LIKE '\_site\_transient\_%' AND
+                a.meta_key NOT LIKE '\_site\_transient\_timeout\_%' AND
+                b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
+                AND b.meta_value < $time" );
+}
+
+/**
  * Saves and restores user interface settings stored in a cookie.
  *
  * Checks if the current user-settings cookie is updated and stores it. When no

tests/phpunit/tests/option/transient.php

@@ -33 +33 @@
                 $this->assertEquals( $value, get_transient( $key ) );
                 $this->assertTrue( delete_transient( $key ) );
         }
+
+        function get_non_cron_transients() {
+                global $wpdb;
+                $rows = $wpdb->get_results( "SELECT * FROM $wpdb->options WHERE option_name LIKE '\_transient\_%'" );
+                return wp_list_filter( $rows, array( 'option_name' => '_transient_doing_cron' ), 'NOT' );
+        }
+
+        function test_delete_expired_transients() {
+                $before_time = time();
+                sleep(1);
+                set_transient( 'foo', 'bar', 1 );
+                sleep(2);
+
+                $this->assertCount( 2, $this->get_non_cron_transients() );
+
+                delete_expired_transients( $before_time );
+
+                $this->assertCount( 2, $this->get_non_cron_transients() );
+
+                delete_expired_transients();
+
+                $this->assertCount( 0, $this->get_non_cron_transients() );
+        }
 }