sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@36511 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2016-02-12 02:46:28 +00:00
parent e8ed3fcbf1
commit 0ae22e5f4c
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/meta.php
View File

@ -363,8 +363,14 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
if ( !count( $meta_ids ) ) if ( !count( $meta_ids ) )
return false; return false;
if ( $delete_all ) if ( $delete_all ) {
$object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $type_column FROM $table WHERE meta_key = %s", $meta_key ) ); $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 ) );
}
/** /**
* Fires immediately before deleting metadata of a specific type. * Fires immediately before deleting metadata of a specific type.

45
tests/phpunit/tests/meta/deleteMetadata.php
View File

@ -97,4 +97,49 @@ class Tests_Meta_DeleteMetadata extends WP_UnitTestCase {
$m = get_metadata( 'post', 12345, 'foo', false ); $m = get_metadata( 'post', 12345, 'foo', false );
$this->assertEqualSets( array(), $m ); $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 );
}
} }