Merge pull request #4268 from 10up/fix/4206

Fix: Ensure cache_results is set to true for Query

Author: felipeelia

includes/classes/Indexable/Post/QueryIntegration.php

@@ -116,16 +116,6 @@ public function add_es_header( $query ) {
 			return;
 		}
 
-		/**
-		 * `cache_results` defaults to false but can be enabled.
-		 *
-		 * @since 1.5
-		 */
-		$query->set( 'cache_results', false );
-		if ( ! empty( $query->query['cache_results'] ) ) {
-			$query->set( 'cache_results', true );
-		}
-
 		if ( ! headers_sent() ) {
 			/**
 			 * Manually setting a header as $wp_query isn't yet initialized when we

tests/php/indexables/TestPost.php

@@ -3701,12 +3701,12 @@ public function testNoAvailablePostTypesToSearch() {
 	}
 
 	/**
-	 * Test cache_results is off by default
+	 * Test cache_results is on by default
 	 *
 	 * @since 1.5
 	 * @group post
 	 */
-	public function testCacheResultsDefaultOff() {
+	public function testCacheResultsDefaultOn() {
 		$this->ep_factory->post->create();
 
 		ElasticPress\Elasticsearch::factory()->refresh_indices();
@@ -3718,7 +3718,7 @@ public function testCacheResultsDefaultOff() {
 		$query = new \WP_Query( $args );
 
 		$this->assertTrue( $query->elasticsearch_success );
-		$this->assertFalse( $query->query_vars['cache_results'] );
+		$this->assertTrue( $query->query_vars['cache_results'] );
 	}
 
 	/**
@@ -3784,7 +3784,8 @@ public function testCachedResultIsNotInCache() {
 		wp_cache_flush();
 
 		$args = array(
-			'ep_integrate' => true,
+			'ep_integrate'  => true,
+			'cache_results' => false,
 		);
 
 		$query = new \WP_Query( $args );
@@ -10386,4 +10387,140 @@ public function throw_exception( $args ) {
 		}
 		return $args;
 	}
+
+	/**
+	 * Test that post meta and term caches are primed after ES query.
+	 *
+	 * @since 5.3.3
+	 * @group post
+	 */
+	public function test_postmeta_and_term_caches_are_primed_after_ESQuery() {
+		global $wpdb;
+
+		$post_ids = $this->ep_factory->post->create_many(
+			2,
+			[
+				'meta_input' => [
+					'test_meta_key' => 'test_value',
+				],
+				'tax_input'  => [
+					'category' => [ $this->ep_factory->category->create() ],
+				],
+			]
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		wp_cache_flush();
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate' => true,
+				'post__in'     => $post_ids,
+			]
+		);
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertCount( 2, $query->posts );
+
+		// After the query, post meta should be cached and no additional queries should be made.
+		$queries_before = $wpdb->num_queries;
+
+		foreach ( $post_ids as $post_id ) {
+			get_post_meta( $post_id, 'test_meta_key', true );
+		}
+
+		$queries_after = $wpdb->num_queries;
+		$this->assertSame( $queries_before, $queries_after );
+
+		foreach ( $post_ids as $post_id ) {
+			get_the_terms( $post_id, 'category' );
+		}
+
+		$queries_after = $wpdb->num_queries;
+		$this->assertSame( $queries_before, $queries_after );
+	}
+
+	/**
+	 * Test that update_post_meta_cache query arg respects post meta cache.
+	 *
+	 * @since 5.3.3
+	 * @group post
+	 */
+	public function test_update_post_meta_cache_query_arg_respects_post_meta_cache() {
+		global $wpdb;
+
+		$post_ids = $this->ep_factory->post->create_many(
+			2,
+			[
+				'meta_input' => [
+					'test_meta_key' => 'test_value',
+				],
+			]
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		wp_cache_flush();
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate'           => true,
+				'post__in'               => $post_ids,
+				'update_post_meta_cache' => false,
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertCount( 2, $query->posts );
+
+		$queries_before = $wpdb->num_queries;
+		foreach ( $post_ids as $post_id ) {
+			get_post_meta( $post_id, 'test_meta_key', true );
+		}
+
+		$queries_after = $wpdb->num_queries;
+		$this->assertGreaterThan( $queries_before, $queries_after );
+	}
+
+	/**
+	 * Test that update_post_term_cache query arg respects term cache.
+	 *
+	 * @since 5.3.3
+	 * @group post
+	 */
+	public function test_update_post_term_cache_query_arg_respects_term_cache() {
+		global $wpdb;
+		$post_ids = $this->ep_factory->post->create_many(
+			2,
+			[
+				'tax_input' => [
+					'category' => [ $this->ep_factory->category->create() ],
+				],
+			]
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		wp_cache_flush();
+
+		$query = new \WP_Query(
+			[
+				'ep_integrate'           => true,
+				'post__in'               => $post_ids,
+				'update_post_term_cache' => false,
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertCount( 2, $query->posts );
+
+		$queries_before = $wpdb->num_queries;
+
+		foreach ( $post_ids as $post_id ) {
+			get_the_terms( $post_id, 'category' );
+		}
+
+		$queries_after = $wpdb->num_queries;
+		$this->assertGreaterThan( $queries_before, $queries_after );
+	}
 }