Changeset 54637 for trunk/src/wp-includes/ms-network.php

Timestamp:

10/18/2022 06:14:01 PM (2 years ago)

Author:

davidbaumwald

Message:

Networks and Sites: Revert the use of the metadata API for *_network_options functions.

[54080] refactored the logic in get_network_option(), update_network_option() and delete_network_option() to use the metadata API. However, this change resulted in issues with large multisite installs that utilize memcached having network options > 1MB in size.

This change reverts [54080] and all related follow-up changes.

Reverts [54080], [54081], and [54082]. Partially reverts [54267] and [54402].

Props pavelschoffer, rebasaurus, johnbillion, spacedmonkey, desrosj, rinatkhaziev.
Fixes #56845.
See #37181.

File:

• trunk/src/wp-includes/ms-network.php (modified) (5 diffs)

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

@@ -85 +85 @@
     $network_ids = (array) $ids;
     wp_cache_delete_multiple( $network_ids, 'networks' );
-    wp_cache_delete_multiple( $network_ids, 'site_meta' );
 
     foreach ( $network_ids as $id ) {
@@ -109 +108 @@
  *
  * @since 4.6.0
- * @since 6.1.0 Introduced the `$update_meta_cache` parameter.
  *
- * @param array $networks          Array of network row objects.
- * @param bool  $update_meta_cache Whether to update site meta cache. Default true.
+ * @param array $networks Array of network row objects.
  */
-function update_network_cache( $networks, $update_meta_cache = true ) {
+function update_network_cache( $networks ) {
     $data = array();
     foreach ( (array) $networks as $network ) {
         $data[ $network->id ] = $network;
     }
-
     wp_cache_add_multiple( $data, 'networks' );
-    if ( $update_meta_cache ) {
-        $network_ids = array_keys( $data );
-        update_meta_cache( 'site', $network_ids );
-    }
 }
 
@@ -131 +123 @@
  *
  * @since 4.6.0
- * @since 6.1.0 Introduced the `$update_meta_cache` parameter.
  * @since 6.1.0 This function is no longer marked as "private".
  *
@@ -137 +128 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param array $network_ids       Array of network IDs.
- * @param bool  $update_meta_cache Whether to update site meta cache. Default true.
+ * @param array $network_ids Array of network IDs.
  */
-function _prime_network_caches( $network_ids, $update_meta_cache = true ) {
+function _prime_network_caches( $network_ids ) {
     global $wpdb;
 
@@ -147 +137 @@
         $fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
-        update_network_cache( $fresh_networks, $update_meta_cache );
+        update_network_cache( $fresh_networks );
     }
 }