Changeset 52707

Timestamp:

02/11/2022 06:50:08 PM (3 years ago)

Author:

spacedmonkey

Message:

Cache: Use wp_cache_*_multiple() in core functions.

Implement the wp_cache_add_multiple, wp_cache_set_multiple and wp_cache_delete_multiple in a number of core functions after they were introduced in [52700]

Props: spacedmonkey, adamsilverstein, flixos90, mitogh.
Fixes: #55029.

Location:

trunk/src/wp-includes

Files:

• class-wp-comment-query.php (modified) (1 diff)
• comment.php (modified) (4 diffs)
• meta.php (modified) (2 diffs)
• ms-network.php (modified) (2 diffs)
• ms-site.php (modified) (1 diff)
• option.php (modified) (2 diffs)
• post.php (modified) (1 diff)
• taxonomy.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -1059 +1059 @@
                 }
 
+                $data = array();
                 foreach ( $parent_map as $parent_id => $children ) {
-                    $cache_key = "get_comment_child_ids:$parent_id:$key:$last_changed";
-                    wp_cache_set( $cache_key, $children, 'comment' );
-                }
+                    $cache_key          = "get_comment_child_ids:$parent_id:$key:$last_changed";
+                    $data[ $cache_key ] = $children;
+                }
+                wp_cache_set_multiple( $data, 'comment' );
             }
 

trunk/src/wp-includes/comment.php

@@ -1884 +1884 @@
 function _clear_modified_cache_on_transition_comment_status( $new_status, $old_status ) {
     if ( 'approved' === $new_status || 'approved' === $old_status ) {
+        $data = array();
         foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-            wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
-        }
+            $data[] = "lastcommentmodified:$timezone";
+        }
+        wp_cache_delete_multiple( $data, 'timeinfo' );
     }
 }
@@ -2046 +2048 @@
         wp_update_comment_count( $comment_post_ID );
 
+        $data = array();
         foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-            wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
-        }
+            $data[] = "lastcommentmodified:$timezone";
+        }
+        wp_cache_delete_multiple( $data, 'timeinfo' );
     }
 
@@ -3221 +3225 @@
  */
 function clean_comment_cache( $ids ) {
-    foreach ( (array) $ids as $id ) {
-        wp_cache_delete( $id, 'comment' );
-
+    $comment_ids = (array) $ids;
+    wp_cache_delete_multiple( $comment_ids, 'comment' );
+    foreach ( $comment_ids as $id ) {
         /**
          * Fires immediately after a comment has been removed from the object cache.
@@ -3251 +3255 @@
  */
 function update_comment_cache( $comments, $update_meta_cache = true ) {
+    $data = array();
     foreach ( (array) $comments as $comment ) {
-        wp_cache_add( $comment->comment_ID, $comment, 'comment' );
-    }
+        $data[ $comment->comment_ID ] = $comment;
+    }
+    wp_cache_add_multiple( $data, 'comment' );
 
     if ( $update_meta_cache ) {

trunk/src/wp-includes/meta.php

@@ -497 +497 @@
 
     if ( $delete_all ) {
-        foreach ( (array) $object_ids as $o_id ) {
-            wp_cache_delete( $o_id, $meta_type . '_meta' );
-        }
+        $data = (array) $object_ids;
     } else {
-        wp_cache_delete( $object_id, $meta_type . '_meta' );
-    }
+        $data = array( $object_id );
+    }
+    wp_cache_delete_multiple( $data, $meta_type . '_meta' );
 
     /**
@@ -1192 +1191 @@
     }
 
+    $data = array();
     foreach ( $non_cached_ids as $id ) {
         if ( ! isset( $cache[ $id ] ) ) {
             $cache[ $id ] = array();
         }
-        wp_cache_add( $id, $cache[ $id ], $cache_key );
-    }
+        $data[ $id ] = $cache[ $id ];
+    }
+    wp_cache_add_multiple( $data, $cache_key );
 
     return $cache;

trunk/src/wp-includes/ms-network.php

@@ -83 +83 @@
     }
 
-    foreach ( (array) $ids as $id ) {
-        wp_cache_delete( $id, 'networks' );
+    $network_ids = (array) $ids;
+    wp_cache_delete_multiple( $network_ids, 'networks' );
 
+    foreach ( $network_ids as $id ) {
         /**
          * Fires immediately after a network has been removed from the object cache.
@@ -111 +112 @@
  */
 function update_network_cache( $networks ) {
+    $data = array();
     foreach ( (array) $networks as $network ) {
-        wp_cache_add( $network->id, $network, 'networks' );
+        $data[ $network->id ] = $network;
     }
+    wp_cache_add_multiple( $data, 'networks' );
 }
 

trunk/src/wp-includes/ms-site.php

@@ -372 +372 @@
         return;
     }
-    $site_ids = array();
+    $site_ids          = array();
+    $site_data         = array();
+    $blog_details_data = array();
     foreach ( $sites as $site ) {
-        $site_ids[] = $site->blog_id;
-        wp_cache_add( $site->blog_id, $site, 'sites' );
-        wp_cache_add( $site->blog_id . 'short', $site, 'blog-details' );
-    }
+        $site_ids[]                                    = $site->blog_id;
+        $site_data[ $site->blog_id ]                   = $site;
+        $blog_details_data[ $site->blog_id . 'short' ] = $site;
+
+    }
+    wp_cache_add_multiple( $site_data, 'sites' );
+    wp_cache_add_multiple( $blog_details_data, 'blog-details' );
 
     if ( $update_meta_cache ) {

trunk/src/wp-includes/option.php

@@ -345 +345 @@
     $options         = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $network_id ) );
 
