Merge pull request #268 from Automattic/object-cache-translation-ids-236

Object cache just the post's translations IDs rather than objects

Author: simonwheatley

class-post-public.php

@@ -541,7 +541,7 @@ public function the_posts( array $posts, WP_Query & $wp_query ) {
 		$subs_index = array();
 		foreach ( $posts as & $post ) {
 			if ( empty( $post->post_title ) || empty( $post->post_excerpt ) || empty( $post->post_content ) ) {
-				if ( $default_post = bbl_get_default_lang_post( $post->ID ) )
+				if ( $default_post = $this->get_default_lang_post( $post->ID ) )
 					$subs_index[ $post->ID ] = $default_post->ID;
 			}
 			if ( ! $this->get_transid( $post ) && bbl_get_default_lang_code() == bbl_get_post_lang_code( $post ) )
@@ -780,6 +780,7 @@ function clean_post_cache( $post_id ) {
 			return;
 		}
 		wp_cache_delete( $transid, 'bbl_post_translations' );
+		wp_cache_delete( $transid, 'bbl_post_translation_ids' );
 	}
 
 	/**
@@ -1186,7 +1187,7 @@ public function get_new_post_translation_url( $default_post, $lang_code ) {
 	 **/
 	public function get_default_lang_post( $post ) {
 		$post = get_post( $post );
-		$translations = bbl_get_post_translations( $post->ID );
+		$translations = $this->get_post_translations( $post->ID );
 		if ( isset( $translations[ bbl_get_default_lang_code() ] ) )
 			return $translations[ bbl_get_default_lang_code() ];
 		return false;
@@ -1205,8 +1206,10 @@ public function get_post_translations( $post ) {
 		// @FIXME: Is it worth caching here, or can we just rely on the caching in get_objects_in_term and get_posts?
 		$transid = $this->get_transid( $post );
 
-		if ( $translations = wp_cache_get( $transid, 'bbl_post_translations' ) ) {
-			return $translations;
+		$translations = wp_cache_get( $transid, 'bbl_post_translation_ids' );
+
+		if ( false !== $translations ) {
+			return array_map( 'get_post', $translations );
 		}
 
 		# @TODO A transid should never be a wp_error. Check and fix.
@@ -1215,28 +1218,14 @@ public function get_post_translations( $post ) {
 		}
 		$post_ids = get_objects_in_term( $transid, 'post_translation' );
 
-		// Work out all the translated equivalent post types
-		$post_types = array();
-		$langs = bbl_get_active_langs();
-		foreach ( $langs as $lang )
-			$post_types[] = bbl_get_post_type_in_lang( $post->post_type, $lang->code );
-
-		// Get all the translations in one cached DB query
-		$args = array(
-			// We want a clean listing, without any particular language
-			'bbl_translate' => false,
-			'include' => $post_ids,
-			'post_type' => $post_types,
-			'post_status' => array( 'publish', 'pending', 'draft', 'future' ),
-		);
-		$posts = get_posts( $args );
 		$translations = array();
-		foreach ( $posts as $post )
-			$translations[ $this->get_post_lang_code( $post ) ] = $post;
+		$post_ids = array_filter( $post_ids );
+		foreach ( $post_ids as $post_id )
+			$translations[ $this->get_post_lang_code( $post_id ) ] = $post_id;
 
-		wp_cache_set( $transid, $translations, 'bbl_post_translations' );
+		wp_cache_set( $transid, $translations, 'bbl_post_translation_ids' );
 
-		return $translations;
+		return array_map( 'get_post', $translations );
 	}
 
 	/**
@@ -1515,6 +1504,7 @@ function set_transid( $post, $transid = false ) {
 			}
 			// Delete anything in there currently
 			wp_cache_delete( $transid, 'bbl_post_translations' );
+			wp_cache_delete( $transid, 'bbl_post_translation_ids' );
 		}
 		$result = wp_set_object_terms( $post->ID, $transid, 'post_translation' );
 		if ( is_wp_error( $result ) ) {

tests/test-translations.php

@@ -0,0 +1,39 @@
+<?php
+
+class Test_Translations extends Babble_UnitTestCase {
+
+	public function setUp() {
+		$this->install_languages();
+
+		parent::setUp();
+	}
+
+	public function test_post_translations() {
+
+		$this->assertSame( 'en_US', get_locale() );
+
+		$en = $this->factory->post->create_and_get();
+		$uk = $this->create_post_translation( $en, 'en_GB' );
+		$fr = $this->create_post_translation( $en, 'fr_FR' );
+
+		// Ensure translations are correctly fetched
+		$translations = bbl_get_post_translations( $en->ID );
+
+		$this->assertEquals( array(
+			'en_US' => get_post( $en->ID ),
+			'en_GB' => get_post( $uk->ID ),
+			'fr_FR' => get_post( $fr->ID ),
+		), $translations );
+
+		// Test it again to ensure translation caching is correct
+		$translations = bbl_get_post_translations( $en->ID );
+
+		$this->assertEquals( array(
+			'en_US' => get_post( $en->ID ),
+			'en_GB' => get_post( $uk->ID ),
+			'fr_FR' => get_post( $fr->ID ),
+		), $translations );
+
+	}
+
+}