Changeset 54256

Timestamp:

09/20/2022 02:24:08 PM (2 years ago)

Author:

spacedmonkey

Message:

Networks and Sites: Store main site id of a network in network options.

Instead of caching main site id an object cache, store main site id on a network options. This results in less database queries on sites without persistent object caching.

Props spacedmonkey, johnjamesjacoby, peterwilsoncc, desrosj.
Fixes #55802.

Location:

trunk

Files:

• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-includes/class-wp-network.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/getMainSiteId.php (modified) (1 diff)

trunk/src/wp-admin/includes/schema.php

@@ -1069 +1069 @@
         update_user_meta( $site_user->ID, 'primary_blog', $current_site->blog_id );
 
+        // Unable to use update_network_option() while populating the network.
+        $wpdb->insert(
+            $wpdb->sitemeta,
+            array(
+                'site_id'    => $network_id,
+                'meta_key'   => 'main_site',
+                'meta_value' => $current_site->blog_id,
+            )
+        );
+
         if ( $subdomain_install ) {
             $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );

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

@@ -256 +256 @@
             $main_site_id = (int) $site->id;
         } else {
-            $cache_key = 'network:' . $this->id . ':main_site';
-
-            $main_site_id = wp_cache_get( $cache_key, 'site-options' );
+
+            $main_site_id = get_network_option( $this->id, 'main_site' );
             if ( false === $main_site_id ) {
                 $_sites       = get_sites(
@@ -271 +270 @@
                 $main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
 
-                wp_cache_add( $cache_key, $main_site_id, 'site-options' );
+                update_network_option( $this->id, 'main_site', $main_site_id );
             }
         }

trunk/tests/phpunit/tests/multisite/getMainSiteId.php

@@ -90 +90 @@
 
         /**
+         * @ticket 55802
+         */
+        public function test_get_main_site_id_with_different_network_cache_id() {
+            $this->assertSame( self::$site_ids['wordpress.org/'], get_main_site_id( self::$network_ids['wordpress.org/'] ), 'Main blog id needs to match blog id of wordpress.org/' );
+            $this->assertSame( self::$site_ids['wordpress.org/'], (int) get_network_option( self::$network_ids['wordpress.org/'], 'main_site' ), 'Network option needs to match blog id of wordpress.org/' );
+
+            $this->assertSame( 0, get_main_site_id( self::$network_ids['wp.org/'] ), 'Main blog id should not be found' );
+            $this->assertSame( 0, (int) get_network_option( self::$network_ids['wp.org/'], 'main_site' ), 'Network option should not be found' );
+        }
+
+        /**
          * @ticket 29684
          */