Changeset 27102

Timestamp:

02/06/2014 01:58:01 AM (13 years ago)

Author:

wonderboymusic

Message:

Regenerate the term hierarchy cache ({taxonomy}_children) when it is out of sync with the passed taxonomy's last_changed value.

Introduces taxonomy_hierarchy_is_fresh(), which is only called in _get_term_hierarchy(). The taxonomy's last_changed value is checked against the value of wp_cache_get( 'hierarchy_last_changed', $taxonomy ).

Adds a unit test - Tests_Term:test_hierachy_invalidation().

See [27101], which makes this type of cache invalidation possible.
Fixes #14485.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (3 diffs)
• tests/phpunit/tests/term.php (modified) (2 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -2949 +2949 @@
         if ( !is_taxonomy_hierarchical($taxonomy) )
                 return array();
-        $children = get_option("{$taxonomy}_children");
+        $children = false;
+        if ( taxonomy_hierarchy_is_fresh( $taxonomy ) ) {
+                $children = get_option("{$taxonomy}_children");
+        }
 
         if ( is_array($children) )
@@ -3522 +3525 @@
  * Determine if a post's cache for the passed taxonomy
  *  is in sync.
+ * 
  * @since 3.9.0
  *
@@ -3537 +3541 @@
         return true;
 }
+
+/**
+ * Determine if a hierarchy's cache for the passed taxonomy
+ *  is in sync.
+ *
+ * @since 3.9.0
+ *
+ * @param int $id
+ * @param string $taxonomy
+ * @return boolean
+ */
+function taxonomy_hierarchy_is_fresh( $taxonomy ) {
+        $last_changed = get_taxonomy_last_changed( $taxonomy );
+        $hierarchy_last_changed = wp_cache_get( 'hierarchy_last_changed', $taxonomy );
+        if ( ! $hierarchy_last_changed || $last_changed !== $hierarchy_last_changed ) {
+                wp_cache_set( 'hierarchy_last_changed', $last_changed, $taxonomy );
+                return false;
+        }
+        return true;
+}

trunk/tests/phpunit/tests/term.php

@@ -586 +586 @@
                 $this->assertNotEquals( $last_changed2, $last_changed3 );
         }
-        
+
         /**
          * @ticket 22526
@@ -635 +635 @@
                 $this->assertNotEquals( $term->name, reset( $cats2 )->name );
         }
+
+        function test_hierachy_invalidation() {
+                $tax = 'burrito';
+                register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+                $this->assertTrue( get_taxonomy( $tax )->hierarchical );
+
+                $step = 1;
+                $parent_id = 0;
+                $children = 0;
+
+                foreach ( range( 1, 99 ) as $i ) {
+                        switch ( $step ) {
+                        case 1:
+                                $parent = wp_insert_term( 'Parent' . $i, $tax );
+                                $parent_id = $parent['term_id'];
+                                break;
+                        case 2:
+                                $parent = wp_insert_term( 'Child' . $i, $tax, array( 'parent' => $parent_id ) );
+                                $parent_id = $parent['term_id'];
+                                $children++;
+                                break;
+                        case 3:
+                                wp_insert_term( 'Grandchild' . $i, $tax, array( 'parent' => $parent_id ) );
+                                $parent_id = 0;
+                                $children++;
+                                break;
+                        }
+
+                        $terms = get_terms( $tax, array( 'hide_empty' => false ) );
+                        $this->assertEquals( $i, count( $terms ) );
+                        if ( 1 < $i ) {
+                                $hierarchy = _get_term_hierarchy( $tax );
+                                $this->assertNotEmpty( $hierarchy );
+                                $this->assertEquals( $children, count( $hierarchy, COUNT_RECURSIVE ) - count( $hierarchy ) );
+                        }
+
+                        if ( $i % 3 === 0 ) {
+                                $step = 1;
+                        } else {
+                                $step++;
+                        }
+                }
+
+                _unregister_taxonomy( $tax );
+        }
 }