+    $data = array();
     foreach ( $options as $option ) {
         $key                = $option->meta_key;
@@ -350 +351 @@
         $option->meta_value = maybe_unserialize( $option->meta_value );
 
-        wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
-    }
+        $data[ $cache_key ] = $option->meta_value;
+    }
+    wp_cache_set_multiple( $data, 'site-options' );
 }
 

trunk/src/wp-includes/post.php

@@ -7369 +7369 @@
     }
 
+    $data = array();
     foreach ( $posts as $post ) {
-        wp_cache_add( $post->ID, $post, 'posts' );
-    }
+        $data[ $post->ID ] = $post;
+    }
+    wp_cache_add_multiple( $data, 'posts' );
 }
 

trunk/src/wp-includes/taxonomy.php

@@ -3513 +3513 @@
     $taxonomies = get_object_taxonomies( $object_type );
 
-    foreach ( $object_ids as $id ) {
-        foreach ( $taxonomies as $taxonomy ) {
-            wp_cache_delete( $id, "{$taxonomy}_relationships" );
-        }
+    foreach ( $taxonomies as $taxonomy ) {
+        wp_cache_delete_multiple( $object_ids, "{$taxonomy}_relationships" );
     }
 
@@ -3568 +3566 @@
             $taxonomies[] = $term->taxonomy;
             $ids[]        = $term->term_id;
-            wp_cache_delete( $term->term_id, 'terms' );
-        }
-
+        }
+        wp_cache_delete_multiple( $ids, 'terms' );
         $taxonomies = array_unique( $taxonomies );
     } else {
+        wp_cache_delete_multiple( $ids, 'terms' );
         $taxonomies = array( $taxonomy );
-
-        foreach ( $taxonomies as $taxonomy ) {
-            foreach ( $ids as $id ) {
-                wp_cache_delete( $id, 'terms' );
-            }
-        }
     }
 
@@ -3753 +3745 @@
     }
 
+    $cache_values = array();
     foreach ( $object_terms as $id => $value ) {
         foreach ( $value as $taxonomy => $terms ) {
-            wp_cache_add( $id, $terms, "{$taxonomy}_relationships" );
-        }
+            $cache_values[ $taxonomy ][ $id ] = $terms;
+        }
+    }
+    foreach ( $cache_values as $taxonomy => $data ) {
+        wp_cache_add_multiple( $data, "{$taxonomy}_relationships" );
     }
 }
@@ -3769 +3765 @@
  */
 function update_term_cache( $terms, $taxonomy = '' ) {
+    $data = array();
     foreach ( (array) $terms as $term ) {
         // Create a copy in case the array was passed by reference.
@@ -3776 +3773 @@
         unset( $_term->object_id );
 
-        wp_cache_add( $term->term_id, $_term, 'terms' );
-    }
+        $data[ $term->term_id ] = $_term;
+    }
+    wp_cache_add_multiple( $data, 'terms' );
 }