Changeset 40920

Timestamp:

06/21/2017 04:11:58 AM (8 years ago)

Author:

boonebgorges

Message:

Improve cache invalidation when splitting shared terms.

This changeset addresses two related issues:

• When splitting shared terms from hierarchical taxonomies, the process of regenerating the taxonomy hierarchy (_get_taxonomy_hierarchy()) requires recursive calls to get_terms() in order to descend the tree. By waiting until all shared terms in a term group have been invalidated before regenerating their taxonomy hierarchies, we avoid certain race conditions.
• Previously, a coding error prevented single-term caches from being invalidated for children of split terms. This error dates from [31418].

See #37189.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -3549 +3549 @@
                 array( 'term_taxonomy_id' => $child_tt_id )
             );
-            clean_term_cache( $term_id, $term_taxonomy->taxonomy );
+            clean_term_cache( (int) $child_tt_id, '', false );
         }
     } else {
         // If the term has no children, we must force its taxonomy cache to be rebuilt separately.
-        clean_term_cache( $new_term_id, $term_taxonomy->taxonomy );
-    }
+        clean_term_cache( $new_term_id, $term_taxonomy->taxonomy, false );
+    }
+
+    clean_term_cache( $term_id, $term_taxonomy->taxonomy, false );
+
+    /*
+     * Taxonomy cache clearing is delayed to avoid race conditions that may occur when
+     * regenerating the taxonomy's hierarchy tree.
+     */
+    $taxonomies_to_clean = array( $term_taxonomy->taxonomy );
 
     // Clean the cache for term taxonomies formerly shared with the current term.
-    $shared_term_taxonomies = $wpdb->get_row( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
-    if ( $shared_term_taxonomies ) {
-        foreach ( $shared_term_taxonomies as $shared_term_taxonomy ) {
-            clean_term_cache( $term_id, $shared_term_taxonomy );
-        }
+    $shared_term_taxonomies = $wpdb->get_col( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
+    $taxonomies_to_clean = array_merge( $taxonomies_to_clean, $shared_term_taxonomies );
+
+    foreach ( $taxonomies_to_clean as $taxonomy_to_clean ) {
+        clean_taxonomy_cache( $taxonomy_to_clean );
     }