Changeset 36511

Timestamp:

02/12/2016 02:46:28 AM (9 years ago)

Author:

boonebgorges

Message:

In delete_metadata(), only invalidate cache for affected objects.

The $delete_all flag in delete_metadata() triggers cache invalidation for
multiple objects. Previously, invalidation took place for all objects matching
the $meta_key parameter, regardless of whether $meta_value was also set.
This resulted in overly aggressive invalidation.

Props rahal.aboulfeth.
Fixes #35797.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (1 diff)
• tests/phpunit/tests/meta/deleteMetadata.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -364 +364 @@
         return false;
 
-    if ( $delete_all )
-        $object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key ) );
+    if ( $delete_all ) {
+        $value_clause = '';
+        if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) {
+            $value_clause = $wpdb->prepare( " AND meta_value = %s", $meta_value );
+        }
+
+        $object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s $value_clause", $meta_key ) );
+    }
 
     /**

trunk/tests/phpunit/tests/meta/deleteMetadata.php

@@ -98 +98 @@
         $this->assertEqualSets( array(), $m );
     }
+
+    /**
+     * @ticket 35797
+     */
+    public function test_delete_all_should_only_invalidate_cache_for_objects_matching_meta_value() {
+        $p1 = 1234;
+        $p2 = 5678;
+
+        add_metadata( 'post', $p1, 'foo', 'value1' );
+        add_metadata( 'post', $p2, 'foo', 'value2' );
+
+        // Prime caches.
+        update_meta_cache( 'post', array( $p1, $p2 ) );
+
+        $deleted = delete_metadata( 'post', 5, 'foo', 'value1', true );
+
+        $p1_cache = wp_cache_get( $p1, 'post_meta' );
+        $this->assertFalse( $p1_cache );
+
+        // Should not have been touched.
+        $p2_cache = wp_cache_get( $p2, 'post_meta' );
+        $this->assertNotEmpty( $p2_cache );
+    }
+
+    /**
+     * @ticket 35797
+     */
+    public function test_delete_all_should_invalidate_cache_for_all_objects_with_meta_key_when_meta_value_is_not_provided() {
+        $p1 = 1234;
+        $p2 = 5678;
+
+        add_metadata( 'post', $p1, 'foo', 'value1' );
+        add_metadata( 'post', $p2, 'foo', 'value2' );
+
+        // Prime caches.
+        update_meta_cache( 'post', array( $p1, $p2 ) );
+
+        $deleted = delete_metadata( 'post', 5, 'foo', false, true );
+
+        $p1_cache = wp_cache_get( $p1, 'post_meta' );
+        $this->assertFalse( $p1_cache );
+
+        $p2_cache = wp_cache_get( $p2, 'post_meta' );
+        $this->assertFalse( $p2_cache );
+    }
 }